Added initial native scripting support

rsniezek · Aug 13, 2020 · 3177aca · 3177aca
1 parent 8a81a7e
commit 3177aca
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 6 deletions.
diff --git a/Hazel/src/Hazel.h b/Hazel/src/Hazel.h
@@ -19,6 +19,7 @@
 
 #include "Hazel/Scene/Scene.h"
 #include "Hazel/Scene/Entity.h"
+#include "Hazel/Scene/ScriptableEntity.h"
 #include "Hazel/Scene/Components.h"
 
 // ---Renderer------------------------

diff --git a/Hazel/src/Hazel/Scene/Components.h b/Hazel/src/Hazel/Scene/Components.h
@@ -3,6 +3,7 @@
 #include <glm/glm.hpp>
 
 #include "SceneCamera.h"
+#include "ScriptableEntity.h"
 
 namespace Hazel {
 
@@ -49,4 +50,27 @@ namespace Hazel {
 		CameraComponent(const CameraComponent&) = default;
 	};
 
+	struct NativeScriptComponent
+	{
+		ScriptableEntity* Instance = nullptr;
+
+		std::function<void()> InstantiateFunction;
+		std::function<void()> DestroyInstanceFunction;
+
+		std::function<void(ScriptableEntity*)> OnCreateFunction;
+		std::function<void(ScriptableEntity*)> OnDestroyFunction;
+		std::function<void(ScriptableEntity*, Timestep)> OnUpdateFunction;
+
+		template<typename T>
+		void Bind()
+		{
+			InstantiateFunction = [&]() { Instance = new T(); };
+			DestroyInstanceFunction = [&]() { delete (T*)Instance; Instance = nullptr; };
+
+			OnCreateFunction = [](ScriptableEntity* instance) { ((T*)instance)->OnCreate(); };
+			OnDestroyFunction = [](ScriptableEntity* instance) { ((T*)instance)->OnDestroy(); };
+			OnUpdateFunction = [](ScriptableEntity* instance, Timestep ts) { ((T*)instance)->OnUpdate(ts); };
+		}
+	};
+
 }
diff --git a/Hazel/src/Hazel/Scene/Scene.cpp b/Hazel/src/Hazel/Scene/Scene.cpp
@@ -62,6 +62,24 @@ namespace Hazel {
 
 	void Scene::OnUpdate(Timestep ts)
 	{
+		// Update scripts
+		{
+			m_Registry.view<NativeScriptComponent>().each([=](auto entity, auto& nsc)
+			{
+				if (!nsc.Instance)
+				{
+					nsc.InstantiateFunction();
+					nsc.Instance->m_Entity = Entity{ entity, this };
+
+					if (nsc.OnCreateFunction)
+						nsc.OnCreateFunction(nsc.Instance);
+				}
+
+				if (nsc.OnUpdateFunction)
+					nsc.OnUpdateFunction(nsc.Instance, ts);
+			});
+		}
+
 		// Render 2D
 		Camera* mainCamera = nullptr;
 		glm::mat4* cameraTransform = nullptr;

diff --git a/Hazel/src/Hazel/Scene/ScriptableEntity.h b/Hazel/src/Hazel/Scene/ScriptableEntity.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "Entity.h"
+
+namespace Hazel {
+
+	class ScriptableEntity
+	{
+	public:
+		template<typename T>
+		T& GetComponent()
+		{
+			return m_Entity.GetComponent<T>();
+		}
+	private:
+		Entity m_Entity;
+		friend class Scene;
+	};
+
+}
+
diff --git a/Hazelnut/imgui.ini b/Hazelnut/imgui.ini
@@ -10,18 +10,18 @@ Collapsed=0
 
 [Window][Settings]
 Pos=0,19
-Size=899,701
+Size=353,701
 Collapsed=0
 DockId=0x00000001,0
 
 [Window][Viewport]
-Pos=901,19
-Size=379,701
+Pos=355,19
+Size=925,701
 Collapsed=0
 DockId=0x00000002,0
 
 [Docking][Data]
-DockSpace   ID=0x3BC79352 Window=0x4647B76E Pos=437,391 Size=1280,701 Split=X Selected=0x995B0CF8
-  DockNode  ID=0x00000001 Parent=0x3BC79352 SizeRef=899,701 Selected=0x1C33C293
-  DockNode  ID=0x00000002 Parent=0x3BC79352 SizeRef=1659,701 CentralNode=1 HiddenTabBar=1 Selected=0x995B0CF8
+DockSpace   ID=0x3BC79352 Window=0x4647B76E Pos=216,258 Size=1280,701 Split=X Selected=0x995B0CF8
+  DockNode  ID=0x00000001 Parent=0x3BC79352 SizeRef=353,701 Selected=0x1C33C293
+  DockNode  ID=0x00000002 Parent=0x3BC79352 SizeRef=925,701 CentralNode=1 HiddenTabBar=1 Selected=0x995B0CF8
 
diff --git a/Hazelnut/src/EditorLayer.cpp b/Hazelnut/src/EditorLayer.cpp
@@ -37,6 +37,36 @@ namespace Hazel {
 		m_SecondCamera = m_ActiveScene->CreateEntity("Clip-Space Entity");
 		auto& cc = m_SecondCamera.AddComponent<CameraComponent>();
 		cc.Primary = false;
+
+		class CameraController : public ScriptableEntity
+		{
+		public:
+			void OnCreate()
+			{
+			}
+
+			void OnDestroy()
+			{
+			}
+
+			void OnUpdate(Timestep ts)
+			{
+				auto& transform = GetComponent<TransformComponent>().Transform;
+				float speed = 5.0f;
+
+				if (Input::IsKeyPressed(KeyCode::A))
+					transform[3][0] -= speed * ts;
+				if (Input::IsKeyPressed(KeyCode::D))
+					transform[3][0] += speed * ts;
+				if (Input::IsKeyPressed(KeyCode::W))
+					transform[3][1] += speed * ts;
+				if (Input::IsKeyPressed(KeyCode::S))
+					transform[3][1] -= speed * ts;
+			}
+		};
+
+		m_CameraEntity.AddComponent<NativeScriptComponent>().Bind<CameraController>();
+
 	}
 
 	void EditorLayer::OnDetach()