include/fggl/util/states.hpp

@@ -20,6 +20,8 @@
 #include <memory>
 #include <unordered_map>
 
+#include "fggl/debug/logging.hpp"
+
 namespace fggl::util {
 
 	template<typename S, typename I>
@@ -48,16 +50,20 @@ namespace fggl::util {
 				return (T *) (m_states[name].get());
 			}
 
-			void change(const Identifer &name) {
-				assertm(m_states.find(name) != m_states.end(), "state does not exist");
+			bool change(const Identifer &name) {
+				if (m_states.find(name) == m_states.end()) {
+					debug::error("attempted to change to non-existent state {}, ignoring you.", name);
+					return false;
+				}
 
 				active().deactivate();
 				m_active = name;
 				active().activate();
+				return true;
 			}
 
 			StateType &active() const {
-				assertm(m_states.find(m_active) != m_states.end(), "active state does not exist!");
+				ASSERT_MSG(m_states.find(m_active) != m_states.end(), "active state does not exist!");
 				return *(m_states.at(m_active).get());
 			}
 

integrations/README.md

+# Integration Modules
+This adds support for 3rd party libraries to the engine. These can be included in projects
+to expose modules which can then be used in your applications.
+
+## Integrations Provided
+The following integration modules are povided in this folder. For more information please see the readme for that module.
+
+| Integration | Module Name           | Description                                        |
+|-------------|-----------------------|----------------------------------------------------|
+| Bullet      | `fggl::phys::Bullet3` | Provides Bullet3 integration into the game engine. |
+| Lua         | `fggl::script::Lua`   | Provides LUA scripting support for the engine      |
+
+Modules that cannot be included for legal reasons will be packaged independently of this repository.
\ No newline at end of file

integrations/bullet/CMakeLists.txt

+# bullet integration support
+find_package( Bullet CONFIG )
+if ( NOT Bullet_FOUND )
+    message(WARNING "Bullet not found - disabling bullet physics integration")
+else()
+    message( STATUS "Bullet is poorly packaged, you might need to disable support for it" )
+
+    add_library(fgglbt STATIC)
+
+    if ( MSVC )
+        # see https://github.com/microsoft/vcpkg/issues/7877
+        target_link_libraries(fgglbt PUBLIC LinearMath Bullet3Common BulletDynamics BulletSoftBody BulletCollision BulletInverseDynamics)
+    else()
+        # FIXME: this shouldn't be necessary, for modern cmake, linking the libraries should be enough
+        target_compile_definitions(fgglbt PUBLIC ${BULLET_DEFINITIONS})
+
+        if ( BULLET_INCLUDE_DIRS STREQUAL "include/bullet" )
+            message( STATUS "Bullet include path is relative - hard-coding" )
+            # FIXME possible debian packing bug: path is relative in BulletConfig.cmake
+            # FIXME debian packaging bug: BulletConfig.cmake lists BulletInverseDynamics, but that's packaged in bullet-extras
+            target_include_directories(fgglbt PUBLIC ${BULLET_ROOT_DIR}/${BULLET_INCLUDE_DIRS})
+        else()
+            target_include_directories(fgglbt PUBLIC ${BULLET_INCLUDE_DIRS})
+        endif()
+        target_link_libraries(fgglbt PUBLIC ${BULLET_LIBRARIES})
+    endif()
+
+    target_link_libraries( fgglbt PUBLIC fggl )
+    target_include_directories( fgglbt
+        PUBLIC
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+            $<INSTALL_INTERFACE:include>
+    )
+
+    # bullet cpp files
+    target_sources( fgglbt
+        PRIVATE
+            src/module.cpp
+            src/simulation.cpp
+            src/phys_draw.cpp
+            src/service.cpp
+    )
+endif()

include/fggl/phys/bullet/bullet.hpp → integrations/bullet/include/fggl/phys/bullet/bullet.hpp

@@ -12,6 +12,20 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
 //
 // Created by webpigeon on 24/04/22.
 //
@@ -19,50 +33,10 @@
 #ifndef FGGL_PHYS_BULLET_BULLET_HPP
 #define FGGL_PHYS_BULLET_BULLET_HPP
 
-#include "fggl/ecs3/module/module.hpp"
+#define FGGL_MODULE_BULLET fggl::phys::Bullet3
 
 #include "fggl/phys/types.hpp"
 #include "fggl/phys/bullet/types.hpp"
-
-namespace fggl::phys::bullet {
-
-	/**
-	 * Bullet integration module.
-	 *
-	 * This provides the ability for FGGL to use bullet as a physics backened. Bullet is mature, stable physics
-	 * engine which makes it suitable for most use cases. For use with FGGL there is a reasonable amount of copying
-	 * back and forth to keep the two states in sync.
-	 */
-	struct BulletModule : ecs3::Module {
-		public:
-			BulletModule() = default;
-
-			[[nodiscard]]
-			std::string name() const override {
-				return "phys::Bullet3";
-			}
-
-			void onLoad(ecs3::ModuleManager & /*manager*/, ecs3::TypeRegistry &types) override {
-				// dependencies
-				types.make<phys::CollisionCallbacks>();
-				types.make<phys::CollisionCache>();
-
-				types.make<phys::RigidBody>();
-				types.make<phys::Dynamics>();
-
-				// my types
-				types.make<phys::bullet::BulletBody>();
-			}
-
-	};
-
-} // namespace fggl::phys::bullet
-
-namespace fggl::phys {
-
-	// allows using fggl::phys::Bullet3 as the module name
-	using Bullet3 = bullet::BulletModule;
-
-} // namespace fggl::phys
+#include "fggl/phys/bullet/module.hpp"
 
 #endif //FGGL_PHYS_BULLET_BULLET_HPP

integrations/bullet/include/fggl/phys/bullet/module.hpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 31/07/22.
+//
+
+#ifndef FGGL_INTEGRATIONS_BULLET_PHYS_BULLET_MODULE_HPP
+#define FGGL_INTEGRATIONS_BULLET_PHYS_BULLET_MODULE_HPP
+
+#include "fggl/modules/module.hpp"
+#include "fggl/entity/module.hpp"
+
+#include "fggl/phys/types.hpp"
+#include "fggl/phys/service.hpp"
+#include "fggl/phys/bullet/types.hpp"
+
+namespace fggl::phys::bullet {
+
+	constexpr util::GUID CONFIG_PHYS_BODY = util::make_guid("phys::body");
+
+	struct Bullet {
+		constexpr static const char* name = "fggl::phys::bullet";
+		constexpr static const std::array<modules::ModuleService, 1> provides = {
+			phys::PhysicsProvider::service
+		};
+		constexpr static const std::array<modules::ModuleService, 1> depends = {
+			entity::EntityFactory::service
+		};
+		static bool factory(modules::ModuleService name, modules::Services& serviceManager);
+	};
+
+} // namespace fggl::phys::bullet
+
+namespace fggl::phys {
+	using Bullet3 = bullet::Bullet;
+
+} // namespace fggl::phys
+
+#endif //FGGL_INTEGRATIONS_BULLET_PHYS_BULLET_MODULE_HPP

include/fggl/phys/bullet/motion.hpp → integrations/bullet/include/fggl/phys/bullet/motion.hpp

@@ -12,6 +12,20 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
 //
 // Created by webpigeon on 11/06/22.
 //
@@ -19,37 +33,43 @@
 #ifndef FGGL_PHYS_BULLET_MOTION_HPP
 #define FGGL_PHYS_BULLET_MOTION_HPP
 
-#include "fggl/phys/bullet/types.hpp"
+#include "types.hpp"
+#include "fggl/debug/logging.hpp"
 
 namespace fggl::phys::bullet {
 
 	class FgglMotionState : public btMotionState {
 		public:
-			FgglMotionState(fggl::ecs3::World* world, fggl::ecs3::entity_t entity) : m_world(world), m_entity(entity) {
+			FgglMotionState(entity::EntityManager* world, entity::EntityID entity) : m_world(world), m_entity(entity) {
 			}
-			virtual ~FgglMotionState() = default;
+			~FgglMotionState() override = default;
 
 			void getWorldTransform(btTransform& worldTrans) const override {
-				const auto* transform = m_world->get<fggl::math::Transform>(m_entity);
-				worldTrans.setFromOpenGLMatrix( glm::value_ptr(transform->model()) );
+				const auto* transform = m_world->tryGet<fggl::math::Transform>(m_entity);
+				if ( transform == nullptr ) {
+					debug::error("BT: attempted to get transform of entity without transform component.");
+					return;
+				}
+
+				worldTrans.setFromOpenGLMatrix(glm::value_ptr(transform->model()));
 			}
 
 			void setWorldTransform(const btTransform& worldTrans) override {
-				auto* transform = m_world->get<fggl::math::Transform>(m_entity);
+				auto& transform = m_world->get<fggl::math::Transform>(m_entity);
 
 				// set position
 				auto btOrigin = worldTrans.getOrigin();
-				transform->origin( {btOrigin.x(), btOrigin.y(), btOrigin.z()} );
+				transform.origin( {btOrigin.x(), btOrigin.y(), btOrigin.z()} );
 
 				// set rotation
 				math::vec3 angles;
 				worldTrans.getRotation().getEulerZYX(angles.x, angles.y, angles.z);
-				transform->euler(angles);
+				transform.euler(angles);
 			}
 
 		private:
-			fggl::ecs3::World* m_world;
-			fggl::ecs3::entity_t m_entity;
+			entity::EntityManager* m_world;
+			entity::EntityID m_entity;
 	};
 
 } // namespace fggl::phys::bullet

include/fggl/ecs3/ecs.hpp → integrations/bullet/include/fggl/phys/bullet/service.hpp

@@ -12,28 +12,22 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef FGGL_ECS3_ECS_HPP
-#define FGGL_ECS3_ECS_HPP
+//
+// Created by webpigeon on 01/08/22.
+//
 
-#include "fggl/ecs3/module/module.hpp"
-#include <fggl/ecs3/prototype/world.hpp>
-#include <fggl/math/types.hpp>
+#ifndef FGGL_INTEGRATIONS_BULLET_PHYS_BULLET_BULLETSERVICE_H
+#define FGGL_INTEGRATIONS_BULLET_PHYS_BULLET_BULLETSERVICE_H
 
-namespace fggl::ecs3 {
+#include "fggl/phys/service.hpp"
 
-	using World = prototype::World;
-
-	class ecsTypes : public Module {
+namespace fggl::phys::bullet {
 
+	class BulletProvider : public phys::PhysicsProvider {
 		public:
-			inline std::string name() const override {
-				return "ecs::core";
-			}
-
-			inline void onLoad(ModuleManager& manager, TypeRegistry& types) override {
-			}
+			PhysicsEngine* create(entity::EntityManager* entityManager, entity::EntityFactory* factory) override;
 	};
 
 }
 
-#endif
\ No newline at end of file
+#endif //FGGL_INTEGRATIONS_BULLET_PHYS_BULLET_BULLETSERVICE_H

include/fggl/phys/bullet/types.hpp → integrations/bullet/include/fggl/phys/bullet/types.hpp

@@ -12,6 +12,20 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
 //
 // Created by webpigeon on 24/04/22.
 //
@@ -19,9 +33,8 @@
 #ifndef FGGL_PHYS_BULLET_TYPES_HPP
 #define FGGL_PHYS_BULLET_TYPES_HPP
 
-#include "fggl/ecs3/ecs.hpp"
 #include "fggl/phys/types.hpp"
-#include "fggl/phys/bullet/phys_draw.hpp"
+#include "phys_draw.hpp"
 
 #include <bullet/btBulletDynamicsCommon.h>
 #include <bullet/btBulletCollisionCommon.h>
@@ -59,34 +72,52 @@ namespace fggl::phys::bullet {
 	 */
 	class BulletPhysicsEngine : public PhysicsEngine {
 		public:
-			explicit BulletPhysicsEngine(ecs3::World* world);
+			explicit BulletPhysicsEngine(entity::EntityManager* world);
 			~BulletPhysicsEngine() override;
 
+			// copy is not allowed
+			BulletPhysicsEngine(const BulletPhysicsEngine&) = delete;
+			BulletPhysicsEngine& operator=(const BulletPhysicsEngine&) = delete;
+
+			// move is not allowed
+			BulletPhysicsEngine(BulletPhysicsEngine&&) = delete;
+			BulletPhysicsEngine& operator=(BulletPhysicsEngine&&) = delete;
+
 			void step() override;
-			void onEntityDeath(ecs::entity_t entity);
+			void onEntityDeath(entity::EntityID entity);
 
-			std::vector<ContactPoint> scanCollisions(ecs3::entity_t entity) override;
-			ecs3::entity_t raycast(math::vec3 from, math::vec3 to) override;
-			std::vector<ecs3::entity_t> raycastAll(math::vec3 from, math::vec3 to) override;
-			std::vector<ecs3::entity_t> sweep(PhyShape& shape, math::Transform& from, math::Transform& to) override;
+			std::vector<ContactPoint> scanCollisions(entity::EntityID entity) override;
+			entity::EntityID raycast(math::vec3 from, math::vec3 to) override;
+			std::vector<entity::EntityID> raycastAll(math::vec3 from, math::vec3 to) override;
+			std::vector<entity::EntityID> sweep(PhyShape& shape, math::Transform& from, math::Transform& to) override;
 
-			bool debugDraw = false;
+			/**
+			 * Add a rigid body to the physics world.
+			 *
+			 * The body should not currently be in the simulation. Physics position will be synced with the motion
+			 * state prior to it being added to the simulation. This method should not need to be called manually, it
+			 * is called when the entity is decoded.
+			 *
+			 * @param entity the entity the BulletBody is attached to.
+			 * @param body the pre-configured bullet body.
+			 */
+			void addBody(entity::EntityID entity, BulletBody& body);
+
+			void setDebugDraw(bool enabled) override;
 		private:
-			ecs3::World* m_ecs;
+			entity::EntityManager* m_ecs;
 			BulletConfiguration m_config;
 			btDiscreteDynamicsWorld* m_world;
 			std::unique_ptr<debug::BulletDebugDrawList> m_debug;
 			ContactCache m_contactCache;
 
 			/**
-			 * Check for ECS components which aren't in the physics world and add them.
-			 */
-			void checkForPhys();
-
-			/**
-			 * Sync the bullet world state back to the ECS.
+			 * Force position and rotation in the ECS to match those from the physics world.
+			 *
+			 * As FGGL uses motion states, this should not be required. As it iterates all entities in a scene this is
+			 * also a very expensive operation.
 			 */
-			void forceSyncToECS();
+			void syncTransformToECS();
 
 			/**
 			 * Deal with physics collisions

integrations/bullet/src/module.cpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 31/07/22.
+//
+
+#include "fggl/phys/bullet/module.hpp"
+#include "fggl/phys/bullet/service.hpp"
+
+namespace fggl::phys::bullet {
+
+	bool Bullet::factory(modules::ModuleService service, modules::Services& services) {
+		if ( service == phys::PhysicsProvider::service ) {
+			services.bind<phys::PhysicsProvider, BulletProvider>();
+		}
+		return false;
+	}
+
+} // namespace fggl::phys::bullet
\ No newline at end of file

fggl/phys/bullet/phys_draw.cpp → integrations/bullet/src/phys_draw.cpp

@@ -12,11 +12,25 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
 //
 // Created by webpigeon on 30/05/22.
 //
 
-#include "fggl/phys/bullet/phys_draw.hpp"
+#include "../include/fggl/phys/bullet/phys_draw.hpp"
 #include "fggl/debug/draw.hpp"
 
 #include <iostream>

integrations/bullet/src/service.cpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 01/08/22.
+//
+
+#include "fggl/phys/bullet/service.hpp"
+#include "fggl/phys/bullet/types.hpp"
+#include "fggl/phys/bullet/motion.hpp"
+
+namespace fggl::phys::bullet {
+
+	constexpr float UNIT_EXTENT = 0.5F;
+
+	btCollisionShape* create_bullet_shape(const YAML::Node& node) {
+		auto type = node["type"].as<std::string>("MISSING");
+		if ( type == "sphere" ) {
+			auto radius = node["radius"].as<float>(UNIT_EXTENT);
+			return new btSphereShape(radius);
+		} else if ( type == "box" ) {
+			auto extents = node["extents"].as<math::vec3>(math::vec3(UNIT_EXTENT));
+			return new btBoxShape(btVector3(extents.x, extents.y, extents.z));
+		} else {
+			debug::warning("unknown shape type: {}, assuming unit sphere", type);
+			return new btSphereShape(0.5F);
+		}
+	}
+
+	void setup_body(BodyType type, btRigidBody& body) {
+		if ( type != BodyType::STATIC ) {
+			body.setRestitution(0.5F);
+			body.setRollingFriction(0.0F);
+
+			// kinematic bodies cannot sleep
+			if (type == BodyType::KINEMATIC) {
+				auto flags = (body.getCollisionFlags() | btCollisionObject::CF_KINEMATIC_OBJECT);
+				body.setCollisionFlags(flags);
+				body.setActivationState(DISABLE_DEACTIVATION);
+			}
+		}
+	}
+
+	void add_bt_body(const entity::ComponentSpec& spec, entity::EntityManager& manager, const entity::EntityID& id) {
+		auto& body = manager.add<BulletBody>(id);
+		body.motion = new FgglMotionState(&manager, id);
+
+		auto type = spec.get<BodyType>("type", BodyType::DYNAMIC);
+		auto mass = 0.0F;
+
+		// non-static objects can have mass
+		if ( type != BodyType::STATIC ) {
+			mass = spec.get<float>("mass", 1.0F);
+		}
+
+		// calculate inertia
+		btCollisionShape* shape = create_bullet_shape(spec.config["shape"]);
+		btVector3 inertia(0, 0, 0);
+		if ( type != BodyType::STATIC ) {
+			shape->calculateLocalInertia(mass, inertia);
+		}
+
+		// construction information for the simulation
+		btRigidBody::btRigidBodyConstructionInfo constructionInfo {
+			mass,
+			body.motion,
+			shape,
+			inertia
+		};
+
+		body.body = new btRigidBody(constructionInfo);
+		setup_body(type, *body.body);
+
+		// add the body to the simulation
+		if ( type == BodyType::DYNAMIC ) {
+			manager.add<phys::Dynamics>(id);
+		}
+	}
+
+	PhysicsEngine* BulletProvider::create(entity::EntityManager* entityManager, entity::EntityFactory* factory) {
+		auto* engine = new BulletPhysicsEngine(entityManager);
+
+		// FIXME: this won't work across multiple scenes - reactive approach might be better...
+		factory->bind(util::make_guid("phys::Body"), add_bt_body, [engine](auto& manager, const auto& entity) {
+			debug::trace("adding entity {} to physics scene...", (uint64_t)entity);
+			auto& physComp = manager.template get<BulletBody>(entity);
+			engine->addBody(entity, physComp);
+		});
+
+		return engine;
+	}
+
+} // namespace fggl::phys::bullet
\ No newline at end of file

fggl/phys/bullet/simulation.cpp → integrations/bullet/src/simulation.cpp

@@ -12,8 +12,22 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "fggl/phys/bullet/types.hpp"
-#include "fggl/phys/bullet/motion.hpp"
+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "../include/fggl/phys/bullet/types.hpp"
+#include "../include/fggl/phys/bullet/motion.hpp"
 
 namespace fggl::phys::bullet {
 
@@ -21,7 +35,7 @@ namespace fggl::phys::bullet {
 		return {fgglVec.x, fgglVec.y, fgglVec.z};
 	}
 
-	BulletPhysicsEngine::BulletPhysicsEngine(ecs3::World* world) : m_ecs(world), m_config(), m_world(nullptr) {
+	BulletPhysicsEngine::BulletPhysicsEngine(entity::EntityManager* world) : m_ecs(world), m_config(), m_world(nullptr), m_debug(nullptr) {
 		m_config.broadphase = new btDbvtBroadphase();
 		m_config.collisionConfiguration = new btDefaultCollisionConfiguration();
 		m_config.dispatcher = new btCollisionDispatcher(m_config.collisionConfiguration);
@@ -33,153 +47,101 @@ namespace fggl::phys::bullet {
 			m_config.solver,
 			m_config.collisionConfiguration);
 
-		m_debug = std::make_unique<debug::BulletDebugDrawList>();
-		m_world->setDebugDrawer( m_debug.get() );
-		m_debug->setDebugMode(1);
 
 		// callbacks (for handling bullet -> ecs)
 
 		// ensure we deal with ecs -> bullet changes
-		m_ecs->addDeathListener( [this](auto entity) { this->onEntityDeath(entity);} );
+		//m_ecs->addDeathListener( [this](auto entity) { this->onEntityDeath(entity);} );
 	}
 
 	void BulletPhysicsEngine::step() {
-		checkForPhys();
+		// this is now handled on creation
+		//checkForPhys();
 
-		auto dynamicEnts = m_ecs->findMatching<phys::Dynamics>();
+		auto dynamicEnts = m_ecs->find<phys::Dynamics, phys::bullet::BulletBody>();
 		for (auto& ent : dynamicEnts) {
-			auto* dynamicComp = m_ecs->get<phys::Dynamics>(ent);
-			auto* bulletProxy = m_ecs->get<phys::bullet::BulletBody>(ent);
-			if ( bulletProxy == nullptr ) {
-				std::cerr << "entity has dynamics but isn't a physics object!" << std::endl;
-				continue;
-			}
+			auto& dynamicComp = m_ecs->get<phys::Dynamics>(ent);
+			auto& bulletProxy = m_ecs->get<phys::bullet::BulletBody>(ent);
 
-			const auto forceVec = dynamicComp->force;
+			const auto forceVec = dynamicComp.force;
 			if ( glm::length(forceVec) != 0.F ) {
-				bulletProxy->body->applyCentralForce({forceVec.x, forceVec.y, forceVec.z});
-				bulletProxy->body->activate();
-				dynamicComp->force = math::VEC3_ZERO;
+				bulletProxy.body->applyCentralForce({forceVec.x, forceVec.y, forceVec.z});
+				bulletProxy.body->activate();
+				dynamicComp.force = math::VEC3_ZERO;
 			}
 		}
 
-		m_world->stepSimulation(60.0f);
+		m_world->stepSimulation(60.0F);
 		//syncToECS();
 		pollCollisions();
 
-		if ( debugDraw ) {
+		// if debug draw is enabled, trigger a draw call
+		if ( m_debug != nullptr ) {
 			m_world->debugDrawWorld();
 		}
 	}
 
-	inline btCollisionShape* shape_to_bullet(const phys::RigidBody* fgglBody) {
-		if ( fgglBody->shape == nullptr ) {
-			// they forgot to put a shape, we'll assume a unit sphere to avoid crashes...
-			return new btSphereShape(0.5f);
-		}
+	void BulletPhysicsEngine::addBody(entity::EntityID /*entity*/, BulletBody &body) {
+		// ensure static objects are placed correctly by setting their transforms to the correct value
+		btTransform transform;
+		body.body->getMotionState()->getWorldTransform(transform);
+		body.body->setWorldTransform(transform);
 
-		switch (fgglBody->shape->type) {
-			case phys::ShapeType::BOX: {
-				auto extents = ((phys::Box*)fgglBody->shape)->extents;
-				return new btBoxShape({extents.x, extents.y, extents.z});
-			}
-			case phys::ShapeType::SPHERE: {
-				float radius = ((phys::Sphere*)fgglBody->shape)->radius;
-				return new btSphereShape(radius);
-			}
-			default:
-				return new btSphereShape(0.5f);
-		}
+		m_world->addRigidBody(body.body);
 	}
 
-	void BulletPhysicsEngine::checkForPhys() {
-		// FIXME without reactive-based approaches this is very slow
-		auto entsWantPhys = m_ecs->findMatching<phys::RigidBody>();
-		for (auto ent : entsWantPhys) {
-			auto* btComp = m_ecs->tryGet<BulletBody>(ent);
-			if ( btComp != nullptr ) {
-				// they are already in the simulation
-				continue;
-			}
-
-			// set up the bullet proxy for our object
-			btComp = m_ecs->add<BulletBody>(ent);
-			const auto* fgBody = m_ecs->get<phys::RigidBody>(ent);
-			btComp->motion = new FgglMotionState(m_ecs, ent);
-
-			// collisions
-			btCollisionShape* colShape = shape_to_bullet(fgBody);
-			btVector3 localInt(0, 0, 0);
-			if ( !fgBody->isStatic() ) {
-				colShape->calculateLocalInertia(fgBody->mass, localInt);
-			}
-
-			// setup the construction information
-			btRigidBody::btRigidBodyConstructionInfo bodyCI(
-				fgBody->mass,
-				btComp->motion,
-				colShape,
-				localInt
-			);
-			btComp->body = new btRigidBody(bodyCI);
-			btComp->body->setUserIndex( static_cast<int>(ent) );
-
-
-			if (!fgBody->isStatic()) {
-				btComp->body->setRestitution(0.5f);
-				btComp->body->setRollingFriction(0.0f);
-			}
-
-			if ( fgBody->type == BodyType::KINEMATIC ) {
-				auto flags = btComp->body->getCollisionFlags() | btCollisionObject::CF_KINEMATIC_OBJECT;
-				btComp->body->setCollisionFlags( flags );
-
-				// we don't have a clean way of saying a kinematic object moved, so just prevent sleeping.
-				// if this turns out to be an issue, we'll need to revisit this.
-				btComp->body->setActivationState( DISABLE_DEACTIVATION );
-			}
-
-			m_world->addRigidBody( btComp->body );
+	void BulletPhysicsEngine::setDebugDraw(bool active)  {
+		if ( active ) {
+			m_debug = std::make_unique<debug::BulletDebugDrawList>();
+			m_world->setDebugDrawer(m_debug.get());
+			m_debug->setDebugMode(btIDebugDraw::DBG_DrawWireframe);
+		} else {
+			m_debug = nullptr;
 		}
 	}
 
-	void BulletPhysicsEngine::forceSyncToECS() {
-		const auto physEnts = m_ecs->findMatching<BulletBody>();
+	void BulletPhysicsEngine::syncTransformToECS() {
+		const auto physEnts = m_ecs->find<math::Transform, BulletBody>();
 		for (const auto& ent : physEnts) {
-			auto* transform = m_ecs->get<math::Transform>(ent);
-			auto* physBody = m_ecs->get<BulletBody>(ent);
+			auto& physBody = m_ecs->get<BulletBody>(ent);
+			// don't bother syncing things with motion states, it's not necessary
+			if ( physBody.motion != nullptr ) {
+				continue;
+			}
 
-			if ( physBody->body->isKinematicObject() ) {
+			auto& transform = m_ecs->get<math::Transform>(ent);
+			if ( physBody.body->isKinematicObject() ) {
 				continue;
 			}
 
 			btTransform bTransform;
-			physBody->motion->getWorldTransform(bTransform);
+			physBody.motion->getWorldTransform(bTransform);
 
 			// set calculate and set ecs position
 			auto& btPos = bTransform.getOrigin();
 			math::vec3 pos{btPos.x(), btPos.y(), btPos.z()};
-			transform->origin( pos );
+			transform.origin( pos );
 
 			// set the rotation
 			const auto& btRot = bTransform.getRotation();
 
 			math::vec3 rot;
 			btRot.getEulerZYX(rot.x, rot.y, rot.z);
-			transform->euler(rot);
+			transform.euler(rot);
 		}
 	}
 
 	BulletPhysicsEngine::~BulletPhysicsEngine() {
 		// clean up the rigid bodies
-		auto entRB = m_ecs->findMatching<BulletBody>();
-		for (auto& ent : entRB) {
-			auto* bulletBody = m_ecs->get<BulletBody>(ent);
-			m_world->removeCollisionObject(bulletBody->body);
+		auto entRB = m_ecs->find<BulletBody>();
+		for (const auto& ent : entRB) {
+			auto& bulletBody = m_ecs->get<BulletBody>(ent);
+			if ( bulletBody.body != nullptr ) {
+				m_world->removeCollisionObject(bulletBody.body);
+			}
 
 			// release resources and delete
-			bulletBody->release();
-			m_ecs->remove<BulletBody>(ent);
+			bulletBody.release();
 		}
 
 		// delete the world
@@ -192,7 +154,7 @@ namespace fggl::phys::bullet {
 		delete m_config.collisionConfiguration;
 	}
 
-	static void handleCollisionCallbacks(ecs3::World* world, ecs3::entity_t owner, ecs3::entity_t other) {
+	static void handleCollisionCallbacks(entity::EntityManager* world, entity::EntityID owner, entity::EntityID other) {
 		if ( !world->has<CollisionCallbacks>(owner) ) {
 			return;
 		}
@@ -216,11 +178,11 @@ namespace fggl::phys::bullet {
 
 	void BulletPhysicsEngine::pollCollisions() {
 		// flush collision caches
-		auto caches = m_ecs->findMatching<CollisionCache>();
-		for( auto& ent : caches) {
-			auto* cache = m_ecs->get<CollisionCache>(ent);
-			std::swap(cache->collisions, cache->lastFrame);
-			cache->collisions.clear();
+		auto caches = m_ecs->find<CollisionCache>();
+		for( const auto& ent : caches) {
+			auto& cache = m_ecs->get<CollisionCache>(ent);
+			std::swap(cache.collisions, cache.lastFrame);
+			cache.collisions.clear();
 		}
 
 		// deal with the number of manifolds
@@ -231,15 +193,6 @@ namespace fggl::phys::bullet {
 			const auto* body0 = contactManifold->getBody0();
 			const auto* body1 = contactManifold->getBody1();
 
-			// FIXME rigid body didn't die according to plan!
-			if ( body0->getUserIndex() == ecs::NULL_ENTITY || body1->getUserIndex() == ecs::NULL_ENTITY) {
-				continue;
-			}
-
-			if ( !m_ecs->alive( body0->getUserIndex()) || !m_ecs->alive(body1->getUserIndex()) ) {
-				continue;
-			}
-
 			int numContacts = contactManifold->getNumContacts();
 			for ( auto contactIdx = 0; contactIdx < numContacts; ++contactIdx ) {
 				auto& point = contactManifold->getContactPoint(contactIdx);
@@ -250,14 +203,14 @@ namespace fggl::phys::bullet {
 				}
 			}
 
-			handleCollisionCallbacks(m_ecs, body0->getUserIndex(), body1->getUserIndex());
-			handleCollisionCallbacks(m_ecs, body1->getUserIndex(), body0->getUserIndex());
+			//handleCollisionCallbacks(m_ecs, body0->getUserIndex(), body1->getUserIndex());
+			//handleCollisionCallbacks(m_ecs, body1->getUserIndex(), body0->getUserIndex());
 		}
 
 		// note contacts that have ended
-		caches = m_ecs->findMatching<CollisionCache>(); // re-fetch, entities can (and probably do) die in handlers.
-		for( auto& ent : caches) {
-			auto* cache = m_ecs->get<CollisionCache>(ent);
+		caches = m_ecs->find<CollisionCache>(); // re-fetch, entities can (and probably do) die in handlers.
+		for( const auto& ent : caches) {
+			auto& cache = m_ecs->get<CollisionCache>(ent);
 
 			// if we don't have an exit callback, it's pointless checking the cache
 			auto* callbacks = m_ecs->tryGet<CollisionCallbacks>(ent);
@@ -266,20 +219,20 @@ namespace fggl::phys::bullet {
 			}
 
 			// check if a collision has ended
-			for (const auto& other : cache->lastFrame) {
-				auto itr = cache->collisions.find(other);
-				if (itr == cache->collisions.end()) {
+			for (const auto& other : cache.lastFrame) {
+				auto itr = cache.collisions.find(other);
+				if (itr == cache.collisions.end()) {
 					callbacks->onExit( ent,other);
 				}
 			}
 		}
 	}
 
-	void BulletPhysicsEngine::onEntityDeath(ecs::entity_t entity)  {
+	void BulletPhysicsEngine::onEntityDeath(entity::EntityID entity)  {
 			auto* btPhysics = m_ecs->tryGet<BulletBody>(entity);
 			if ( btPhysics != nullptr) {
 				// decouple physics from entity
-				btPhysics->body->setUserIndex( ecs::NULL_ENTITY );
+				//btPhysics->body->setUserIndex( entity::INVALID );
 				m_world->removeRigidBody( btPhysics->body );
 				btPhysics->release();
 			}
@@ -297,7 +250,7 @@ namespace fggl::phys::bullet {
 		m_contactCache.removed.push_back(point);
 	}
 
-	ecs3::entity_t BulletPhysicsEngine::raycast(math::vec3 from, math::vec3 to) {
+	entity::EntityID BulletPhysicsEngine::raycast(math::vec3 from, math::vec3 to) {
 		const auto btFrom = to_bullet(from);
 		const auto btTo = to_bullet(to);
 
@@ -305,18 +258,19 @@ namespace fggl::phys::bullet {
 		m_world->rayTest(btFrom, btTo, rayTestResult);
 
 		if ( !rayTestResult.hasHit() ) {
-			return ecs3::NULL_ENTITY;
+			return entity::INVALID;
 		}
 
 		// tell the user what it hit
-		return rayTestResult.m_collisionObject->getUserIndex();
+		return entity::INVALID;
+//		return rayTestResult.m_collisionObject->getUserIndex();
 	}
 
-	std::vector<ContactPoint> BulletPhysicsEngine::scanCollisions(ecs3::entity_t entity) {
+	std::vector<ContactPoint> BulletPhysicsEngine::scanCollisions(entity::EntityID entity) {
 		return std::vector<ContactPoint>();
 	}
 
-	std::vector<ecs3::entity_t> BulletPhysicsEngine::raycastAll(math::vec3 fromPos, math::vec3 toPos) {
+	std::vector<entity::EntityID> BulletPhysicsEngine::raycastAll(math::vec3 fromPos, math::vec3 toPos) {
 		const auto btFrom = to_bullet(fromPos);
 		const auto btTo = to_bullet(toPos);
 
@@ -331,21 +285,21 @@ namespace fggl::phys::bullet {
 		// hit processing
 		const auto hits = rayTestResult.m_collisionObjects.size();
 
-		std::vector<ecs3::entity_t> hitVec;
+		std::vector<entity::EntityID> hitVec;
 		hitVec.reserve(hits);
 
 		for ( auto i = 0; i < hits; ++i) {
-			ecs3::entity_t entity = rayTestResult.m_collisionObjects[i]->getUserIndex();
-			hitVec.push_back(entity);
+			auto entity = rayTestResult.m_collisionObjects[i]->getUserIndex();
+			//hitVec.push_back(entity);
 		}
 
 		return hitVec;
 	}
 
-	std::vector<ecs3::entity_t> BulletPhysicsEngine::sweep(PhyShape &shape,
+	std::vector<entity::EntityID> BulletPhysicsEngine::sweep(PhyShape &shape,
 														   math::Transform &from,
 														   math::Transform &to) {
-		return std::vector<ecs3::entity_t>();
+		return std::vector<entity::EntityID>();
 	}
 
 } // namespace fggl::phys::bullet
\ No newline at end of file

integrations/lua/CMakeLists.txt

+add_library(fggl-lua)
+
+find_package(Lua REQUIRED)
+target_link_libraries(fggl-lua PUBLIC ${LUA_LIBRARIES})
+target_include_directories(fggl-lua INTERFACE ${LUA_INCLUDE_DIR})
+
+# Link to FGGL
+target_link_libraries(fggl-lua PUBLIC fggl)
+
+# sources and include directories
+target_sources(fggl-lua
+    PRIVATE
+        src/engine.cpp
+        src/module.cpp
+)
+target_include_directories(fggl-lua
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+)

integrations/lua/include/fggl/script/lua/engine.hpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 15/10/22.
+//
+
+#ifndef FGGL_INTEGRATIONS_LUA_SCRIPT_LUA_ENGINE_HPP
+#define FGGL_INTEGRATIONS_LUA_SCRIPT_LUA_ENGINE_HPP
+
+#include "fggl/script/engine.hpp"
+#include "fggl/data/storage.hpp"
+
+extern "C" {
+	#include "lua.h"
+	#include "lauxlib.h"
+	#include "lualib.h"
+};
+
+namespace fggl::script::lua {
+
+	class LuaScriptEngine : public ScriptEngine {
+		public:
+			LuaScriptEngine(data::Storage* storage);
+			virtual ~LuaScriptEngine();
+
+			void onActivate() override;
+			void onDeactivate() override;
+			void onUpdate() override;
+
+			void onEvent(const std::string& name) override;
+
+			// running scripts
+			bool run(const char* script) override;
+			bool load(const char* filename) override;
+
+			// variables
+			void setGlobal(const char* name, void* ptr) override;
+
+		private:
+			data::Storage* m_storage;
+			lua_State* m_state;
+			void release();
+	};
+
+	class LuaScriptProvider : public ScriptProvider {
+		public:
+			LuaScriptProvider(data::Storage* storage);
+
+			virtual ~LuaScriptProvider() = default;
+			LuaScriptEngine* create() override;
+
+		private:
+			data::Storage* m_storage;
+	};
+
+}
+
+#endif //FGGL_INTEGRATIONS_LUA_SCRIPT_LUA_ENGINE_HPP

integrations/lua/include/fggl/script/lua/module.hpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 15/10/22.
+//
+
+#ifndef FGGL_INTEGRATIONS_LUA_SCRIPT_LUA_MODULE_HPP
+#define FGGL_INTEGRATIONS_LUA_SCRIPT_LUA_MODULE_HPP
+
+#define FGGL_HAS_LUA
+
+#include "fggl/modules/module.hpp"
+#include "fggl/entity/module.hpp"
+#include "fggl/script/engine.hpp"
+#include "fggl/data/module.hpp"
+#include "fggl/assets/packed/adapter.hpp"
+
+
+namespace fggl::script::lua {
+
+	constexpr auto MIME_LUA = assets::from_mime("text/lua");
+	constexpr auto SCRIPT_LUA = assets::make_asset_type("script/lua");
+
+	struct Lua {
+		constexpr static const char* name = "fggl::script::lua";
+		constexpr static const std::array<modules::ServiceName, 1> provides = {
+			script::ScriptProvider::service
+		};
+		constexpr static const std::array<modules::ServiceName, 2> depends = {
+			data::SERVICE_STORAGE,
+			assets::CheckinAdapted::service
+		};
+		static bool factory(modules::ServiceName name, modules::Services& serviceManager);
+	};
+
+} // namespace fggl::script::lua
+
+namespace fggl::script {
+	using Lua = lua::Lua;
+
+} // namespace fggl::script
+
+#endif //FGGL_INTEGRATIONS_LUA_SCRIPT_LUA_MODULE_HPP

integrations/lua/src/engine.cpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 15/10/22.
+//
+
+#include "fggl/script/lua/engine.hpp"
+#include "fggl/debug/logging.hpp"
+
+#include "fggl/scenes/game.hpp"
+#include "fggl/entity/loader/loader.hpp"
+
+#include <cassert>
+
+extern "C" {
+	int lua_switch_scene(lua_State *L) {
+		auto *scene = lua_tostring(L, -1);
+		auto *statePtr = (fggl::AppState *) (lua_topointer(L, -2));
+		statePtr->owner().change_state(scene);
+		return 0;
+	}
+
+	int lua_create_entity(lua_State *L) {
+		/*auto *prototype = lua_tostring(L, -1);
+		auto *statePtr = (fggl::scenes::Game*) (lua_topointer(L, -2));
+
+		auto *factory = statePtr->owner().service<fggl::entity::EntityFactory>();
+		//factory->create( statePtr->world(), , [](){} );
+		*/
+		return 0;
+	}
+
+	static void open_lua_fggl(lua_State *L) {
+		// switch scene
+		lua_pushcfunction(L, lua_switch_scene);
+		lua_setglobal(L, "switch_scene");
+	}
+}
+
+namespace fggl::script::lua {
+
+	LuaScriptProvider::LuaScriptProvider(data::Storage *storage) : m_storage(storage) {
+
+	}
+
+	LuaScriptEngine *LuaScriptProvider::create() {
+		return new LuaScriptEngine(m_storage);
+	}
+
+	LuaScriptEngine::LuaScriptEngine(data::Storage* storage) : m_state(luaL_newstate()), m_storage(storage) {
+		luaL_openlibs(m_state);
+		open_lua_fggl(m_state);
+	}
+
+	LuaScriptEngine::~LuaScriptEngine() {
+		release();
+	}
+
+	void LuaScriptEngine::release() {
+		if ( m_state != nullptr ) {
+			lua_close(m_state);
+			m_state = nullptr;
+		}
+	}
+
+	void LuaScriptEngine::onActivate() {
+		lua_getglobal(m_state, "print");
+		lua_pushstring(m_state, "LUA activate triggered");
+		lua_call(m_state, 1, 0);
+	}
+
+	void LuaScriptEngine::onDeactivate() {
+		lua_getglobal(m_state, "print");
+		lua_pushstring(m_state, "LUA deactivate triggered");
+		lua_call(m_state, 1, 0);
+	}
+
+	void LuaScriptEngine::onUpdate() {
+		lua_getglobal(m_state, "print");
+		lua_pushstring(m_state, "LUA update triggered");
+		lua_call(m_state, 1, 0);
+	}
+
+	void LuaScriptEngine::onEvent(const std::string &name) {
+		lua_getglobal(m_state, "print");
+		lua_pushstring(m_state, "LUA event triggered");
+		lua_call(m_state, 1, 0);
+	}
+
+	bool LuaScriptEngine::run(const char *script) {
+		auto result = luaL_dostring(m_state, script);
+		if ( !result ) {
+			fggl::debug::warning("lua error: {}", lua_tostring(m_state, -1));
+		}
+		return result;
+	}
+
+	bool LuaScriptEngine::load(const char *filename) {
+		assert( filename != nullptr);
+		auto path = m_storage->resolvePath(data::StorageType::Data, filename);
+
+		if ( !std::filesystem::exists(path) ) {
+			fggl::debug::warning("lua error: file does not exist: {}", path.c_str());
+			return false;
+		}
+
+		// load the file ( OK = 0 = false because reasons...)
+		auto result = !luaL_dofile(m_state, path.c_str());
+		if ( !result ) {
+			fggl::debug::warning("lua error: {}", lua_tostring(m_state, -1));
+			return false;
+		}
+		return true;
+	}
+
+	void LuaScriptEngine::setGlobal(const char *name, void *ptr) {
+		lua_pushlightuserdata(m_state, ptr);
+		lua_setglobal(m_state, name);
+	}
+
+}
\ No newline at end of file

integrations/lua/src/module.cpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 15/10/22.
+//
+
+#include "fggl/script/lua/module.hpp"
+#include "fggl/script/lua/engine.hpp"
+
+namespace fggl::script::lua {
+
+	static assets::AssetTypeID is_lua(std::filesystem::path path) {
+		if ( path.extension() == ".lua" ) {
+			return SCRIPT_LUA;
+		}
+		return assets::INVALID_ASSET_TYPE;
+	}
+
+	bool Lua::factory(modules::ServiceName service, modules::Services &serviceManager) {
+
+		if ( service == ScriptProvider::service ) {
+			auto *storageService = serviceManager.get<data::Storage>();
+			serviceManager.bind<ScriptProvider,LuaScriptProvider>(storageService);
+
+			auto *assetPacker = serviceManager.get<assets::CheckinAdapted>();
+			assetPacker->setLoader(MIME_LUA, assets::NEEDS_CHECKIN, is_lua);
+
+			return true;
+		}
+
+		return false;
+	}
+
+}
\ No newline at end of file

tests/CMakeLists.txt

 find_package(Threads REQUIRED)
 
 # GTest Dependency
-find_package(GTest)
+find_package( GTest REQUIRED )
 if ( NOT GTest_FOUND )
-include(FetchContent)
-FetchContent_Declare(
-  googletest
-  URL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.zip
-)
-# For Windows: Prevent overriding the parent project's compiler/linker settings
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-FetchContent_MakeAvailable(googletest)
+    message(NOTICE "GTest not found, installing...")
+    include(FetchContent)
+    FetchContent_Declare(
+      googletest
+      URL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.zip
+    )
+    # For Windows: Prevent overriding the parent project's compiler/linker settings
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+    FetchContent_MakeAvailable(googletest)
 endif ()
 
 add_subdirectory(testfggl)

tests/testfggl/CMakeLists.txt

 enable_testing()
 
 add_executable( fggl_test
-	#	TestFggl.cpp
-	ecs/ecs.cpp
-	ecs3/ecs.cpp
-	math/types.cpp
-        ecs3/easing.cpp
+#	TestFggl.cpp
+#	ecs/ecs.cpp
+#	ecs3/ecs.cpp
+#	ecs3/easing.cpp
+#	math/types.cpp
+	util/guid.cpp
+	util/safety.cpp
 )
 target_include_directories(fggl_test
 	PUBLIC
@@ -14,14 +16,10 @@ target_include_directories(fggl_test
 
 target_link_libraries(fggl_test
 	fggl
+	gtest
 	gtest_main
 	gmock
 )
 
 include(GoogleTest)
 gtest_discover_tests(fggl_test)
-
-add_test(
-	NAME gtest
-	COMMAND $<TARGET_FILE:fggl_test>
-)