Move more logic to wren + General cleanup.

OverShifted · OverShifted · commit 8d3dc842c462 · 2023-02-09T20:15:03.000+03:30
diff --git a/.gitignore b/.gitignore
@@ -33,5 +33,7 @@ OverEngineProfile-StartUp.json
 OverEngineProfile-Runtime.json
 OverEngineProfile-Shutdown.json
 
-# Log files
+# Other
 OverEngine.log
+imgui.ini
+
diff --git a/OverEditor/CMakeLists.txt b/OverEditor/CMakeLists.txt
@@ -10,6 +10,6 @@ target_include_directories(OverEditor PRIVATE
 	"src"
 )
 
-set_property(TARGET OverEditor PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/OverEditor")
+set_property(TARGET OverEditor PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(OverEditor PRIVATE OverEngine)
diff --git a/OverEngine/CMakeLists.txt b/OverEngine/CMakeLists.txt
@@ -80,6 +80,14 @@ target_include_directories(OverEngine PUBLIC
 	"vendor/wren/src/include"
 )
 
+string(LENGTH "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LEN)
+if(CMAKE_BUILD_TYPE_LEN EQUAL 0)
+	message(SEND_ERROR "No build type is specified. It can cause problems because 'stb_image.cpp' "
+					   "relies on the 'OE_DEBUG' macro which won't be properly defined without an "
+					   "explicit build type. Make sure to run CMake with "
+					   "-DCMAKE_BUILD_TYPE={Debug|Release}")
+endif()
+
 target_compile_definitions(
 	OverEngine
 
diff --git a/OverEngine/premake5.lua b/OverEngine/premake5.lua
@@ -1,7 +1,17 @@
 function wren2c_command(name)
-	return string.format("python ../utils/wren_to_c_string.py src/Wren/" .. name .. ".wren.inc src/Wren/" .. name .. ".wren\n")
+	return string.format("python ../utils/wren_to_c_string.py %s.inc %s\n", name, name)
 end
 
+function map(tbl, f)
+	local t = {}
+	for k, v in pairs(tbl) do
+		t[k] = f(v)
+	end
+	return t
+end
+
+wren2c_commands = table.concat(map(os.matchfiles("src/Wren/*.wren"), wren2c_command), '')
+
 project "OverEngine"
 	kind "StaticLib"
 
@@ -17,14 +27,7 @@ project "OverEngine"
 
 	prebuildcommands
 	{
-		wren2c_command("entity")    ..
-		wren2c_command("input")     ..
-		wren2c_command("keycodes")  ..
-		wren2c_command("lib")       ..
-		wren2c_command("math")      ..
-		wren2c_command("scheduler") ..
-		wren2c_command("script")    ..
-		wren2c_command("time")
+		wren2c_commands
 	}
 
 	files
diff --git a/OverEngine/src/OverEngine/ImGui/ImGuiLayer.cpp b/OverEngine/src/OverEngine/ImGui/ImGuiLayer.cpp
@@ -43,7 +43,9 @@ namespace OverEngine
 		// Setup Platform/Renderer bindings
 		ImGuiBinding::Init(&Application::Get().GetWindow());
 
-		io.Fonts->AddFontFromMemoryCompressedTTF(&Roboto_compressed_data, Roboto_compressed_size, 15.0f);
+		ImFontConfig fontTemplate;
+		strcpy_s(fontTemplate.Name, 40, "Roboto");
+		io.Fonts->AddFontFromMemoryCompressedTTF(&Roboto_compressed_data, Roboto_compressed_size, 20.0f, &fontTemplate);
 	}
 
 	void ImGuiLayer::OnDetach()
diff --git a/OverEngine/src/OverEngine/Scripting/Wren.cpp b/OverEngine/src/OverEngine/Scripting/Wren.cpp
@@ -5,6 +5,7 @@ namespace WrenSources
 {
 	#include "Wren/components.wren.inc"
 	#include "Wren/entity.wren.inc"
+	#include "Wren/imgui.wren.inc"
 	#include "Wren/input.wren.inc"
 	#include "Wren/keycodes.wren.inc"
 	#include "Wren/lib.wren.inc"
@@ -45,6 +46,7 @@ namespace OverEngine
 
 			WREN_MOD(components)
 			WREN_MOD(entity)
+			WREN_MOD(imgui)
 			WREN_MOD(input)
 			WREN_MOD(keycodes)
 			WREN_MOD(lib)
@@ -112,9 +114,13 @@ namespace OverEngine
 
 	Ref<WrenScriptInstance> WrenScriptClass::Construct(const Entity& entity) const
 	{
-		m_VM->CallMethod(m_ClassHandle, m_ConstructorHandle, entity);
-		WrenHandle* instance = wrenGetSlotHandle(m_VM->GetRaw(), 0);
+		if (m_VM->CallMethod(m_ClassHandle, m_ConstructorHandle, entity) != WREN_RESULT_SUCCESS)
+		{
+			OE_CORE_ASSERT(false, "Script instantiation failure!");
+			return nullptr;
+		}
 
+		WrenHandle* instance = wrenGetSlotHandle(m_VM->GetRaw(), 0);
 		return CreateRef<WrenScriptInstance>(m_VM, instance);
 	}
 
diff --git a/OverEngine/src/OverEngine/Scripting/WrenBindings.cpp b/OverEngine/src/OverEngine/Scripting/WrenBindings.cpp
@@ -2,6 +2,7 @@
 #include "Wren.h"
 
 #include <wren.h>
+#include <imgui/imgui.h>
 
 #include "OverEngine/Input/Input.h"
 #include "OverEngine/Scene/Entity.h"
@@ -21,10 +22,10 @@ namespace OverEngine
 {
 	namespace WrenBindings
 	{
-		#define WREN_INPUT(name, wrenParams, nativeCallParams)            \
-			auto Input_##name(wrenParams) \
-			{                                                                \
-				return Input::name(nativeCallParams);                \
+		#define WREN_INPUT(name, wrenParams, nativeCallParams) \
+			auto Input_##name(wrenParams)                      \
+			{                                                  \
+				return Input::name(nativeCallParams);          \
 			}
 
 		WREN_INPUT(IsKeyPressed, int keycode, (KeyCode)keycode)
@@ -33,7 +34,22 @@ namespace OverEngine
 		WREN_INPUT(GetMouseX,,)
 		WREN_INPUT(GetMouseY,,)
 
-		#define WREN_COMPONENT_HAS(component)                 \
+		bool ImGui_begin(const char* name)
+		{
+			return ImGui::Begin(name);
+		}
+
+		void ImGui_end()
+		{
+			ImGui::End();
+		}
+
+		void ImGui_text(const char* text)
+		{
+			ImGui::TextUnformatted(text);
+		}
+
+		#define WREN_COMPONENT_HAS(component)            \
 			bool component##_has(Entity& entity)         \
 			{                                            \
 				return entity.HasComponent<component>(); \
@@ -63,6 +79,16 @@ namespace OverEngine
 			entity.GetComponent<TransformComponent>().SetPosition(position);
 		}
 
+		Vector3 TransformComponent_eulerAngles(Entity& entity)
+		{
+			return entity.GetComponent<TransformComponent>().GetEulerAngles();
+		}
+
+		void TransformComponent_set_eulerAngles(Entity& entity, const Vector3& eulerAngles)
+		{
+			entity.GetComponent<TransformComponent>().SetEulerAngles(eulerAngles);
+		}
+
 		void RigidBody2DComponent_applyLinearImpulseToCenter(Entity& entity, const Vector2& impulse)
 		{
 			entity.GetComponent<RigidBody2DComponent>().RigidBody->ApplyLinearImpulseToCenter(impulse);
@@ -94,6 +120,15 @@ namespace OverEngine
 			.endClass()
 		.endModule();
 
+		m_VM.beginModule("imgui")
+			.beginClass("ImGui")
+				WRENPP_BIND_STATIC(ImGui_begin, "begin(_)")
+				WRENPP_BIND_STATIC(ImGui_end, "end()")
+
+				WRENPP_BIND_STATIC(ImGui_text, "text(_)")
+			.endClass()
+		.endModule();
+
 		m_VM.beginModule("entity")
 			.bindClass<Entity>("Entity")
 			.endClass()
@@ -106,6 +141,8 @@ namespace OverEngine
 
 				WRENPP_BIND_STATIC_EXACT(TransformComponent_position, "_")
 				WRENPP_BIND_STATIC_EXACT(TransformComponent_set_position, "_,_")
+				WRENPP_BIND_STATIC_EXACT(TransformComponent_eulerAngles, "_")
+				WRENPP_BIND_STATIC_EXACT(TransformComponent_set_eulerAngles, "_,_")
 
 				WRENPP_BIND_STATIC_EXACT(RigidBody2DComponent_applyLinearImpulseToCenter, "_,_")
 			.endClass()
diff --git a/OverEngine/src/Platform/Linux/LinuxWindow.cpp b/OverEngine/src/Platform/Linux/LinuxWindow.cpp
@@ -40,7 +40,7 @@ namespace OverEngine
 		m_Data.Width = props.Width;
 		m_Data.Height = props.Height;
 
-		OE_CORE_INFO("Creating window {0} ({1}, {2})", props.Title, props.Width, props.Height);
+		OE_CORE_INFO("Creating window '{0}' ({1}x{2})", props.Title, props.Width, props.Height);
 
 		if (s_WindowCount == 0)
 		{
diff --git a/OverEngine/src/Platform/Windows/WindowsWindow.cpp b/OverEngine/src/Platform/Windows/WindowsWindow.cpp
@@ -40,7 +40,7 @@ namespace OverEngine
 		m_Data.Width = props.Width;
 		m_Data.Height = props.Height;
 
-		OE_CORE_INFO("Creating window {0} ({1}, {2})", props.Title, props.Width, props.Height);
+		OE_CORE_INFO("Creating window '{0}' ({1}x{2})", props.Title, props.Width, props.Height);
 
 		if (s_WindowCount == 0)
 		{
diff --git a/OverEngine/src/Wren/components.wren b/OverEngine/src/Wren/components.wren
@@ -4,6 +4,8 @@ class ComponentInternals {
 
 	foreign static TransformComponent_position(entity)
 	foreign static TransformComponent_set_position(entity, position)
+	foreign static TransformComponent_eulerAngles(entity)
+	foreign static TransformComponent_set_eulerAngles(entity, eulerAngles)
 
 	foreign static RigidBody2DComponent_applyLinearImpulseToCenter(entity, impulse)
 }
@@ -29,6 +31,9 @@ class TransformComponent is Component {
 
 	position { ComponentInternals.TransformComponent_position(entity) }
 	position=(rhs) { ComponentInternals.TransformComponent_set_position(entity, rhs) }
+
+	eulerAngles { ComponentInternals.TransformComponent_eulerAngles(entity) }
+	eulerAngles=(rhs) { ComponentInternals.TransformComponent_set_eulerAngles(entity, rhs) }
 }
 
 class RigidBody2DComponent is Component {
diff --git a/OverEngine/src/Wren/imgui.wren b/OverEngine/src/Wren/imgui.wren
@@ -0,0 +1,5 @@
+class ImGui {
+	foreign static begin(name)
+	foreign static end()
+	foreign static text(text)
+}
diff --git a/OverEngine/src/Wren/lib.wren b/OverEngine/src/Wren/lib.wren
@@ -1,4 +1,5 @@
 // Load engine interface
+// Is it really needed?
 import "entity"
 import "math"
 import "script"
diff --git a/Sandbox/CMakeLists.txt b/Sandbox/CMakeLists.txt
@@ -6,6 +6,6 @@ add_executable(Sandbox
 	${sandbox_header_files}
 )
 
-set_property(TARGET Sandbox PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/Sandbox")
+set_property(TARGET Sandbox PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(Sandbox PRIVATE OverEngine)
diff --git a/Sandbox/imgui.ini b/Sandbox/imgui.ini
diff --git a/Sandbox/src/SandboxECS/SandboxECS.cpp b/Sandbox/src/SandboxECS/SandboxECS.cpp
@@ -151,18 +151,20 @@ SandboxECS::SandboxECS()
 		{
 		}
 
-		virtual void OnUpdate(TimeStep ts) override
+		virtual void OnCreate() override
 		{
-			m_ParticleProps.Position = GetComponent<TransformComponent>().GetPosition();
-			m_ParticleProps.Position.z = -0.2f;
-
-			m_ParticleProps.Position.x += Random::Range(-0.2f, 0.2f);
-			m_ParticleProps.Position.y += Random::Range(-0.2f, 0.2f);
-
 			m_ParticleProps.BirthSize = Vector2(0.2f);
 
 			m_ParticleProps.RenderingProps.Sprite = GetComponent<SpriteRendererComponent>().Sprite;
 			m_ParticleProps.RenderingProps.BirthColor = Color(0.8f, 0.8f, 0.8f, 1.0f);
+		}
+
+		virtual void OnUpdate(TimeStep ts) override
+		{
+			m_ParticleProps.Position = GetComponent<TransformComponent>().GetPosition();
+			m_ParticleProps.Position.x += Random::Range(-0.2f, 0.2f);
+			m_ParticleProps.Position.y += Random::Range(-0.2f, 0.2f);
+			m_ParticleProps.Position.z = -0.2f; // Move particles behind player
 
 			OE_SIMPLE_FOR_LOOP(2) m_ParticleSystem->Emit(m_ParticleProps);
 		}
@@ -183,7 +185,7 @@ SandboxECS::SandboxECS()
 	}
 
 	m_Scene->OnScenePlay();
-	ImGui::GetStyle().Alpha = 0.8f;
+	ImGui::GetStyle().Alpha = 0.9f;
 }
 
 void SandboxECS::OnUpdate(TimeStep deltaTime)
@@ -192,14 +194,6 @@ void SandboxECS::OnUpdate(TimeStep deltaTime)
 
 	auto& camTransform = m_MainCamera.GetComponent<TransformComponent>();
 
-	float cameraRotationDirection = 0.0f;
-	if (Input::IsKeyPressed(KeyCode::Q))
-		cameraRotationDirection -= 1.0f;
-	if (Input::IsKeyPressed(KeyCode::E))
-		cameraRotationDirection += 1.0f;
-
-	camTransform.SetEulerAngles({ 0.0f, 0.0f, camTransform.GetEulerAngles().z + cameraRotationDirection * deltaTime * 80.0f });
-
 	Window& win = Application::Get().GetWindow();
 	m_Scene->SetViewportSize(win.GetWidth(), win.GetHeight());
 
@@ -214,10 +208,12 @@ void SandboxECS::OnImGuiRender()
 	if (ImGui::Button("Reload Renderer2D Shader"))
 		Renderer2D::GetShader()->Reload();
 
-	ImGui::Text("FPS: %i", (int)(1.0f / Time::GetDeltaTime()));
+	// ImGui::Text("FPS: %i", (int)(1.0f / Time::GetDeltaTime()));
 
-	Vector3 camPos = m_MainCamera.GetComponent<TransformComponent>().GetPosition();
-	ImGui::Text("Camera position: %.3f %.3f", camPos.x, camPos.y);
+	// Vector3 camPos = m_MainCamera.GetComponent<TransformComponent>().GetPosition();
+	// ImGui::Text("Camera position: %.3f %.3f", camPos.x, camPos.y);
+
+	m_MainCamera.GetComponent<ScriptComponent>().Script->CallMethod("onImGuiRender()");
 }
 
 void SandboxECS::OnEvent(Event& event)
@@ -245,14 +241,7 @@ bool SandboxECS::OnMouseScrolledEvent(MouseScrolledEvent& event)
 bool SandboxECS::OnKeyPressedEvent(KeyPressedEvent& event)
 {
 	if (event.GetKeyCode() == KeyCode::Escape)
-	{
-		auto& cam = m_MainCamera.GetComponent<CameraComponent>().Camera;
-		auto& camTransform = m_MainCamera.GetComponent<TransformComponent>();
-
-		camTransform.SetPosition({ 0.0f, 0.0f, 0.0f });
-		camTransform.SetEulerAngles({ 0.0f, 0.0f, 0.0f });
-		cam.SetOrthographicSize(10.0f);
-	}
+		m_MainCamera.GetComponent<CameraComponent>().Camera.SetOrthographicSize(10.0f);
 
 	return false;
 }
diff --git a/Sandbox/src/wren/scripts.wren b/Sandbox/src/wren/scripts.wren

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ target_include_directories(OverEditor PRIVATE`
`10`	`10`	`"src"`
`11`	`11`	`)`
`12`	`12`
`13`		`-set_property(TARGET OverEditor PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/OverEditor")`
	`13`	`+set_property(TARGET OverEditor PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})`
`14`	`14`
`15`	`15`	`target_link_libraries(OverEditor PRIVATE OverEngine)`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,9 @@ namespace OverEngine`
`43`	`43`	`// Setup Platform/Renderer bindings`
`44`	`44`	`ImGuiBinding::Init(&Application::Get().GetWindow());`
`45`	`45`
`46`		`- io.Fonts->AddFontFromMemoryCompressedTTF(&Roboto_compressed_data, Roboto_compressed_size, 15.0f);`
	`46`	`+ ImFontConfig fontTemplate;`
	`47`	`+ strcpy_s(fontTemplate.Name, 40, "Roboto");`
	`48`	`+ io.Fonts->AddFontFromMemoryCompressedTTF(&Roboto_compressed_data, Roboto_compressed_size, 20.0f, &fontTemplate);`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`void ImGuiLayer::OnDetach()`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ namespace OverEngine`
`40`	`40`	`m_Data.Width = props.Width;`
`41`	`41`	`m_Data.Height = props.Height;`
`42`	`42`
`43`		`- OE_CORE_INFO("Creating window {0} ({1}, {2})", props.Title, props.Width, props.Height);`
	`43`	`+ OE_CORE_INFO("Creating window '{0}' ({1}x{2})", props.Title, props.Width, props.Height);`
`44`	`44`
`45`	`45`	`if (s_WindowCount == 0)`
`46`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ class ComponentInternals {`
`4`	`4`
`5`	`5`	`foreign static TransformComponent_position(entity)`
`6`	`6`	`foreign static TransformComponent_set_position(entity, position)`
	`7`	`+ foreign static TransformComponent_eulerAngles(entity)`
	`8`	`+ foreign static TransformComponent_set_eulerAngles(entity, eulerAngles)`
`7`	`9`
`8`	`10`	`foreign static RigidBody2DComponent_applyLinearImpulseToCenter(entity, impulse)`
`9`	`11`	`}`
`@@ -29,6 +31,9 @@ class TransformComponent is Component {`
`29`	`31`
`30`	`32`	`position { ComponentInternals.TransformComponent_position(entity) }`
`31`	`33`	`position=(rhs) { ComponentInternals.TransformComponent_set_position(entity, rhs) }`
	`34`	`+`
	`35`	`+ eulerAngles { ComponentInternals.TransformComponent_eulerAngles(entity) }`
	`36`	`+ eulerAngles=(rhs) { ComponentInternals.TransformComponent_set_eulerAngles(entity, rhs) }`
`32`	`37`	`}`
`33`	`38`
`34`	`39`	`class RigidBody2DComponent is Component {`