Skip to content

Commit 938e716

Browse files
Electron7-7Electron7-7
committed
feature: remove the debug light image and change the icon uids to be in namespace UID 
1 parent de731ce commit 938e716

5 files changed

Lines changed: 30 additions & 36 deletions

File tree

‎Editor/assets/icon_uids.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <Nostalgia/Nostalgia.hpp>
55

6-
namespace Icons
6+
namespace UID
77
{
88
inline ID actor_2d,
99
actor_3d,

‎Editor/gui/imgui_editor.cpp‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "editor_icons.hpp"
44
#include "assets/icon_uids.hpp"
55
#include "theatre/editor_theatre.hpp"
6-
#include "assets/icon_uids.hpp"
76
#include "thirdparty/DearImGui/imgui.h"
87
#include "thirdparty/DearImGui/imgui_stdlib.h"
98
#include "thirdparty/DearImGui/imgui_internal.h"
@@ -29,7 +28,6 @@
2928
m_sEditorIcons[TYPE]->rename(#TYPE); \
3029
m_sEditorIconUIDs.emplace(UID_OUT = m_sEditorIcons[TYPE]->uid()); \
3130

32-
using namespace Icons;
3331
using namespace ImGui;
3432

3533
static ImGui_Editor sImGuiEditor{};
@@ -65,35 +63,35 @@ void ImDrawCallback_ImplGL_DisableSRGB(const ImDrawList*, const ImDrawCmd*)
6563
void ImGui_Editor::Init()
6664
{
6765
PRINT_PRETTY_FUNCTION;
68-
REGISTER_ICON(ThingType::Actor2D, _EditorIcons::actor_2d, Icons::actor_2d)
69-
REGISTER_ICON(ThingType::Actor3D, _EditorIcons::actor_3d, Icons::actor_3d)
70-
REGISTER_ICON(ThingType::ArrayMesh, _EditorIcons::array_mesh, Icons::array_mesh)
71-
REGISTER_ICON(ThingType::Camera2D, _EditorIcons::camera_2d, Icons::camera_2d)
72-
REGISTER_ICON(ThingType::Camera3D, _EditorIcons::camera_3d, Icons::camera_3d)
73-
REGISTER_ICON(ThingType::Collider3D, _EditorIcons::collider_3d, Icons::collider_3d)
74-
REGISTER_ICON(ThingType::Cubemap, _EditorIcons::cubemap, Icons::cubemap)
75-
REGISTER_ICON(ThingType::DirectionalLight3D, _EditorIcons::directional_light_3d, Icons::directional_light_3d)
76-
REGISTER_ICON(ThingType::Font, _EditorIcons::font, Icons::font)
77-
REGISTER_ICON(ThingType::Image, _EditorIcons::image, Icons::image)
78-
REGISTER_ICON(ThingType::ImageTexture, _EditorIcons::image_texture, Icons::image_texture)
79-
REGISTER_ICON(ThingType::Light3D, _EditorIcons::light_3d, Icons::light_3d)
80-
REGISTER_ICON(ThingType::Material, _EditorIcons::material, Icons::material)
81-
REGISTER_ICON(ThingType::Mesh, _EditorIcons::mesh, Icons::mesh)
82-
REGISTER_ICON(ThingType::MeshInstance3D, _EditorIcons::mesh_instance_3d, Icons::mesh_instance_3d)
83-
REGISTER_ICON(ThingType::NostalgiaPlayer, _EditorIcons::nostalgia_player_3d, Icons::nostalgia_player_3d)
84-
REGISTER_ICON(ThingType::PointLight3D, _EditorIcons::point_light_3d, Icons::point_light_3d)
85-
REGISTER_ICON(ThingType::Resource, _EditorIcons::resource, Icons::resource)
86-
REGISTER_ICON(ThingType::SpotLight3D, _EditorIcons::spot_light_3d, Icons::spot_light_3d)
87-
REGISTER_ICON(ThingType::Sprite2D, _EditorIcons::sprite_2d, Icons::sprite_2d)
88-
REGISTER_ICON(ThingType::Sprite3D, _EditorIcons::sprite_3d, Icons::sprite_3d)
89-
REGISTER_ICON(ThingType::Text2D, _EditorIcons::text_2d, Icons::text_2d)
90-
REGISTER_ICON(ThingType::Texture, _EditorIcons::texture, Icons::texture)
91-
REGISTER_ICON(ThingType::Thing, _EditorIcons::thing, Icons::thing)
92-
REGISTER_ICON(ThingType::Thinker, _EditorIcons::thinker, Icons::thinker)
93-
REGISTER_ICON(ThingType::Viewport, _EditorIcons::viewport, Icons::viewport)
94-
REGISTER_ICON(ThingType::ViewportTexture, _EditorIcons::viewport_texture, Icons::viewport_texture)
95-
REGISTER_ICON(ThingType::Visual2D, _EditorIcons::visual_2d, Icons::visual_2d)
96-
REGISTER_ICON(ThingType::Visual3D, _EditorIcons::visual_3d, Icons::visual_3d)
66+
REGISTER_ICON(ThingType::Actor2D, _EditorIcons::actor_2d, UID::actor_2d)
67+
REGISTER_ICON(ThingType::Actor3D, _EditorIcons::actor_3d, UID::actor_3d)
68+
REGISTER_ICON(ThingType::ArrayMesh, _EditorIcons::array_mesh, UID::array_mesh)
69+
REGISTER_ICON(ThingType::Camera2D, _EditorIcons::camera_2d, UID::camera_2d)
70+
REGISTER_ICON(ThingType::Camera3D, _EditorIcons::camera_3d, UID::camera_3d)
71+
REGISTER_ICON(ThingType::Collider3D, _EditorIcons::collider_3d, UID::collider_3d)
72+
REGISTER_ICON(ThingType::Cubemap, _EditorIcons::cubemap, UID::cubemap)
73+
REGISTER_ICON(ThingType::DirectionalLight3D, _EditorIcons::directional_light_3d, UID::directional_light_3d)
74+
REGISTER_ICON(ThingType::Font, _EditorIcons::font, UID::font)
75+
REGISTER_ICON(ThingType::Image, _EditorIcons::image, UID::image)
76+
REGISTER_ICON(ThingType::ImageTexture, _EditorIcons::image_texture, UID::image_texture)
77+
REGISTER_ICON(ThingType::Light3D, _EditorIcons::light_3d, UID::light_3d)
78+
REGISTER_ICON(ThingType::Material, _EditorIcons::material, UID::material)
79+
REGISTER_ICON(ThingType::Mesh, _EditorIcons::mesh, UID::mesh)
80+
REGISTER_ICON(ThingType::MeshInstance3D, _EditorIcons::mesh_instance_3d, UID::mesh_instance_3d)
81+
REGISTER_ICON(ThingType::NostalgiaPlayer, _EditorIcons::nostalgia_player_3d, UID::nostalgia_player_3d)
82+
REGISTER_ICON(ThingType::PointLight3D, _EditorIcons::point_light_3d, UID::point_light_3d)
83+
REGISTER_ICON(ThingType::Resource, _EditorIcons::resource, UID::resource)
84+
REGISTER_ICON(ThingType::SpotLight3D, _EditorIcons::spot_light_3d, UID::spot_light_3d)
85+
REGISTER_ICON(ThingType::Sprite2D, _EditorIcons::sprite_2d, UID::sprite_2d)
86+
REGISTER_ICON(ThingType::Sprite3D, _EditorIcons::sprite_3d, UID::sprite_3d)
87+
REGISTER_ICON(ThingType::Text2D, _EditorIcons::text_2d, UID::text_2d)
88+
REGISTER_ICON(ThingType::Texture, _EditorIcons::texture, UID::texture)
89+
REGISTER_ICON(ThingType::Thing, _EditorIcons::thing, UID::thing)
90+
REGISTER_ICON(ThingType::Thinker, _EditorIcons::thinker, UID::thinker)
91+
REGISTER_ICON(ThingType::Viewport, _EditorIcons::viewport, UID::viewport)
92+
REGISTER_ICON(ThingType::ViewportTexture, _EditorIcons::viewport_texture, UID::viewport_texture)
93+
REGISTER_ICON(ThingType::Visual2D, _EditorIcons::visual_2d, UID::visual_2d)
94+
REGISTER_ICON(ThingType::Visual3D, _EditorIcons::visual_3d, UID::visual_3d)
9795
}
9896

9997
void ImGui_Editor::Shutdown()

‎Nostalgia/core/uid.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ namespace UID
1313
inline ID
1414
// Textures
1515
t_Missing,
16-
t_LightDebug,
1716
t_COMP04_5,
1817
t_LolBit,
1918
t_ShittySkybox,

‎Nostalgia/embedded/images/LightDebug.jpg‎

-3.6 KB
Binary file not shown.

‎Nostalgia/managers/resource_manager.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ bool ResourceManager::Init()
8686
UID::t_Missing =
8787
ResourceDatabase::Register(ImageTexture::CreateFromImage(Image::CreateFromFile(
8888
{Images::Missing, std::size(Images::Missing)})), "MissingImage");
89-
UID::t_LightDebug =
90-
ResourceDatabase::Register(ImageTexture::CreateFromImage(Image::CreateFromFile(
91-
{Images::LightDebug, std::size(Images::LightDebug)})), "LightImage");
9289
UID::t_COMP04_5 =
9390
ResourceDatabase::Register(ImageTexture::CreateFromImage(Image::CreateFromFile(
9491
{Images::COMP04_5, std::size(Images::COMP04_5)})), "DoomImage");

0 commit comments

Comments
 (0)