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

Fixed wrong Nuake.Net path

Browse Source
This commit is contained in:
Antoine Pilote
2024-04-11 19:49:23 -04:00
parent f4d71b9977
commit f4493886f0
4 changed files with 1360 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1334
Nuake/src/Resource/StaticResources.cpp
View File

File diff suppressed because it is too large Load Diff

24
Nuake/src/Resource/StaticResources.h
View File

@@ -45,9 +45,21 @@ extern unsigned char Resources_Gizmos_light_png[];
extern const std::string Resources_Gizmos_player_png_path;
extern unsigned int Resources_Gizmos_player_png_len;
extern unsigned char Resources_Gizmos_player_png[];
extern const std::string Resources_Images_box_png_path;
extern unsigned int Resources_Images_box_png_len;
extern unsigned char Resources_Images_box_png[];
extern const std::string Resources_Images_code_png_path;
extern unsigned int Resources_Images_code_png_len;
extern unsigned char Resources_Images_code_png[];
extern const std::string Resources_Images_cube_png_path;
extern unsigned int Resources_Images_cube_png_len;
extern unsigned char Resources_Images_cube_png[];
extern const std::string Resources_Images_folder_icon_png_path;
extern unsigned int Resources_Images_folder_icon_png_len;
extern unsigned char Resources_Images_folder_icon_png[];
extern const std::string Resources_Images_light_png_path;
extern unsigned int Resources_Images_light_png_len;
extern unsigned char Resources_Images_light_png[];
extern const std::string Resources_Images_logo_png_path;
extern unsigned int Resources_Images_logo_png_len;
extern unsigned char Resources_Images_logo_png[];
@@ -57,12 +69,24 @@ extern unsigned char Resources_Images_logo_white_png[];
extern const std::string Resources_Images_nuake_logo_png_path;
extern unsigned int Resources_Images_nuake_logo_png_len;
extern unsigned char Resources_Images_nuake_logo_png[];
extern const std::string Resources_Images_physics_png_path;
extern unsigned int Resources_Images_physics_png_len;
extern unsigned char Resources_Images_physics_png[];
extern const std::string Resources_Images_project_icon_png_path;
extern unsigned int Resources_Images_project_icon_png_len;
extern unsigned char Resources_Images_project_icon_png[];
extern const std::string Resources_Images_screenshot_png_path;
extern unsigned int Resources_Images_screenshot_png_len;
extern unsigned char Resources_Images_screenshot_png[];
extern const std::string Resources_Images_shape_png_path;
extern unsigned int Resources_Images_shape_png_len;
extern unsigned char Resources_Images_shape_png[];
extern const std::string Resources_Images_speaker_png_path;
extern unsigned int Resources_Images_speaker_png_len;
extern unsigned char Resources_Images_speaker_png[];
extern const std::string Resources_Images_wrench_png_path;
extern unsigned int Resources_Images_wrench_png_len;
extern unsigned char Resources_Images_wrench_png[];
extern const std::string Resources_Scripts_Audio_wren_path;
extern unsigned int Resources_Scripts_Audio_wren_len;
extern unsigned char Resources_Scripts_Audio_wren[];

4
Nuake/src/Scripting/ScriptingEngineNet.cpp
View File

@@ -70,7 +70,7 @@ namespace Nuake
// Check if we have an .sln in the project.
const std::string absoluteAssemblyPath = FileSystem::Root + m_NetDirectory + "/" + m_EngineAssemblyName;
if (!FileSystem::FileExists(absoluteAssemblyPath))
if (!FileSystem::FileExists(m_EngineAssemblyName, true))
{
m_IsInitialized = false;
return;
@@ -79,7 +79,7 @@ namespace Nuake
m_LoadContext = m_HostInstance->CreateAssemblyLoadContext(m_ContextName);
// Load Nuake assembly DLL
m_NuakeAssembly = m_LoadContext.LoadAssembly(absoluteAssemblyPath);
m_NuakeAssembly = m_LoadContext.LoadAssembly(m_EngineAssemblyName);
// Upload internal calls for each module
// --------------------------------------------------

2
Nuake/src/Scripting/ScriptingEngineNet.h
View File

@@ -21,7 +21,7 @@ namespace Nuake {
private:
const std::string m_Scope = "Nuake.Net";
const std::string m_EngineAssemblyName = "NuakeNet.dll";
const std::string m_NetDirectory = ".net";
const std::string m_NetDirectory = "bin/Debug/net8.0";
const std::string m_ContextName = "NuakeEngineContext";
bool m_IsInitialized = false;