tried to fix bugs (partial success)
This commit is contained in:
parent
04e4f63fd7
commit
d5d28d4884
2
.vscode/tasks.json
vendored
2
.vscode/tasks.json
vendored
@ -10,7 +10,7 @@
|
||||
"command": "bash",
|
||||
"args": [
|
||||
"-c",
|
||||
"cbuild build_exec_dbg"
|
||||
"cbuild rebuild_dependencies=src-csharp build_exec_dbg"
|
||||
],
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
|
||||
6
dependencies/src-csharp.config
vendored
6
dependencies/src-csharp.config
vendored
@ -1,9 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
DEP_WORKING_DIR='src-csharp'
|
||||
CS_CONFIGURATION='Release'
|
||||
if [[ "$TASK" = *_dbg ]]; then
|
||||
DEP_BUILD_COMMAND='dotnet build src-csharp.sln -o bin -c Debug'
|
||||
else
|
||||
DEP_BUILD_COMMAND='dotnet build src-csharp.sln -o bin -c Release'
|
||||
CS_CONFIGURATION='Debug'
|
||||
fi
|
||||
DEP_BUILD_COMMAND=$"dotnet build src-csharp.sln -o bin -c $CS_CONFIGURATION"
|
||||
DEP_CLEAN_COMMAND='rm -rf bin obj'
|
||||
DEP_OTHER_OUT_FILES='bin/Ougge.dll'
|
||||
|
||||
@ -26,23 +26,21 @@ public class GameObject
|
||||
public Transform Transform { get; }
|
||||
public GameObject? Parent;
|
||||
|
||||
public readonly Dictionary<Type, Component> Components = new();
|
||||
public Dictionary<Type, Component> Components = new();
|
||||
|
||||
private GameObject()
|
||||
{
|
||||
}
|
||||
|
||||
private void Init(ulong id, uint nativePoolIndex)
|
||||
private GameObject(ulong id, uint nativePoolIndex)
|
||||
{
|
||||
_id = id;
|
||||
_index = nativePoolIndex;
|
||||
// constructor doesn't work without writing to console
|
||||
// TODO: FIX THIS BULLSHIT
|
||||
Console.WriteLine($"GameObject(id: {id}, nativePoolIndex: {nativePoolIndex})");
|
||||
}
|
||||
|
||||
static public GameObject Create()
|
||||
{
|
||||
NativeMethods.createGameObject(out ulong id, out uint index);
|
||||
var o = new GameObject();
|
||||
o.Init(id, index);
|
||||
var o = new GameObject(id, index);
|
||||
return o;
|
||||
}
|
||||
|
||||
@ -56,6 +54,9 @@ public class GameObject
|
||||
throw new Exception($"Can't destroy GameObject({_id})");
|
||||
}
|
||||
|
||||
/// <param name="t">type derived from Component</param>
|
||||
/// <returns>true if new component instance was created, false if component of the same tipe is already added to GameObject</returns>
|
||||
/// <exception cref="Exception"></exception>
|
||||
public bool TryCreateComponent(Type t)
|
||||
{
|
||||
if(!t.IsSubclassOf(typeof(Component)))
|
||||
@ -67,12 +68,13 @@ public class GameObject
|
||||
Components.Add(t, (Component)Activator.CreateInstance(t, this));
|
||||
return true;
|
||||
}
|
||||
private bool TryCreateComponent(string fullName)
|
||||
private bool TryCreateComponent_internal(string fullName)
|
||||
{
|
||||
return TryCreateComponent(Type.GetType(fullName));
|
||||
Type t = Type.GetType(fullName) ?? throw new Exception($"type not found '{fullName}'");
|
||||
return TryCreateComponent(t);
|
||||
}
|
||||
|
||||
private void UpdateComponents(double deltaTime)
|
||||
private void InvokeUpdate(double deltaTime)
|
||||
{
|
||||
foreach(var p in Components)
|
||||
{
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net48</TargetFramework>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<RootNamespace>Ougge</RootNamespace>
|
||||
<ImplicitUsings>disable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<DebugType>embedded</DebugType>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -38,20 +38,28 @@ MonoMethod* tryGetMonoMethod(MonoClass* target_class, const std::string& name,
|
||||
{
|
||||
if(target_class == nullptr)
|
||||
throw UsefulException("target_class is nullptr");
|
||||
|
||||
// iterate each method
|
||||
void* iter = nullptr;
|
||||
MonoMethod* m = nullptr;
|
||||
MonoType* return_type = nullptr;
|
||||
std::vector<MonoType*> argument_types;
|
||||
while( (m = mono_class_get_methods(target_class, &iter)) ){
|
||||
// compare name
|
||||
std::string m_name = mono_method_get_name(m);
|
||||
if(m_name != name)
|
||||
continue;
|
||||
|
||||
argument_types.clear();
|
||||
MonoType* return_type = nullptr;
|
||||
getMethodSignatureTypes(m, &return_type, argument_types);
|
||||
// compare argument count
|
||||
if(argument_types.size() != arg_classes_size)
|
||||
continue;
|
||||
|
||||
// compare return type
|
||||
if(!mono_metadata_type_equal(return_type, mono_class_get_type(return_class)))
|
||||
continue;
|
||||
|
||||
// compare argument types
|
||||
bool argument_types_mismatch = false;
|
||||
for(size_t i = 0; i < arg_classes_size; i++){
|
||||
@ -62,6 +70,7 @@ MonoMethod* tryGetMonoMethod(MonoClass* target_class, const std::string& name,
|
||||
}
|
||||
if(argument_types_mismatch)
|
||||
continue;
|
||||
|
||||
// passed all tests successfully
|
||||
break;
|
||||
}
|
||||
|
||||
@ -85,8 +85,11 @@ public:
|
||||
void* arg_array[] = { valueToVoidPtr(args)..., nullptr };
|
||||
MonoObject* ex = nullptr;
|
||||
mono_runtime_invoke(method_ptr, class_instance, arg_array, &ex);
|
||||
if(ex)
|
||||
if(ex){
|
||||
//TODO: call mono_trace_set_printerr_handler from mono/mono/utils/mono-logger.h
|
||||
mono_print_unhandled_exception(ex);
|
||||
throw UsefulException("Some C# exception occured");
|
||||
}
|
||||
};
|
||||
|
||||
/// all types must implement getClass<T>()
|
||||
@ -94,10 +97,11 @@ public:
|
||||
static MonoClass* arg_classes[] { getClass<ArgTypes>()... };
|
||||
static MonoClass* return_class { getClass<ReturnT>() };
|
||||
method_ptr = tryGetMonoMethod(target_class, name, return_class, arg_classes, sizeof...(ArgTypes));
|
||||
if(method_ptr == nullptr)
|
||||
if(method_ptr == nullptr){
|
||||
throw UsefulException(format("can't get method '%s' from class '%s'",
|
||||
name.c_str(), mono_class_get_name(target_class)));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -15,7 +15,8 @@ RuntimeJIT::RuntimeJIT(const std::string& domain_name){
|
||||
}
|
||||
|
||||
RuntimeJIT::~RuntimeJIT(){
|
||||
mono_jit_cleanup(domain);
|
||||
// TODO: fix segfault on cleanup
|
||||
// mono_jit_cleanup(domain);
|
||||
}
|
||||
|
||||
std::shared_ptr<Assembly> RuntimeJIT::loadAssembly(const std::string &name){
|
||||
|
||||
15
src/main.cpp
15
src/main.cpp
@ -46,22 +46,23 @@ int main(int argc, const char** argv){
|
||||
MonoObject* exampleObjectManaged = mono_object_new(mono.getDomain(), gameObjectClass);
|
||||
u64 obj_id = 0;
|
||||
auto pair = p.emplace(GameObject(exampleObjectManaged, nullptr));
|
||||
mono_runtime_object_init(exampleObjectManaged);
|
||||
auto exampleObjectInit = Mono::Method<void(u64, u32)>(gameObjectClass, "Init");
|
||||
exampleObjectInit(exampleObjectManaged, obj_id++, pair.first);
|
||||
auto exampleObjectUpdate = Mono::Method<void(f64)>(gameObjectClass, "UpdateComponents");
|
||||
auto gameObjectCtor = Mono::Method<void(u64, u32)>(gameObjectClass, ".ctor");
|
||||
gameObjectCtor(exampleObjectManaged, obj_id++, pair.first);
|
||||
|
||||
auto exampleObjectUpdate = Mono::Method<void(f64)>(gameObjectClass, "InvokeUpdate");
|
||||
updateCallbacks.push_back([exampleObjectManaged, exampleObjectUpdate](f64 deltaTime) -> void {
|
||||
exampleObjectUpdate(exampleObjectManaged, deltaTime);
|
||||
});
|
||||
|
||||
auto tryCreateComponent = Mono::Method<Mono::Bool(Mono::String)>(gameObjectClass, "TryCreateComponent");
|
||||
Mono::String componentNameManaged = mono_string_new(mono.getDomain(), "ExampleComponent");
|
||||
Mono::ObjectHandle componentNameObjectHandle((MonoObject*)(void*)componentNameManaged);
|
||||
auto tryCreateComponent = Mono::Method<Mono::Bool(Mono::String)>(gameObjectClass, "TryCreateComponent_internal");
|
||||
Mono::String componentNameManaged = mono_string_new(mono.getDomain(), "Ougge.ExampleComponent");
|
||||
// Mono::ObjectHandle componentNameObjectHandle((MonoObject*)(void*)componentNameManaged);
|
||||
Mono::Bool created = tryCreateComponent(exampleObjectManaged, componentNameManaged);
|
||||
if(!created.wide_bool)
|
||||
throw UsefulException("couldn't create ExampleComponent");
|
||||
|
||||
std::cout<<"OK!"<<std::endl;
|
||||
return 0;
|
||||
GUI::MainWindow w;
|
||||
w.open("ougge", update);
|
||||
std::cout<<"created sdl window"<<std::endl;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user