diff --git a/CMakeLists.txt b/CMakeLists.txt index 11b2e54..c92eb6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,9 +7,9 @@ project(player) project(server) project(studio) -option(COMPILE_PLAYER "Compile the RBXNU Player" ON) -option(COMPILE_SERVER "Compile the RBXNU Server" ON) -option(COMPILE_STUDIO "Compile the RBXNU Studio" ON) +option(COMPILE_PLAYER "Compile the RNR Player" ON) +option(COMPILE_SERVER "Compile the RNR Server" ON) +option(COMPILE_STUDIO "Compile the RNR Studio" ON) find_package(Boost REQUIRED) find_package(cglm REQUIRED CONFIG) @@ -47,8 +47,8 @@ if(COMPILE_PLAYER OR COMPILE_STUDIO) qt_standard_project_setup() qt_add_library(qt_common STATIC - src/client/common/RBXNUGraphicsWidget.cpp - src/include/client/common/RBXNUGraphicsWidget.hpp + src/client/common/RNRGraphicsWidget.cpp + src/include/client/common/RNRGraphicsWidget.hpp src/client/common/Adorn.cpp src/include/client/common/Adorn.hpp ) diff --git a/src/client/common/RBXNUGraphicsWidget.cpp b/src/client/common/RNRGraphicsWidget.cpp similarity index 52% rename from src/client/common/RBXNUGraphicsWidget.cpp rename to src/client/common/RNRGraphicsWidget.cpp index 1ae221c..e60cc6b 100644 --- a/src/client/common/RBXNUGraphicsWidget.cpp +++ b/src/client/common/RNRGraphicsWidget.cpp @@ -1,11 +1,11 @@ -#include +#include -RBXNUGraphicsWidget::RBXNUGraphicsWidget(QWidget* parent) : QOpenGLWidget(parent) +RNRGraphicsWidget::RNRGraphicsWidget(QWidget* parent) : QOpenGLWidget(parent) { gl_adorn = new GL::Adorn(); } -void RBXNUGraphicsWidget::initializeGL() +void RNRGraphicsWidget::initializeGL() { printf("qt_common: initializeGL\n"); @@ -14,13 +14,13 @@ void RBXNUGraphicsWidget::initializeGL() } } -void RBXNUGraphicsWidget::paintGL() +void RNRGraphicsWidget::paintGL() { this->delta_time = ((double)timer.elapsed())/1000.0; timer.start(); } -void RBXNUGraphicsWidget::resizeGL(int w, int h) +void RNRGraphicsWidget::resizeGL(int w, int h) { printf("qt_common: resizeGL %i %i\n", w, h); } \ No newline at end of file diff --git a/src/client/studio/StudioWindow.cpp b/src/client/studio/StudioWindow.cpp index 6e5388c..953dc5b 100644 --- a/src/client/studio/StudioWindow.cpp +++ b/src/client/studio/StudioWindow.cpp @@ -4,7 +4,7 @@ StudioWindow::StudioWindow() { - setWindowTitle(QString("RBXNU Studio")); + setWindowTitle(QString("RNR Studio")); QPixmap icon_pixmap = QPixmap(); icon_pixmap.loadFromData(icon_png, icon_png_size); @@ -12,7 +12,7 @@ StudioWindow::StudioWindow() QWidget *content_widget = new QWidget(); QGridLayout* grid = new QGridLayout(); - this->graphics_widget = new RBXNUGraphicsWidget(); + this->graphics_widget = new RNRGraphicsWidget(); grid->addWidget(this->graphics_widget, 0, 0, 1, 1); diff --git a/src/engine/app/humanoid/Humanoid.cpp b/src/engine/app/humanoid/Humanoid.cpp index d225c60..69cca13 100644 --- a/src/engine/app/humanoid/Humanoid.cpp +++ b/src/engine/app/humanoid/Humanoid.cpp @@ -1,6 +1,6 @@ #include -RBX::Humanoid::Humanoid() +RNR::Humanoid::Humanoid() { this->setName("Humanoid"); } \ No newline at end of file diff --git a/src/engine/app/v8/tree/Instance.cpp b/src/engine/app/v8/tree/Instance.cpp index 608b384..c3f16ea 100644 --- a/src/engine/app/v8/tree/Instance.cpp +++ b/src/engine/app/v8/tree/Instance.cpp @@ -1,27 +1,27 @@ #include #include -RBX::Instance::Instance() +RNR::Instance::Instance() { } -RBX::Instance::Instance(std::string name) +RNR::Instance::Instance(std::string name) { } -bool RBX::Instance::contains(RBX::Instance* child) +bool RNR::Instance::contains(RNR::Instance* child) { - auto child_it = std::find(m_children.begin(), m_children.end(), (boost::shared_ptr)child); + auto child_it = std::find(m_children.begin(), m_children.end(), (boost::shared_ptr)child); if(child_it != m_children.end()) return true; return false; } -bool RBX::Instance::isAncestorOf(RBX::Instance* instance) +bool RNR::Instance::isAncestorOf(RNR::Instance* instance) { - RBX::Instance* instance_parent = instance->m_parent; + RNR::Instance* instance_parent = instance->m_parent; while(instance_parent != 0) { instance_parent = instance_parent->m_parent; @@ -31,22 +31,22 @@ bool RBX::Instance::isAncestorOf(RBX::Instance* instance) return false; } -bool RBX::Instance::askSetParent(RBX::Instance* instance) +bool RNR::Instance::askSetParent(RNR::Instance* instance) { return true; } -bool RBX::Instance::canSetParent(RBX::Instance* instance) +bool RNR::Instance::canSetParent(RNR::Instance* instance) { return !instance || instance->canAddChild(this); } -bool RBX::Instance::askAddChild(RBX::Instance* instance) +bool RNR::Instance::askAddChild(RNR::Instance* instance) { return true; } -bool RBX::Instance::canAddChild(RBX::Instance* instance) +bool RNR::Instance::canAddChild(RNR::Instance* instance) { if(instance->contains(this) || instance->m_parent == this) return false; @@ -55,7 +55,7 @@ bool RBX::Instance::canAddChild(RBX::Instance* instance) return instance->askSetParent(this); } -void RBX::Instance::setName(std::string name) +void RNR::Instance::setName(std::string name) { if(name != this->m_name) { @@ -64,7 +64,7 @@ void RBX::Instance::setName(std::string name) } } -void RBX::Instance::setParent(RBX::Instance* newParent) +void RNR::Instance::setParent(RNR::Instance* newParent) { if(newParent != m_parent) { @@ -82,8 +82,8 @@ void RBX::Instance::setParent(RBX::Instance* newParent) if(m_parent) { - std::vector>* children = m_parent->getChildren(); - auto child_it = std::find(children->begin(), children->end(), (boost::shared_ptr)this); + std::vector>* children = m_parent->getChildren(); + auto child_it = std::find(children->begin(), children->end(), (boost::shared_ptr)this); if(child_it != children->end()) children->erase(child_it); if(m_parent->numChildren() == 0) @@ -93,12 +93,12 @@ void RBX::Instance::setParent(RBX::Instance* newParent) } m_parent = newParent; - m_parent->m_children.push_back((boost::shared_ptr)this); + m_parent->m_children.push_back((boost::shared_ptr)this); newParent->onChildAdded(this); } } -void RBX::Instance::onChildAdded(RBX::Instance* childAdded) +void RNR::Instance::onChildAdded(RNR::Instance* childAdded) { } \ No newline at end of file diff --git a/src/engine/app/v8/world/World.cpp b/src/engine/app/v8/world/World.cpp index 21b605c..72cedca 100644 --- a/src/engine/app/v8/world/World.cpp +++ b/src/engine/app/v8/world/World.cpp @@ -1,21 +1,21 @@ #include -RBX::World::World() +RNR::World::World() { } -void RBX::World::preStep() +void RNR::World::preStep() { } -double RBX::World::step(float timestep) +double RNR::World::step(float timestep) { } -void RBX::World::update() +void RNR::World::update() { } \ No newline at end of file diff --git a/src/engine/network/Guid.cpp b/src/engine/network/Guid.cpp index cf8b8a1..eb5c737 100644 --- a/src/engine/network/Guid.cpp +++ b/src/engine/network/Guid.cpp @@ -1,16 +1,16 @@ #include -RBX::Guid::Guid() +RNR::Guid::Guid() { } -void RBX::Guid::compare(RBX::Guid* a, RBX::Guid* b) +void RNR::Guid::compare(RNR::Guid* a, RNR::Guid* b) { } -void RBX::Guid::generateGUID(std::string* result) +void RNR::Guid::generateGUID(std::string* result) { } \ No newline at end of file diff --git a/src/include/client/common/Adorn.hpp b/src/include/client/common/Adorn.hpp index b177cc8..240f6b8 100644 --- a/src/include/client/common/Adorn.hpp +++ b/src/include/client/common/Adorn.hpp @@ -6,7 +6,7 @@ namespace GL { // 2d rendering api - class Adorn : public RBX::Adorn + class Adorn : public RNR::Adorn { public: Adorn(); diff --git a/src/include/client/common/RBXNUGraphicsWidget.hpp b/src/include/client/common/RNRGraphicsWidget.hpp similarity index 76% rename from src/include/client/common/RBXNUGraphicsWidget.hpp rename to src/include/client/common/RNRGraphicsWidget.hpp index 6a64f33..eb87d94 100644 --- a/src/include/client/common/RBXNUGraphicsWidget.hpp +++ b/src/include/client/common/RNRGraphicsWidget.hpp @@ -5,12 +5,12 @@ #include #include -class RBXNUGraphicsWidget : public QOpenGLWidget +class RNRGraphicsWidget : public QOpenGLWidget { Q_OBJECT public: - RBXNUGraphicsWidget(QWidget* parent = nullptr); + RNRGraphicsWidget(QWidget* parent = nullptr); double delta_time; diff --git a/src/include/client/studio/StudioWindow.hpp b/src/include/client/studio/StudioWindow.hpp index 78e2afc..b7c605d 100644 --- a/src/include/client/studio/StudioWindow.hpp +++ b/src/include/client/studio/StudioWindow.hpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include class StudioWindow : public QMainWindow @@ -12,7 +12,7 @@ class StudioWindow : public QMainWindow public: StudioWindow(); - RBXNUGraphicsWidget* graphics_widget; + RNRGraphicsWidget* graphics_widget; QTreeWidget* datamodel_tree; protected: void closeEvent(QCloseEvent* event); diff --git a/src/include/engine/app/Name.hpp b/src/include/engine/app/Name.hpp index aee5c80..32fb2db 100644 --- a/src/include/engine/app/Name.hpp +++ b/src/include/engine/app/Name.hpp @@ -2,7 +2,7 @@ #include -namespace RBX +namespace RNR { class Name { @@ -10,8 +10,8 @@ namespace RBX char* c_str(); - static void compare(const RBX::Name *a, const RBX::Name *b); + static void compare(const RNR::Name *a, const RNR::Name *b); static void declare(const char* sName, int dictionaryIndex); - static std::map* dictionary(); + static std::map* dictionary(); }; } \ No newline at end of file diff --git a/src/include/engine/app/gui/Adorn.hpp b/src/include/engine/app/gui/Adorn.hpp index e3cdc1c..4a3ad51 100644 --- a/src/include/engine/app/gui/Adorn.hpp +++ b/src/include/engine/app/gui/Adorn.hpp @@ -6,7 +6,7 @@ // TODO: add G3D -namespace RBX +namespace RNR { // 2d rendering api class Adorn diff --git a/src/include/engine/app/humanoid/Forcefield.hpp b/src/include/engine/app/humanoid/Forcefield.hpp index afe8ffe..257f853 100644 --- a/src/include/engine/app/humanoid/Forcefield.hpp +++ b/src/include/engine/app/humanoid/Forcefield.hpp @@ -2,7 +2,7 @@ #include -namespace RBX +namespace RNR { - void renderForceField(boost::shared_ptr *descendant, RBX::Adorn *adorn, int cycle); + void renderForceField(boost::shared_ptr *descendant, RNR::Adorn *adorn, int cycle); } \ No newline at end of file diff --git a/src/include/engine/app/humanoid/Humanoid.hpp b/src/include/engine/app/humanoid/Humanoid.hpp index 323ba2c..fcc2518 100644 --- a/src/include/engine/app/humanoid/Humanoid.hpp +++ b/src/include/engine/app/humanoid/Humanoid.hpp @@ -2,7 +2,7 @@ #include -namespace RBX +namespace RNR { class Humanoid : Instance { diff --git a/src/include/engine/app/v8/tree/Instance.hpp b/src/include/engine/app/v8/tree/Instance.hpp index 40db760..2beabfc 100644 --- a/src/include/engine/app/v8/tree/Instance.hpp +++ b/src/include/engine/app/v8/tree/Instance.hpp @@ -4,38 +4,38 @@ #include #include -namespace RBX +namespace RNR { class Instance { private: std::string m_name; - RBX::Instance* m_parent; - std::vector> m_children; + RNR::Instance* m_parent; + std::vector> m_children; bool m_archivable; public: Instance(); Instance(std::string name); - bool contains(RBX::Instance* child); - bool isAncestorOf(RBX::Instance* instance); + bool contains(RNR::Instance* child); + bool isAncestorOf(RNR::Instance* instance); - virtual bool askSetParent(RBX::Instance* instance); // derive this - bool canSetParent(RBX::Instance* instance); - virtual bool askAddChild(RBX::Instance* instance); // derive this - bool canAddChild(RBX::Instance* instance); + virtual bool askSetParent(RNR::Instance* instance); // derive this + bool canSetParent(RNR::Instance* instance); + virtual bool askAddChild(RNR::Instance* instance); // derive this + bool canAddChild(RNR::Instance* instance); - void createChild(boost::shared_ptr* result, const RBX::Name *className); + void createChild(boost::shared_ptr* result, const RNR::Name *className); - RBX::Instance* getParent() { return this->m_parent; }; + RNR::Instance* getParent() { return this->m_parent; }; std::string getName() { return this->m_name; }; - void setParent(RBX::Instance* newParent); + void setParent(RNR::Instance* newParent); void setName(std::string name); - std::vector>* getChildren() { return &this->m_children; }; + std::vector>* getChildren() { return &this->m_children; }; int numChildren() { return this->m_children.size(); }; - void onChildAdded(RBX::Instance* childAdded); + void onChildAdded(RNR::Instance* childAdded); }; } \ No newline at end of file diff --git a/src/include/engine/app/v8/world/World.hpp b/src/include/engine/app/v8/world/World.hpp index baf2c8b..13a7410 100644 --- a/src/include/engine/app/v8/world/World.hpp +++ b/src/include/engine/app/v8/world/World.hpp @@ -1,6 +1,6 @@ #pragma once -namespace RBX +namespace RNR { class World { diff --git a/src/include/engine/network/Guid.hpp b/src/include/engine/network/Guid.hpp index 7e779d5..05fea9b 100644 --- a/src/include/engine/network/Guid.hpp +++ b/src/include/engine/network/Guid.hpp @@ -2,7 +2,7 @@ #include -namespace RBX +namespace RNR { class Guid { @@ -10,6 +10,6 @@ namespace RBX Guid(); static void generateGUID(std::string *result); - static void compare(RBX::Guid* a, RBX::Guid* b); + static void compare(RNR::Guid* a, RNR::Guid* b); }; } \ No newline at end of file diff --git a/src/include/engine/rendering/TextureProxyBase.hpp b/src/include/engine/rendering/TextureProxyBase.hpp index ec02226..a9f381f 100644 --- a/src/include/engine/rendering/TextureProxyBase.hpp +++ b/src/include/engine/rendering/TextureProxyBase.hpp @@ -1,6 +1,6 @@ #pragma once -namespace RBX +namespace RNR { class TextureProxyBase {