move sPhysics and sCollision into Physics folder, add lua_applyForce …

…to console
JerboaBurrow · Dec 20, 2023 · 82c4eac · 82c4eac
1 parent 44767eb
commit 82c4eac
Show file tree

Hide file tree

Showing 16 changed files with 112 additions and 34 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -149,6 +149,7 @@ file(GLOB SRC
     "src/Console/*.cpp"
     "src/System/Rendering/*.cpp"
     "src/System/Sound/*.cpp"
+    "src/System/Physics/*.cpp"
 )
 
 if (NOT ANDROID)

diff --git a/demo/android/perlinWorld/app/src/main/cpp/hopAndroid.cpp b/demo/android/perlinWorld/app/src/main/cpp/hopAndroid.cpp
@@ -17,9 +17,9 @@
 
 #include <Object/entityComponentSystem.h>
 
-#include <System/sPhysics.h>
+#include <System/Physics/sPhysics.h>
 #include <System/Rendering/sRender.h>
-#include <System/sCollision.h>
+#include <System/Physics/sCollision.h>
 
 #include <World/world.h>
 #include <World/marchingWorld.h>

diff --git a/demo/desktop/perlinWorld/sfml/sfmlPerlinWorld.cpp b/demo/desktop/perlinWorld/sfml/sfmlPerlinWorld.cpp
@@ -26,9 +26,9 @@ using namespace std::chrono;
 
 #include <Object/entityComponentSystem.h>
 
-#include <System/sPhysics.h>
+#include <System/Physics/sPhysics.h>
 #include <System/Rendering/sRender.h>
-#include <System/sCollision.h>
+#include <System/Physics/sCollision.h>
 
 #include <World/world.h>
 #include <World/marchingWorld.h>

diff --git a/demo/desktop/perlinWorld/standalone/perlinWorld.cpp b/demo/desktop/perlinWorld/standalone/perlinWorld.cpp
@@ -20,9 +20,9 @@ using namespace std::chrono;
 
 #include <Object/entityComponentSystem.h>
 
-#include <System/sPhysics.h>
+#include <System/Physics/sPhysics.h>
 #include <System/Rendering/sRender.h>
-#include <System/sCollision.h>
+#include <System/Physics/sCollision.h>
 
 #include <World/world.h>
 #include <World/marchingWorld.h>

diff --git a/demo/desktop/softBodyTetris/sfml/main.h b/demo/desktop/softBodyTetris/sfml/main.h
@@ -29,9 +29,9 @@ using namespace std::chrono;
 
 #include <Object/entityComponentSystem.h>
 
-#include <System/sPhysics.h>
+#include <System/Physics/sPhysics.h>
 #include <System/Rendering/sRender.h>
-#include <System/sCollision.h>
+#include <System/Physics/sCollision.h>
 
 #include <World/world.h>
 #include <World/marchingWorld.h>

diff --git a/demo/desktop/softBodyTetris/standalone/main.h b/demo/desktop/softBodyTetris/standalone/main.h
@@ -23,9 +23,9 @@ using namespace std::chrono;
 
 #include <Object/entityComponentSystem.h>
 
-#include <System/sPhysics.h>
+#include <System/Physics/sPhysics.h>
 #include <System/Rendering/sRender.h>
-#include <System/sCollision.h>
+#include <System/Physics/sCollision.h>
 #include <System/Sound/sSound.h>
 
 #include <World/world.h>

diff --git a/include/Console/console.h b/include/Console/console.h
@@ -7,9 +7,10 @@
 #include <Console/LuaNumber.h>
 #include <Console/LuaString.h>
 #include <Console/LuaTable.h>
-#include <System/sPhysics.h>
-#include <System/sCollision.h>
+#include <System/Physics/sPhysics.h>
+#include <System/Physics/sCollision.h>
 #include <log.h>
+#include <Object/id.h>
 
 #include <memory>
 #include <vector>
@@ -118,21 +119,29 @@ namespace Hop
 
     int timeMillis(lua_State * lua);
 
+    int lua_applyForce(lua_State * lua);
+
     // register lib
 
     const luaL_Reg hopLib[] =
     {
         {"loadObject", &dispatchEntityComponentSystem<&EntityComponentSystem::lua_loadObject>},
         {"getTransform", &dispatchEntityComponentSystem<&EntityComponentSystem::lua_getTransform>},
         {"setTransform", &dispatchEntityComponentSystem<&EntityComponentSystem::lua_setTransform>},
+        ///////////////////////////////////////////////////////////////////////////////////////////
         {"maxCollisionPrimitiveSize",&dispatchWorld<&AbstractWorld::lua_worldMaxCollisionPrimitiveSize>},
+        ///////////////////////////////////////////////////////////////////////////////////////////
         {"setPhysicsTimeStep",&dispatchsPhysics<&sPhysics::lua_setTimeStep>},
         {"setPhysicsSubSamples",&dispatchsPhysics<&sPhysics::lua_setSubSamples>},
         {"kineticEnergy", &dispatchsPhysics<&sPhysics::lua_kineticEnergy>},
+        {"setGravity", &dispatchsPhysics<&sPhysics::lua_setGravity>},
+        ///////////////////////////////////////////////////////////////////
         {"setCoefRestitution",&dispatchsCollision<&sCollision::lua_setCOR>},
+        ////////////////////////////////////////////////////////////////////
         {"setLoopRoutines",&dispatchLoopRoutines<&LoopRoutines::lua_setRoutines>},
         {"configure", &configure},
         {"timeMillis", &timeMillis},
+        {"applyForce", &lua_applyForce},
         {NULL, NULL}
     };
 

diff --git a/include/Object/entityComponentSystem.h b/include/Object/entityComponentSystem.h
@@ -15,8 +15,8 @@
 
 #include <System/Rendering/sRender.h>
 #include <System/Rendering/sSpriteRender.h>
-#include <System/sPhysics.h>
-#include <System/sCollision.h>
+#include <System/Physics/sPhysics.h>
+#include <System/Physics/sCollision.h>
 #include <System/Sound/sSound.h>
 
 #include <unordered_map>

diff --git a/include/System/sCollision.h → include/System/Physics/sCollision.h b/include/System/sCollision.h → include/System/Physics/sCollision.h
diff --git a/include/System/sPhysics.h → include/System/Physics/sPhysics.h b/include/System/sPhysics.h → include/System/Physics/sPhysics.h
@@ -6,8 +6,9 @@
 #include <Maths/special.h>
 #include <Thread/threadPool.h>
 #include <Component/componentArray.h>
-#include <System/sCollision.h>
+#include <System/Physics/sCollision.h>
 #include <World/world.h>
+#include <Console/lua.h>
 
 namespace Hop::Object
 {
@@ -68,13 +69,15 @@ namespace Hop::System::Physics
             EntityComponentSystem * m,
             Id & i,
             double fx,
-            double fy
+            double fy,
+            bool global = false
         );
 
         void applyForce(
             EntityComponentSystem * m,
             double fx,
-            double fy
+            double fy,
+            bool global = false
         );
 
         // automatically compute stable simulation parameters
@@ -140,6 +143,10 @@ namespace Hop::System::Physics
         void setSubSamples(unsigned s){subSamples = s;}
         void setGravity(double g, double nx, double ny){gravity = g; ngx = nx; ngy = ny;}
 
+        // Lua 
+
+        int lua_setGravity(lua_State * lua);
+
     private:
 
         void update(EntityComponentSystem * m, ThreadPool * workers = nullptr);

diff --git a/include/System/sPlayer.h b/include/System/sPlayer.h
diff --git a/src/Console/console.cpp b/src/Console/console.cpp
@@ -145,4 +145,35 @@ namespace Hop
 
     }
 
+    int lua_applyForce(lua_State * lua)
+    {
+        LuaNumber fx, fy;
+        LuaString sid;
+
+        int n = lua_gettop(lua);
+
+        if (n != 3)
+        {
+            lua_pushliteral(lua,"expected id and force vector, fx, fy as argument");
+            return lua_error(lua);
+        }
+
+        sid.read(lua, 1);
+        Hop::Object::Id id(sid.characters);
+
+        fx.read(lua, 2);
+        fy.read(lua, 3);
+
+        LuaExtraSpace * store = *static_cast<LuaExtraSpace**>(lua_getextraspace(lua));
+
+        if (!store->ecs->hasComponent<cPhysics>(id))
+        {
+            lua_pushliteral(lua, "object has no physics component");
+            return lua_error(lua);
+        }
+
+        store->physics->applyForce(store->ecs, fx, fy, true);
+
+        return 0;
+    }
 }
diff --git a/src/System/Physics/LuaBindings/lua_physics.cpp b/src/System/Physics/LuaBindings/lua_physics.cpp
@@ -0,0 +1,31 @@
+#include <System/Physics/sPhysics.h>
+#include <Console/LuaNumber.h>
+#include <Console/LuaString.h>
+
+namespace Hop::System::Physics
+{
+    int sPhysics::lua_setGravity(lua_State * lua)
+    {
+
+        LuaNumber gx, gy;
+
+        int n = lua_gettop(lua);
+
+        if (n != 2)
+        {
+            lua_pushliteral(lua,"expected gravity vector, gx, gy as argument");
+            return lua_error(lua);
+        }
+
+        gx.read(lua, 1);
+        gy.read(lua, 2);
+
+        double norm = std::sqrt(gx*gx+gy*gy);
+
+        setGravity(norm, double(gx)/norm, double(gy)/norm);
+
+        return 0;
+
+    }
+
+}
diff --git a/src/System/sCollision.cpp → src/System/Physics/sCollision.cpp b/src/System/sCollision.cpp → src/System/Physics/sCollision.cpp
@@ -1,4 +1,4 @@
-#include <System/sCollision.h>
+#include <System/Physics/sCollision.h>
 
 namespace Hop::System::Physics
 {

diff --git a/src/System/sPhysics.cpp → src/System/Physics/sPhysics.cpp b/src/System/sPhysics.cpp → src/System/Physics/sPhysics.cpp
@@ -1,4 +1,4 @@
-#include <System/sPhysics.h>
+#include <System/Physics/sPhysics.h>
 
 #include <chrono>
 using namespace std::chrono;
@@ -178,7 +178,8 @@ namespace Hop::System::Physics
         EntityComponentSystem * m,
         Id & i,
         double fx,
-        double fy
+        double fy,
+        bool global
     )
     {
 
@@ -190,7 +191,7 @@ namespace Hop::System::Physics
             cCollideable & data = collideables.get(i);
             if (!data.mesh.isRigid())
             {   
-                data.mesh.applyForce(fx, fy);
+                data.mesh.applyForce(fx, fy, global);
             }
             else
             {
@@ -209,7 +210,8 @@ namespace Hop::System::Physics
     void sPhysics::applyForce(
         EntityComponentSystem * m,
         double fx,
-        double fy
+        double fy,
+        bool global
     )
     {
 
@@ -223,7 +225,7 @@ namespace Hop::System::Physics
                 cCollideable & data = collideables.get(*it);
                 if (!data.mesh.isRigid())
                 {   
-                    data.mesh.applyForce(fx, fy);
+                    data.mesh.applyForce(fx, fy, global);
                     continue;
                 }
             }
@@ -288,4 +290,6 @@ namespace Hop::System::Physics
         return (dt*1.05)*gravity/radius;
     }
 
-}
+}
+
+#include <System/Physics/LuaBindings/lua_physics.cpp>
diff --git a/tools/meshEditor/main.h b/tools/meshEditor/main.h
@@ -1,5 +1,5 @@
-#ifndef MAIN
-#define MAIN
+#ifndef MAIN_H
+#define MAIN_H
 
 #include <iostream>
 #include <sstream>
@@ -23,9 +23,9 @@ using namespace std::chrono;
 
 #include <Object/entityComponentSystem.h>
 
-#include <System/sPhysics.h>
+#include <System/Physics/sPhysics.h>
 #include <System/Rendering/sRender.h>
-#include <System/sCollision.h>
+#include <System/Physics/sCollision.h>
 
 #include <World/world.h>
 #include <World/marchingWorld.h>
@@ -88,4 +88,4 @@ using Hop::Logging::WARN;
 
 using Hop::Util::fixedLengthNumber;
 
-#endif /* MAIN */
+#endif /* MAIN_H */