From 7ff4b82ea1a67fdb7e5bcbeb62a36048fa00d80a Mon Sep 17 00:00:00 2001 From: floralrainfall Date: Sun, 16 Jul 2023 23:43:39 -0400 Subject: [PATCH] add access levels --- Projects/Client/Studio/CMakeLists.txt | 5 ++++- .../Engine/Header/App/Script/ReflectionProperty.hpp | 9 ++++++--- .../Engine/Header/App/V8/DataModel/FaceInstance.hpp | 12 ++++++++++++ Projects/Engine/Header/Helpers/NormalId.hpp | 12 ++---------- .../Engine/Source/App/V8/DataModel/FaceInstance.cpp | 9 ++++++--- Projects/Engine/Source/Helpers/NormalId.cpp | 11 ++++++++++- 6 files changed, 40 insertions(+), 18 deletions(-) diff --git a/Projects/Client/Studio/CMakeLists.txt b/Projects/Client/Studio/CMakeLists.txt index 9950e48..a188567 100644 --- a/Projects/Client/Studio/CMakeLists.txt +++ b/Projects/Client/Studio/CMakeLists.txt @@ -25,4 +25,7 @@ target_link_libraries(Studio PRIVATE Common Engine) set_target_properties(Studio PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON -) \ No newline at end of file +) + +install(TARGETS Studio + RUNTIME_DEPENDENCIES) \ No newline at end of file diff --git a/Projects/Engine/Header/App/Script/ReflectionProperty.hpp b/Projects/Engine/Header/App/Script/ReflectionProperty.hpp index d79cff6..6bb63b4 100644 --- a/Projects/Engine/Header/App/Script/ReflectionProperty.hpp +++ b/Projects/Engine/Header/App/Script/ReflectionProperty.hpp @@ -7,9 +7,12 @@ namespace RNR { enum ReflectionPropertyAccess { - ACCESS_SCRIPT, - ACCESS_CONSOLE, - ACCESS_RNR, + ACCESS_NONE, + ACCESS_PLUGIN, + ACCESS_LOCALUSER, + ACCESS_WRITEPLAYER, + ACCESS_AUTHORIZEDSCRIPT, + ACCESS_AUTHORIZED, }; template diff --git a/Projects/Engine/Header/App/V8/DataModel/FaceInstance.hpp b/Projects/Engine/Header/App/V8/DataModel/FaceInstance.hpp index 9195cc3..823e166 100644 --- a/Projects/Engine/Header/App/V8/DataModel/FaceInstance.hpp +++ b/Projects/Engine/Header/App/V8/DataModel/FaceInstance.hpp @@ -1,4 +1,16 @@ #pragma once #include +#include +namespace RNR +{ + class FaceInstance : public Instance, Ogre::ManualObject + { + private: + NormalId m_face; + + public: + + }; +} \ No newline at end of file diff --git a/Projects/Engine/Header/Helpers/NormalId.hpp b/Projects/Engine/Header/Helpers/NormalId.hpp index 3832735..b31ed84 100644 --- a/Projects/Engine/Header/Helpers/NormalId.hpp +++ b/Projects/Engine/Header/Helpers/NormalId.hpp @@ -1,16 +1,8 @@ #pragma once -namespace RNR { - Ogre::Vector3 normalIdVectors[] = { - Ogre::Vector3(1, 0, 0), - Ogre::Vector3(0, 1, 0), - Ogre::Vector3(0, 0, 1), - Ogre::Vector3(-1, 0, 0), - Ogre::Vector3(0, -1, 0), - Ogre::Vector3(0, 0, -1), - Ogre::Vector3(0, 0, 0) - }; +#include +namespace RNR { enum NormalId { NORM_X, diff --git a/Projects/Engine/Source/App/V8/DataModel/FaceInstance.cpp b/Projects/Engine/Source/App/V8/DataModel/FaceInstance.cpp index cfdf680..c64a5c2 100644 --- a/Projects/Engine/Source/App/V8/DataModel/FaceInstance.cpp +++ b/Projects/Engine/Source/App/V8/DataModel/FaceInstance.cpp @@ -1,4 +1,7 @@ -#pragma once - #include -#include \ No newline at end of file +#include + +namespace RNR +{ + +} \ No newline at end of file diff --git a/Projects/Engine/Source/Helpers/NormalId.cpp b/Projects/Engine/Source/Helpers/NormalId.cpp index 1031405..a66f4ff 100644 --- a/Projects/Engine/Source/Helpers/NormalId.cpp +++ b/Projects/Engine/Source/Helpers/NormalId.cpp @@ -3,6 +3,15 @@ #include namespace RNR { + static Ogre::Vector3 normalIdVectors[] = { + Ogre::Vector3(1, 0, 0), + Ogre::Vector3(0, 1, 0), + Ogre::Vector3(0, 0, 1), + Ogre::Vector3(-1, 0, 0), + Ogre::Vector3(0, -1, 0), + Ogre::Vector3(0, 0, -1), + }; + bool validNormalId(NormalId normalId) { return ((normalId >= 0) && (normalId < 6)); } @@ -154,7 +163,7 @@ namespace RNR { return Ogre::Vector3::UNIT_X; } } - + Ogre::Vector3 objectToUvw(const Ogre::Vector3& object, NormalId faceId) { switch (faceId)