Merge branch 'trunk' of https://github.com/rjindael/rbxnu into trunk

CMakeLists.txt

@@ -33,8 +33,8 @@ add_executable(server
 )
 
 qt_add_executable(studio 
-    src/client/studio/studiowindow.cpp
-    src/client/studio/studiowindow.hpp
+    src/client/studio/StudioWindow.cpp
+    src/include/client/studio/StudioWindow.hpp
     src/client/studio/main.cpp
 )
 

README.md

@@ -1,2 +1,5 @@
-# rbxnu
-Decompilation of the 2008 Roblox client with QoL adjustments 
+# RBXNU
+Refreshed version of the Roblox client from 2008, including a decompilation of the engine as well as QoL adjustments throughout
+
+# License
+RBXNU is licensed under the GNU General Public License v3.0. You should have received a copy of the license with RBXNU.

src/client/studio/StudioWindow.cpp

@@ -1,8 +1,8 @@
-#include "studiowindow.hpp"
+#include <client/studio/StudioWindow.hpp>
 
 StudioWindow::StudioWindow()
 {
-    setWindowTitle(QString("RBXNu Studio"));
+    setWindowTitle(QString("RBXNU Studio"));
     setWindowIcon(QIcon(":/content/images/icon.png"));
 }
 

src/client/studio/main.cpp

@@ -1,14 +1,15 @@
 #include <stdio.h>
 
 #include <QApplication>
-#include "studiowindow.hpp"
+
+#include <client/studio/StudioWindow.hpp>
 
 int main(int argc, char** argv)
 {
-    QApplication a(argc, argv);
+    QApplication app(argc, argv);
     StudioWindow window = StudioWindow();
     
     window.show();
 
-    return a.exec();
+    return app.exec();
 }

src/client/studio/studiowindow.hpp

@@ -1,16 +0,0 @@
-#ifndef __CLIENT_STUDIO_STUDIOWINDOW_HPP__
-#define __CLIENT_STUDIO_STUDIOWINDOW_HPP__
-
-#include <QMainWindow>
-#include <QOpenGLWidget>
-
-class StudioWindow : public QMainWindow
-{
-    Q_OBJECT
-public:
-    StudioWindow();
-protected:
-    void closeEvent(QCloseEvent* event);
-};
-
-#endif

src/engine/app/v8/world/World.cpp

@@ -0,0 +1,21 @@
+#include <engine/app/v8/world/World.hpp>
+
+RBX::World::World()
+{
+
+}
+
+void RBX::World::preStep()
+{
+
+}
+
+double RBX::World::step(float timestep)
+{
+
+}
+
+void RBX::World::update()
+{
+    
+}

src/engine/network/Guid.cpp

@@ -20,7 +20,15 @@ void RBX::Guid::generateGUID(std::string* result)
     memset(sz, 0, sizeof(sz));
     StringFromGUID2(&pguid)
     WideCharToMultiByte(0, 0, sz, 64, MultiByteStr, 64, 0, 0);
+
+    // construct guid
+    result = "RBX";
     result += MultiByteStr;
+    result->erase(40, 1);
+    result->erase(27, 1);
+    result->erase(22, 1);
+    result->erase(17, 1);
+    result->erase(3, 1);
 #else 
     // TBD: POSIX method
 #endif

src/include/client/studio/StudioWindow.hpp

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <QMainWindow>
+#include <QOpenGLWidget>
+
+class StudioWindow : public QMainWindow
+{
+    Q_OBJECT
+
+    public:
+        StudioWindow();
+
+    protected:
+        void closeEvent(QCloseEvent* event);
+};

src/include/engine/app/v8/world/World.hpp

@@ -0,0 +1,18 @@
+#ifndef __APP_V8_WORLD_WORLD_HPP__
+#define __APP_V8_WORLD_WORLD_HPP__
+
+namespace RBX
+{
+    class World
+    {
+        public:
+            World();
+            ~World();
+
+            void preStep();
+            double step(float timestep);
+            void update();
+    };
+}
+
+#endif