celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-15 20:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Now bindings between coral and and generatedC# correctly working

Browse Source
This commit is contained in:
antopilo
2025-04-04 17:11:48 -04:00
parent 1668363c4e
commit bff8ca2be1
7 changed files with 61 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Nuake/Source/Nuake/Scripting/NetModules/ModulesAPI.cpp
View File

@@ -15,28 +15,25 @@ namespace Nuake
void ModulesAPI::RegisterMethods()
{
isModule = true;
const std::string& internalPrefix = "Internals";
for (auto& name : ModuleDB::Get().GetModules())
{
const std::string& modulePrefix = internalPrefix + "." + name;
auto meta = entt::resolve(entt::hashed_string(("class " + name).c_str()));
auto instance = ModuleDB::Get().GetBaseImpl(name).instance;
for (auto [id, func] : meta.func())
{
auto funcName = func.prop(HashedName::DisplayName);
const std::string funcNameStd = funcName.value().try_cast<std::string>()->c_str();
const std::string& fullName = modulePrefix + funcNameStd;
auto funcPtrMeta = func.prop(HashedUserValue::FuncPtr);
auto funcPtr = funcPtrMeta.value().try_cast<void*>();
RegisterMethod("Internals.SetVolumeICall", &SetVolume);
//const std::string& internalPrefix = "Internal";
//
//for (auto& name : ModuleDB::Get().GetModules())
//{
// const std::string& modulePrefix = internalPrefix + ".";
// auto meta = entt::resolve(entt::hashed_string(("class " + name).c_str()));
// auto instance = ModuleDB::Get().GetBaseImpl(name).instance;
// for (auto [id, func] : meta.func())
// {
// auto funcName = func.prop(HashedName::DisplayName);
// const std::string funcNameStd = funcName.value().try_cast<std::string>()->c_str();
// const std::string& fullName = modulePrefix + funcNameStd;
//
// auto funcPtrMeta = func.prop(HashedUserValue::FuncPtr);
// auto funcPtr = funcPtrMeta.value().try_cast<void*>();
// RegisterMethod(fullName, &SetVolume);
// }
//}
RegisterMethod(fullName + "ICall", *funcPtr);
}
}
}
}

2
Nuake/Source/Nuake/Scripting/NetModules/NetAPIModule.h
View File

@@ -8,8 +8,6 @@ namespace Nuake {
class NetAPIModule
{
public:
bool isModule = false;
using MethodMap = std::unordered_map<std::string, void*>;
virtual const std::string GetModuleName() const = 0;

12
Nuake/Source/Nuake/Scripting/ScriptingEngineNet.cpp
View File

@@ -167,16 +167,8 @@ namespace Nuake
{
for (const auto& [methodName, methodPtr] : netModule->GetMethods())
{
if(!netModule->isModule)
{
auto namespaceClassSplit = String::Split(methodName, '.');
assembly.AddInternalCall(m_Scope + '.' + namespaceClassSplit[0], namespaceClassSplit[1], methodPtr);
}
else
{
auto namespaceClassSplit = String::Split(methodName, '.');
assembly.AddInternalCall(m_Scope + '.' + namespaceClassSplit[0], namespaceClassSplit[1], methodPtr);
}
auto namespaceClassSplit = String::Split(methodName, '.');
assembly.AddInternalCall(m_Scope + '.' + namespaceClassSplit[0], namespaceClassSplit[1], methodPtr);
}
}

9
NuakeNet/Source/Generated/AudioModule.cs
View File

@@ -7,7 +7,14 @@ namespace Nuake.Net
{
unsafe
{
Internals.SetVolumeICall(volume);
Internals.AudioModuleSetVolumeICall(volume);
}
}
public static void SetMuted(bool muted)
{
unsafe
{
Internals.AudioModuleSetMutedICall(muted);
}
}
}

18
NuakeNet/Source/Generated/ExampleModule.cs
View File

@@ -1,5 +1,21 @@
using System;
namespace Nuake.Net
{
public class ExampleModule
{
public static void ExampleFunction()
{
unsafe
{
Internals.ExampleModuleExampleFunctionICall();
}
}
public static void ExampleModuleLog(string hi)
{
unsafe
{
Internals.ExampleModuleExampleModuleLogICall(hi);
}
}
}
}

18
NuakeNet/Source/Generated/Internals.cs
View File

@@ -1,11 +1,15 @@
using Coral.Managed.Interop;
namespace Nuake.Net
{
public class Internals
{
// AudioModule
public static unsafe delegate*<float, void> SetVolumeICall;
}
public class Internals
{
// AudioModule
internal static unsafe delegate*<float,void>AudioModuleSetVolumeICall;
internal static unsafe delegate*<bool,void>AudioModuleSetMutedICall;
// ExampleModule
internal static unsafe delegate*<void>ExampleModuleExampleFunctionICall;
internal static unsafe delegate*<NativeString,void>ExampleModuleExampleModuleLogICall;
}
}

9
NuakeNetGenerator/Source/Generator.cs
View File

@@ -48,6 +48,7 @@ class Generator
string generatedInternals = string.Empty;
generatedInternals += "using Coral.Managed.Interop;\n";
generatedInternals += "namespace Nuake.Net\r\n{\n";
generatedInternals += "public class Internals\n";
generatedInternals += "{\n";
@@ -56,7 +57,7 @@ class Generator
generatedInternals += $" // {module.Name}\n";
foreach (var function in module.Functions)
{
generatedInternals += $" public static unsafe delegate*<";
generatedInternals += $" internal static unsafe delegate*<";
if (function.NumArgs > 0)
{
@@ -70,7 +71,7 @@ class Generator
}
generatedInternals += "}\n";
generatedInternals += "}\n";
return generatedInternals;
}
@@ -78,9 +79,9 @@ class Generator
{
string moduleApi = string.Empty;
moduleApi += "using System;\n";
moduleApi += "namespace Nuake\n";
moduleApi += "namespace Nuake.Net\n";
moduleApi += "{\n";
moduleApi += " public static class " + module.Name + "\n";
moduleApi += " public class " + module.Name + "\n";
moduleApi += " {\n";
foreach (Function func in module.Functions)