minor scripting changes

sdslabs · Mar 7, 2022 · 84defab · 84defab
1 parent f89a5c6
commit 84defab
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 37 deletions.
diff --git a/rootex/assets/scenes/pause.scene.json b/rootex/assets/scenes/pause.scene.json
@@ -28,17 +28,7 @@
     ],
     "entity": {
         "components": {
-            "MusicComponent": {
-                "attenuationModel": 53251,
-                "audio": "rootex/assets/ball.wav",
-                "isAttenuated": false,
-                "isLooping": true,
-                "maxDistance": 100.0,
-                "playOnStart": true,
-                "referenceDistance": 1.0,
-                "rollOffFactor": 1.0,
-                "volume": 1.0
-            },
+
             "TextUIComponent": {
                 "color": {
                     "a": 1.0,

diff --git a/rootex/framework/components/physics/rigid_body_component.h b/rootex/framework/components/physics/rigid_body_component.h
@@ -49,13 +49,13 @@ class RigidBodyComponent : public CollisionComponent, public btMotionState
 	void getWorldTransform(btTransform& worldTrans) const override;
 	void setWorldTransform(const btTransform& worldTrans) override;
 
-	void updateTransform();
-
 	void handleHit(Hit* hit) override;
 
 public:
 	virtual ~RigidBodyComponent() = default;
 
+	void updateTransform();
+
 	void applyForce(const Vector3& force);
 	void applyTorque(const Vector3& torque);
 

diff --git a/rootex/framework/components/visual/model/renderable_component.cpp b/rootex/framework/components/visual/model/renderable_component.cpp
@@ -232,26 +232,19 @@ void RenderableComponent::draw()
 
 			ImGui::BeginGroup();
 			ImGui::Text("%s", newMaterial->getPath().filename().generic_string().c_str());
-			if (ImGui::Button((ICON_ROOTEX_PENCIL_SQUARE_O "##" + newMaterial->getPath().generic_string()).c_str()))
+			if (ImGui::Button((ICON_ROOTEX_PENCIL_SQUARE_O "##1" + newMaterial->getPath().generic_string()).c_str()))
 			{
 				EventManager::GetSingleton()->call(EditorEvents::EditorOpenFile, VariantVector { newMaterial->getPath().generic_string(), (int)newMaterial->getType() });
 			}
 			ImGui::SameLine();
-			if (ImGui::Button((ICON_ROOTEX_FOLDER_OPEN "##" + newMaterial->getPath().generic_string()).c_str()))
+			if (ImGui::Button((ICON_ROOTEX_FOLDER_OPEN "##2" + newMaterial->getPath().generic_string()).c_str()))
 			{
 				if (Optional<String> result = OS::SelectFile("Material(*.rmat)\0*.rmat\0", "game/assets/materials/"))
 				{
 					setMaterialOverride(oldMaterial, ResourceLoader::CreateMaterialResourceFile(*result));
 				}
 			}
 			ImGui::SameLine();
-			if (ImGui::Button((ICON_ROOTEX_FOLDER_OPEN "##" + oldMaterial->getPath().generic_string()).c_str()))
-			{
-				if (Optional<String> result = OS::SelectFile("Material(*.rmat)\0*.rmat\0", "game/assets/materials/"))
-				{
-					setMaterialOverride(oldMaterial, ResourceLoader::CreateMaterialResourceFile(*result));
-				}
-			}
 			ImGui::EndGroup();
 			ImGui::NextColumn();
 			ImGui::Separator();

diff --git a/rootex/framework/system.cpp b/rootex/framework/system.cpp
@@ -55,23 +55,29 @@ void System::setActive(bool enabled)
 
 void System::pause()
 {
-	for (auto& systemType : GetSystems())
-	{
-		for (auto& system : systemType)
-		{
-			system->m_IsSystemPaused = true;
-		}
-	}
+	EventManager::GetSingleton()->defer([]()
+	    {
+		    for (auto& systemType : GetSystems())
+		    {
+			    for (auto& system : systemType)
+			    {
+				    system->m_IsSystemPaused = true;
+			    }
+		    }
+	    });
 }
 void System::unPause()
 {
-	for (auto& systemType : GetSystems())
-	{
-		for (auto& system : systemType)
-		{
-			system->m_IsSystemPaused = false;
-		}
-	}
+	EventManager::GetSingleton()->defer([]()
+	    {
+		    for (auto& systemType : GetSystems())
+		    {
+			    for (auto& system : systemType)
+			    {
+				    system->m_IsSystemPaused = false;
+			    }
+		    }
+	    });
 }
 
 void System::draw()

diff --git a/rootex/script/interpreter.cpp b/rootex/script/interpreter.cpp
@@ -260,6 +260,7 @@ void LuaInterpreter::registerTypes()
 		resourceLoader["CreateAnimatedModel"] = &ResourceLoader::CreateAnimatedModelResourceFile;
 		resourceLoader["CreateCollisionModel"] = &ResourceLoader::CreateAnimatedModelResourceFile;
 		resourceLoader["CreateParticleEffectResourceFile"] = &ResourceLoader::CreateParticleEffectResourceFile;
+		resourceLoader["CreateMaterialResourceFile"] = &ResourceLoader::CreateMaterialResourceFile;
 	}
 	{
 		sol::usertype<ResourceFile> resourceFile = rootex.new_usertype<ResourceFile>("ResourceFile");
@@ -491,7 +492,7 @@ void LuaInterpreter::registerTypes()
 
 		transformComponent["getPosition"] = &TransformComponent::getPosition;
 		transformComponent["setPosition"] = &TransformComponent::setPosition;
-
+		
 		transformComponent["getScale"] = &TransformComponent::getScale;
 		transformComponent["setScale"] = &TransformComponent::setScale;
 
@@ -521,6 +522,8 @@ void LuaInterpreter::registerTypes()
 		    "ModelComponent",
 		    sol::base_classes, sol::bases<Component, RenderableComponent>());
 		modelComponent["getModelResourceFile"] = &ModelComponent::getModelResourceFile;
+		modelComponent["setMaterialOverride"] = &RenderableComponent::setMaterialOverride;
+		modelComponent["getMaterialOverride"] = &RenderableComponent::getMaterialOverride;
 	}
 	{
 		sol::usertype<AnimatedModelComponent> animatedModelComponent = rootex.new_usertype<AnimatedModelComponent>(
@@ -620,6 +623,8 @@ void LuaInterpreter::registerTypes()
 		rigidBodyComponent["applyTorque"] = &RigidBodyComponent::applyTorque;
 		rigidBodyComponent["setAxisLock"] = &RigidBodyComponent::setAxisLock;
 		rigidBodyComponent["translate"] = &RigidBodyComponent::translate;
+
+		rigidBodyComponent["update"] = &RigidBodyComponent::updateTransform;
 	}
 	{
 		sol::usertype<BoxColliderComponent> bcc = rootex.new_usertype<BoxColliderComponent>(