Traverse wren class hierarchy + A few small fixes

Author: OverShifted

OverEngine/premake5.lua

@@ -77,11 +77,13 @@ project "OverEngine"
 		"%{includeDir.fmt}",
 		"%{includeDir.yaml_cpp}",
 		"%{includeDir.wren}",
+		"%{includeDir.wren_vm}",
 	}
 
 	defines
 	{
 		"GLFW_INCLUDE_NONE",
+		"YAML_CPP_STATIC_DEFINE",
 	}
 
 	filter "system:windows"

OverEngine/src/OverEngine/Scripting/Wren.cpp

@@ -49,14 +49,16 @@ namespace OverEngine
 
 		// This wont register superclasses fields.
 		wrenpp::VM::reportClassFn = [this](ClassInfo* classInfo) {
-			this->m_FieldNames[classInfo->name->value] = Vector<String>();
-			auto& fieldNames = this->m_FieldNames[classInfo->name->value];
+			this->m_FieldNames[classInfo->name->value] = std::make_pair(false, Vector<String>());
+			auto& fieldNames = this->m_FieldNames[classInfo->name->value].second;
 
 			SymbolTable* syms = &classInfo->fields;
 			for (ObjString** current = syms->data; current < syms->data + syms->count; current++)
 				fieldNames.push_back((*current)->value);
 		};
 
+		m_FieldNames["Object"] = std::make_pair(true, Vector<String>());
+
 		wrenpp::VM::loadModuleFn = [](const char* mod) -> char* {
 			#define WREN_MOD(m) if (strcmp(mod, #m) == 0) return const_cast<char*>(WrenSources::m##ModuleSource);
 
@@ -111,7 +113,7 @@ namespace OverEngine
 		wrenReleaseHandle(m_VM, m_OnCollisionEnterMethod);
 		wrenReleaseHandle(m_VM, m_OnCollisionExitMethod);
 
-		for (auto [_, handle] : m_CallHandles)
+		for (auto& [_, handle] : m_CallHandles)
 			wrenReleaseHandle(m_VM, handle);
 	}
 
@@ -144,6 +146,26 @@ namespace OverEngine
 		return ToString(&handle);
 	}
 
+	const Vector<String>& Wren::GetFields(ObjClass* klass) const
+	{
+		auto& [hasSuperClassFields, fields] = m_FieldNames.at(klass->name->value);
+
+		if (!hasSuperClassFields)
+			AddSuperClassFields(klass);
+
+		return fields;
+	}
+
+	void Wren::AddSuperClassFields(ObjClass* klass) const
+	{
+		auto& [hasSuperClassFields, fields] = m_FieldNames[klass->name->value];
+
+		auto& superClassFields = GetFields(klass->superclass);
+		fields.insert(fields.begin(), superClassFields.begin(), superClassFields.end());
+
+		hasSuperClassFields = true;
+	}
+
 	WrenScriptClass::WrenScriptClass(const Ref<Wren>& vm, const char* moduleName, const char* className)
 		: m_VM(vm)
 	{
@@ -180,16 +202,16 @@ namespace OverEngine
 		wrenReleaseHandle(m_VM->GetRaw(), m_InstanceHandle);
 	}
 
-	#define IMPL_METHOD_CALL_NO_PARAM(methode)                  \
-		WrenInterpretResult WrenScriptInstance::methode() const \
-		{                                                       \
-			return Call(m_VM->Get##methode##Method());          \
+	#define IMPL_METHOD_CALL_NO_PARAM(method)                  \
+		WrenInterpretResult WrenScriptInstance::method() const \
+		{                                                      \
+			return Call(m_VM->Get##method##Method());          \
 		}
 
-	#define IMPL_METHOD_CALL_WITH_PARAM(methode, params, wrenParams)  \
-		WrenInterpretResult WrenScriptInstance::methode(params) const \
-		{                                                             \
-			return Call(m_VM->Get##methode##Method(), wrenParams);    \
+	#define IMPL_METHOD_CALL_WITH_PARAM(method, params, wrenParams)  \
+		WrenInterpretResult WrenScriptInstance::method(params) const \
+		{                                                            \
+			return Call(m_VM->Get##method##Method(), wrenParams);    \
 		}
 
 	IMPL_METHOD_CALL_NO_PARAM(OnCreate)
@@ -204,12 +226,11 @@ namespace OverEngine
 		ObjClass* klass = wrenGetClass(m_VM->GetRaw(), m_InstanceHandle->value);
 		ObjInstance* instance = AS_INSTANCE(m_InstanceHandle->value);
 
-		auto& fields = m_VM->GetFields(klass->name->value);
+		auto& fields = m_VM->GetFields(klass);
 
 		for (int i = 0; i < klass->numFields; i++)
 		{
-			// FIXME: Climb the inheritance chain to access superclass fields.
-			ImGui::TextUnformatted(i == 0 ? "_entity" : fields[i - 1].c_str());
+			ImGui::TextUnformatted(fields[i].c_str());
 			ImGui::SameLine();
 			ImGui::TextUnformatted(m_VM->ToString(instance->fields[i]).c_str());
 		}

OverEngine/src/OverEngine/Scripting/Wren.h

@@ -50,6 +50,8 @@ namespace OverEngine
 			return wrenCall(m_VM, method);
 		}
 
+		// TODO: run code on custom module.
+		inline wrenpp::Result ExecuteString(const char* string) { return m_VM.executeString(string); }
 		inline wrenpp::Result LoadModule(const char* moduleName) { return m_VM.executeModule(moduleName); }
 		wrenpp::ModuleContext beginModule(const String& name) { return m_VM.beginModule(name); }
 
@@ -60,15 +62,17 @@ namespace OverEngine
 
 		inline WrenHandle* GetScheduler() { return m_Scheduler; }
 
-		inline const Vector<String>& GetFields(const char* className) const { return m_FieldNames.at(className); }
+		const Vector<String>& GetFields(ObjClass* klass) const;
 
 	private:
 		// Implemented in WrenBindings.cpp
 		void InitializeBindings();
+		
+		void AddSuperClassFields(ObjClass* klass) const;
 
 	private:
 		wrenpp::VM m_VM;
-		UnorderedMap<String, Vector<String>> m_FieldNames;
+		mutable UnorderedMap<String, std::pair<bool, Vector<String>>> m_FieldNames;
 
 		WrenHandle* m_Scheduler;
 

OverEngine/src/Wren/scheduler.wren

@@ -47,7 +47,7 @@ class Scheduler {
 			if (schedule.resumeTime <= Time.time) {
 				addFiber(__scheduled.removeAt(i).fiber)
 			}
-			i  = i - 1
+			i = i - 1
 		}
 	}
 

OverEngine/vendor/wren

@@ -14,7 +14,9 @@ Run `GenerateProjectFiles.bat` and open the generated solution file in Visual St
 ### Linux
 Build with CMake:
 ```sh
-cmake -S . -B build && cmake --build build
+git clone https://github.com/OverShifted/OverEngine
+cd OverEngine
+cmake -B build -DCMAKE_BUILD_TYPE=Debug && cmake --build build
 ```
 ## Credits
 * [spdlog](https://github.com/gabime/spdlog)
@@ -30,3 +32,4 @@ cmake -S . -B build && cmake --build build
 * [wrenpp](https://github.com/Nelarius/wrenpp)
 
 Contributions are welcome.
+

README.md

@@ -3,6 +3,7 @@
 #include <OverEngine/Scene/SceneSerializer.h>
 #include <wren.h>
 
+#include <OverEngine/ImGui/ExtraImGui.h>
 #include <imgui.h>
 
 using namespace OverEngine;
@@ -218,6 +219,18 @@ void SandboxECS::OnImGuiRender()
 	ImGui::Begin("CameraController script");
 	script->Inspect();
 	ImGui::End();
+
+	ImGui::Begin("Wren console");
+	static String wrenInputValue = "";
+	ImGui::PushItemWidth(-35);
+	ImGui::InputText("##WrenInput", &wrenInputValue);
+	ImGui::PopItemWidth();
+	ImGui::SameLine();
+	if (ImGui::Button(">"))
+	{
+		m_VM->ExecuteString(wrenInputValue.c_str());
+	}
+	ImGui::End();
 }
 
 void SandboxECS::OnEvent(Event& event)

Sandbox/src/SandboxECS/SandboxECS.cpp

@@ -42,6 +42,7 @@ class Player is Script {
 }
 
 class CameraController is Script {
+	static instances { __instances }
 	construct new(e) {
 		super(e)
 		_foo = 42
@@ -54,6 +55,9 @@ class CameraController is Script {
 			"color": "red"
 		})
 
+		if (__instances == null) { __instances = [] }
+		__instances.add(this)
+
 		// It will cause infinite recursion
 		// _baz.add(_baz)
 	}

Sandbox/src/wren/scripts.wren

@@ -47,6 +47,7 @@ includeDir["json"]     = "%{wks.location}/OverEngine/vendor/json/include"
 includeDir["fmt"]      = "%{wks.location}/OverEngine/vendor/fmt/include"
 includeDir["yaml_cpp"] = "%{wks.location}/OverEngine/vendor/yaml-cpp/include"
 includeDir["wren"]     = "%{wks.location}/OverEngine/vendor/wren/src/include"
+includeDir["wren_vm"]  = "%{wks.location}/OverEngine/vendor/wren/src/vm"
 
 linkLibs = {
 	"GLFW",
@@ -70,6 +71,7 @@ clientIncludes = {
 	"%{includeDir.fmt}",
 	"%{includeDir.yaml_cpp}",
 	"%{includeDir.wren}",
+	"%{includeDir.wren_vm}",
 }
 
 group "Dependencies"