RigidBody2DComponent in wren

Author: OverShifted

OverEngine/CMakeLists.txt

@@ -40,14 +40,15 @@ endif()
 file(GLOB_RECURSE OE_WREN_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src/Wren" "src/Wren/*.wren")
 set(OE_WREN_INC_FILES)
 foreach(WREN_FILE IN LISTS OE_WREN_FILES)
+	set(WREN_FILE_ABS "${CMAKE_CURRENT_SOURCE_DIR}/src/Wren/${WREN_FILE}")
 	add_custom_command(
-		OUTPUT "${WREN_FILE}.inc"
-		MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/src/Wren/${WREN_FILE}"
+		OUTPUT "${WREN_FILE_ABS}.inc"
+		MAIN_DEPENDENCY "${WREN_FILE_ABS}"
 		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/Wren"
 		COMMAND python "${PROJECT_SOURCE_DIR}/utils/wren_to_c_string.py" "${WREN_FILE}.inc" ${WREN_FILE}
 	)
 
-	list(APPEND OE_WREN_INC_FILES "${WREN_FILE}.inc")
+	list(APPEND OE_WREN_INC_FILES "${WREN_FILE_ABS}.inc")
 endforeach()
 
 add_library(OverEngine STATIC ${OE_CROSS_PLATFORM_FILES} ${OE_PLATFORM_FILES}

OverEngine/src/OverEngine/Scripting/Wren.cpp

@@ -3,6 +3,7 @@
 
 namespace WrenSources
 {
+	#include "Wren/components.wren.inc"
 	#include "Wren/entity.wren.inc"
 	#include "Wren/input.wren.inc"
 	#include "Wren/keycodes.wren.inc"
@@ -40,6 +41,7 @@ namespace OverEngine
 		wrenpp::VM::loadModuleFn = [](const char* mod) -> char* {
 			#define WREN_MOD(m) if (strcmp(mod, #m) == 0) return const_cast<char*>(WrenSources::m##ModuleSource);
 
+			WREN_MOD(components)
 			WREN_MOD(entity)
 			WREN_MOD(input)
 			WREN_MOD(keycodes)

OverEngine/src/OverEngine/Scripting/WrenBindings.cpp

@@ -36,9 +36,16 @@ namespace OverEngine
 			entity.GetComponent<TransformComponent>().SetPosition(position);
 		}
 
-		// TODO: Move into component classes (not all entities have rigidbodies)
-		// TODO: Use Vector2
-		void EntityInternals_applyLinearImpulseToCenter(Entity& entity, const Vector3& impulse)
+		#define COMPONENT_HAS(component)                 \
+			bool component##_has(Entity& entity)         \
+			{                                            \
+				return entity.HasComponent<component>(); \
+			}
+
+		COMPONENT_HAS(TransformComponent)
+		COMPONENT_HAS(RigidBody2DComponent)
+
+		void RigidBody2DComponent_applyLinearImpulseToCenter(Entity& entity, const Vector3& impulse)
 		{
 			entity.GetComponent<RigidBody2DComponent>().RigidBody->ApplyLinearImpulseToCenter(impulse);
 		}
@@ -59,14 +66,26 @@ namespace OverEngine
 				WRENPP_BIND_STATIC(EntityInternals_getName, "getName(_)")
 				WRENPP_BIND_STATIC(EntityInternals_getPosition, "getPosition(_)")
 				WRENPP_BIND_STATIC(EntityInternals_setPosition, "setPosition(_,_)")
-
-				WRENPP_BIND_STATIC(EntityInternals_applyLinearImpulseToCenter, "applyLinearImpulseToCenter(_,_)")
 			.endClass()
 
 			.bindClass<Entity>("Entity")
 			.endClass()
 		.endModule();
 
+		m_VM.beginModule("components")
+			.beginClass("ComponentInternals")
+				WRENPP_BIND_STATIC(RigidBody2DComponent_applyLinearImpulseToCenter, "RigidBody2DComponent_applyLinearImpulseToCenter(_,_)")
+			.endClass()
+
+			.beginClass("TransformComponent")
+				WRENPP_BIND_STATIC(TransformComponent_has, "has(_)")
+			.endClass()
+
+			.beginClass("RigidBody2DComponent")
+				WRENPP_BIND_STATIC(RigidBody2DComponent_has, "has(_)")
+			.endClass()
+		.endModule();
+
 		m_VM.beginModule("math")
 			.bindClass<Vector3, float, float, float>("Vector3")
 				WRENPP_BIND_GETTER(Vector3::x, "x")

OverEngine/src/Wren/components.wren

@@ -0,0 +1,17 @@
+class ComponentInternals {
+	foreign static RigidBody2DComponent_applyLinearImpulseToCenter(entity, impulse)
+}
+
+class TransformComponent {
+	foreign static has(entity)
+
+	construct new(entity) { _entity = entity }
+}
+
+class RigidBody2DComponent {
+	foreign static has(entity)
+
+	construct new(entity) { _entity = entity }
+
+	applyLinearImpulseToCenter(impulse) { ComponentInternals.RigidBody2DComponent_applyLinearImpulseToCenter(_entity, impulse) }
+}

OverEngine/src/Wren/entity.wren

@@ -3,7 +3,6 @@ class EntityInternals {
 	foreign static getName(entity)
 	foreign static getPosition(entity)
 	foreign static setPosition(entity, position)
-	foreign static applyLinearImpulseToCenter(entity, impulse)
 }
 
 /// A single entity in the scene.
@@ -16,6 +15,12 @@ foreign class Entity {
 	position { EntityInternals.getPosition(this) }
 	position=(rhs) { EntityInternals.setPosition(this, rhs) }
 
-	/// Will be removed :)
-	applyLinearImpulseToCenter(impulse) { EntityInternals.applyLinearImpulseToCenter(this, impulse) }
+	hasComponent(type) { type.has(this) }
+	getComponent(type) {
+		if (hasComponent(type)) {
+			return type.new(this)
+		}
+
+		Fiber.abort("Entity '%(name)' doesn't have %(type)")
+	}
 }

OverEngine/src/Wren/math.wren

@@ -12,4 +12,7 @@ foreign class Vector3 {
 	toString { "Vector3(%(x), %(y), %(z))" }
 
 	*(rhs) { Vector3.new(x * rhs, y * rhs, z * rhs) }
+	+(rhs) { Vector3.new(x + rhs.x, y + rhs.y, z + rhs.z) }
+
+	lerp(b, t) { this * (1 - t) + b * t }
 }

Sandbox/src/wren/scripts.wren

@@ -2,6 +2,7 @@ import "script" for Script
 import "keycodes" for KeyCode
 import "input" for Input
 import "math" for Vector3
+import "components" for RigidBody2DComponent
 
 class Player is Script {
 	construct new(e) {
@@ -10,6 +11,7 @@ class Player is Script {
 
 	onCreate() {
 		System.print("My name is '%(entity.name)'")
+		_rb = entity.getComponent(RigidBody2DComponent)
 	}
 
 	onUpdate(delta) {
@@ -20,7 +22,7 @@ class Player is Script {
 		if (Input.isKeyPressed(KeyCode.w)) { impulse.y = impulse.y + 1 }
 		if (Input.isKeyPressed(KeyCode.s)) { impulse.y = impulse.y - 1 }
 
-		entity.applyLinearImpulseToCenter(impulse * 20 * delta)
+		_rb.applyLinearImpulseToCenter(impulse * 20 * delta)
 	}
 }
 
@@ -32,6 +34,6 @@ class CameraController is Script {
 	player=(rhs) { _player = rhs }
 
 	onLateUpdate(delta) {
-		entity.position = _player.position
+		entity.position = _player.position.lerp(entity.position, 0.5)
 	}
 }