Embedded file icons, fixed lights not unregistering when deleting last light in scene. Fixed resource file
@@ -320,7 +320,7 @@ namespace Nuake
|
||||
}
|
||||
|
||||
|
||||
Ref<Texture> textureImage =TextureManager::Get()->GetTexture("Resources/Images/file_icon.png");
|
||||
Ref<Texture> textureImage = TextureManager::Get()->GetTexture("Resources/Images/file_icon.png");
|
||||
|
||||
const auto textureMgr = TextureManager::Get();
|
||||
const auto fileType = file->GetFileType();
|
||||
|
||||
@@ -252,6 +252,10 @@ namespace Nuake
|
||||
|
||||
void Renderer::EndDraw()
|
||||
{
|
||||
Shader* deferredShader = ShaderManager::GetShader("Resources/Shaders/deferred.shader");
|
||||
deferredShader->Bind();
|
||||
deferredShader->SetUniform1i("LightCount", 0);
|
||||
|
||||
m_Lights.clear();
|
||||
}
|
||||
|
||||
|
||||
@@ -27,6 +27,9 @@ namespace Nuake
|
||||
m_Registry.emplace(Resources_Images_nuake_logo_png_path, CreateRef<Texture>(Resources_Images_nuake_logo_png, Resources_Images_nuake_logo_png_len));
|
||||
m_Registry.emplace(Resources_Images_logo_white_png_path, CreateRef<Texture>(Resources_Images_logo_white_png, Resources_Images_logo_white_png_len));
|
||||
m_Registry.emplace(Resources_Images_logo_png_path, CreateRef<Texture>(Resources_Images_logo_png, Resources_Images_logo_png_len));
|
||||
m_Registry.emplace(Resources_Images_file_icon_png_path, CreateRef<Texture>(Resources_Images_file_icon_png, Resources_Images_file_icon_png_len));
|
||||
m_Registry.emplace(Resources_Images_scene_icon_png_path, CreateRef<Texture>(Resources_Images_scene_icon_png, Resources_Images_scene_icon_png_len));
|
||||
m_Registry.emplace(Resources_Images_project_icon_png_path, CreateRef<Texture>(Resources_Images_project_icon_png, Resources_Images_project_icon_png_len));
|
||||
|
||||
unsigned char whitePixel[] = { 255, 255, 255, 255 };
|
||||
m_Registry.emplace("Resources/Textures/Default.png", CreateRef<Texture>(Vector2( 1, 1 ), GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, &whitePixel));
|
||||
|
||||
@@ -45,15 +45,24 @@ 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_audio_file_icon_png_path;
|
||||
extern unsigned int Resources_Images_audio_file_icon_png_len;
|
||||
extern unsigned char Resources_Images_audio_file_icon_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_csharp_icon_png_path;
|
||||
extern unsigned int Resources_Images_csharp_icon_png_len;
|
||||
extern unsigned char Resources_Images_csharp_icon_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_file_icon_png_path;
|
||||
extern unsigned int Resources_Images_file_icon_png_len;
|
||||
extern unsigned char Resources_Images_file_icon_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[];
|
||||
@@ -75,9 +84,15 @@ 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_scene_icon_png_path;
|
||||
extern unsigned int Resources_Images_scene_icon_png_len;
|
||||
extern unsigned char Resources_Images_scene_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_script_file_icon_png_path;
|
||||
extern unsigned int Resources_Images_script_file_icon_png_len;
|
||||
extern unsigned char Resources_Images_script_file_icon_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[];
|
||||
@@ -87,6 +102,12 @@ 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_resources_aps_path;
|
||||
extern unsigned int Resources_resources_aps_len;
|
||||
extern unsigned char Resources_resources_aps[];
|
||||
extern const std::string Resources_resources_rc_path;
|
||||
extern unsigned int Resources_resources_rc_len;
|
||||
extern unsigned char Resources_resources_rc[];
|
||||
extern const std::string Resources_Scripts_Audio_wren_path;
|
||||
extern unsigned int Resources_Scripts_Audio_wren_len;
|
||||
extern unsigned char Resources_Scripts_Audio_wren[];
|
||||
|
||||
BIN
Resources/Images/audio_file_icon.png
Normal file
|
After Width: | Height: | Size: 988 B |
BIN
Resources/Images/csharp_icon.png
Normal file
|
After Width: | Height: | Size: 849 B |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 1.9 KiB |
BIN
Resources/Images/file_icon.png
Normal file
|
After Width: | Height: | Size: 792 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 5.6 KiB |
BIN
Resources/Images/scene_icon.png
Normal file
|
After Width: | Height: | Size: 626 B |
BIN
Resources/Images/script_file_icon.png
Normal file
|
After Width: | Height: | Size: 901 B |
@@ -350,8 +350,8 @@ project "Editor"
|
||||
}
|
||||
files
|
||||
{
|
||||
"%{prj.name}/resources/*.rc",
|
||||
"%{prj.name}/resources/**.ico"
|
||||
"%{prj.name}/*.rc",
|
||||
"%{prj.name}/**.ico"
|
||||
}
|
||||
defines
|
||||
{
|
||||
|
||||