Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Icon #37

Merged
merged 13 commits into from
Apr 7, 2022
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ PlatinumEngine

# imgui config
imgui.ini

**/.DS_Store
8 changes: 5 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ FetchContent_MakeAvailable(imgui)
add_subdirectory("ImGui CMake")
#-----------------------------
# ImGuiFileDialog
FetchContent_Declare(imguifiledialog GIT_REPOSITORY https://github.com/aiekick/ImGuiFileDialog.git GIT_TAG v0.6.3)
add_compile_definitions(USE_BOOKMARK)
FetchContent_Declare(imguifiledialog GIT_REPOSITORY https://github.com/aiekick/ImGuiFileDialog.git GIT_TAG v0.6.4)
FetchContent_MakeAvailable(imguifiledialog)
include_directories(${CMAKE_BINARY_DIR}/_deps/imguifiledialog-src)
#-----------------------------
Expand Down Expand Up @@ -78,7 +79,8 @@ set(PROJECT_SOURCES_WITHOUT_MAIN
"${CMAKE_BINARY_DIR}/_deps/imguifiledialog-src/ImGuiFileDialog.cpp;"

"Source/AssetDatabase/AssetDatabase.cpp;"

"Source/AssetDatabase/AssetHelper.cpp;"

"Source/ComponentComposition/CameraComponent.cpp;"
"Source/ComponentComposition/Component.cpp;"
"Source/ComponentComposition/ComponentType.cpp;"
Expand Down Expand Up @@ -127,7 +129,7 @@ set(PROJECT_SOURCES_WITHOUT_MAIN
add_executable(${PROJECT_NAME} Source/main.cpp ${PROJECT_SOURCES_WITHOUT_MAIN})


target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/Include")
target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/Include" "${CMAKE_CURRENT_LIST_DIR}/Fonts")
#-----------------------------


Expand Down
237 changes: 237 additions & 0 deletions Fonts/IconsKenney.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,237 @@
// Generated by https://github.com/juliettef/IconFontCppHeaders script GenerateIconFontCppHeaders.py for languages C and C++
// from https://github.com/nicodinh/kenney-icon-font/raw/master/css/kenney-icons.css
// for use with https://github.com/nicodinh/kenney-icon-font/blob/master/fonts/kenney-icon-font.ttf
#pragma once

#define FONT_ICON_FILE_NAME_KI "./Fonts/kenney-icon-font.ttf"

#define ICON_MIN_KI 0xe900
#define ICON_MAX_KI 0xe9e3
#define ICON_KI_HOME "\xee\xa4\x80" // U+e900
#define ICON_KI_ADJUST "\xee\xa4\x81" // U+e901
#define ICON_KI_WRENCH "\xee\xa4\x82" // U+e902
#define ICON_KI_COG "\xee\xa4\x83" // U+e903
#define ICON_KI_OFF "\xee\xa4\x84" // U+e904
#define ICON_KI_EXPAND "\xee\xa4\x85" // U+e905
#define ICON_KI_REDUCE "\xee\xa4\x86" // U+e906
#define ICON_KI_MOVIE "\xee\xa4\x87" // U+e907
#define ICON_KI_FLAP "\xee\xa4\x88" // U+e908
#define ICON_KI_SHOPPING_CART "\xee\xa4\x89" // U+e909
#define ICON_KI_SHOPPING_CASE "\xee\xa4\x8a" // U+e90a
#define ICON_KI_EXTERNAL "\xee\xa4\x8b" // U+e90b
#define ICON_KI_NETWORK "\xee\xa4\x8c" // U+e90c
#define ICON_KI_CHECK "\xee\xa4\x8d" // U+e90d
#define ICON_KI_TIMES "\xee\xa4\x8e" // U+e90e
#define ICON_KI_TIMES_CIRCLE "\xee\xa4\x8f" // U+e90f
#define ICON_KI_PLUS "\xee\xa4\x90" // U+e910
#define ICON_KI_PLUS_CIRCLE "\xee\xa4\x91" // U+e911
#define ICON_KI_MINUS "\xee\xa4\x92" // U+e912
#define ICON_KI_MINUS_CIRCLE "\xee\xa4\x93" // U+e913
#define ICON_KI_INFO "\xee\xa4\x94" // U+e914
#define ICON_KI_INFO_CIRCLE "\xee\xa4\x95" // U+e915
#define ICON_KI_QUESTION "\xee\xa4\x96" // U+e916
#define ICON_KI_QUESTION_CIRCLE "\xee\xa4\x97" // U+e917
#define ICON_KI_EXLAMATION "\xee\xa4\x98" // U+e918
#define ICON_KI_EXCLAMATION_CIRCLE "\xee\xa4\x99" // U+e919
#define ICON_KI_EXCLAMATION_TRIANGLE "\xee\xa4\x9a" // U+e91a
#define ICON_KI_PAINT_BRUSH "\xee\xa4\x9b" // U+e91b
#define ICON_KI_PENCIL "\xee\xa4\x9c" // U+e91c
#define ICON_KI_CHECKBOX "\xee\xa4\x9d" // U+e91d
#define ICON_KI_CHECKBOX_CHECKED "\xee\xa4\x9e" // U+e91e
#define ICON_KI_RADIO "\xee\xa4\x9f" // U+e91f
#define ICON_KI_RADIO_CHECKED "\xee\xa4\xa0" // U+e920
#define ICON_KI_SORT_VERTICAL "\xee\xa4\xa1" // U+e921
#define ICON_KI_SORT_HORIZONTAL "\xee\xa4\xa2" // U+e922
#define ICON_KI_GRID "\xee\xa4\xa3" // U+e923
#define ICON_KI_LIST "\xee\xa4\xa4" // U+e924
#define ICON_KI_ROWS "\xee\xa4\xa5" // U+e925
#define ICON_KI_CELLS "\xee\xa4\xa6" // U+e926
#define ICON_KI_SIGNAL_LOW "\xee\xa4\xa7" // U+e927
#define ICON_KI_SIGNAL_MEDIUM "\xee\xa4\xa8" // U+e928
#define ICON_KI_SIGNAL_HIGH "\xee\xa4\xa9" // U+e929
#define ICON_KI_TRASH "\xee\xa4\xaa" // U+e92a
#define ICON_KI_TRASH_ALT "\xee\xa4\xab" // U+e92b
#define ICON_KI_RELOAD_INVERSE "\xee\xa4\xac" // U+e92c
#define ICON_KI_RELOAD "\xee\xa4\xad" // U+e92d
#define ICON_KI_TOP "\xee\xa4\xae" // U+e92e
#define ICON_KI_BOTTOM "\xee\xa4\xaf" // U+e92f
#define ICON_KI_UPLOAD "\xee\xa4\xb0" // U+e930
#define ICON_KI_DOWNLOAD "\xee\xa4\xb1" // U+e931
#define ICON_KI_CLOUD "\xee\xa4\xb2" // U+e932
#define ICON_KI_CLOUD_UPLOAD "\xee\xa4\xb3" // U+e933
#define ICON_KI_CLOUD_DOWNLOAD "\xee\xa4\xb4" // U+e934
#define ICON_KI_SEARCH "\xee\xa4\xb5" // U+e935
#define ICON_KI_SEARCH_PLUS "\xee\xa4\xb6" // U+e936
#define ICON_KI_SEARCH_MINUS "\xee\xa4\xb7" // U+e937
#define ICON_KI_SEARCH_EQUAL "\xee\xa4\xb8" // U+e938
#define ICON_KI_LOCK "\xee\xa4\xb9" // U+e939
#define ICON_KI_UNLOCK "\xee\xa4\xba" // U+e93a
#define ICON_KI_USER "\xee\xa4\xbb" // U+e93b
#define ICON_KI_USERS "\xee\xa4\xbc" // U+e93c
#define ICON_KI_USERS_ALT "\xee\xa4\xbd" // U+e93d
#define ICON_KI_SIGN_IN "\xee\xa4\xbe" // U+e93e
#define ICON_KI_SIGN_IN_INVERSE "\xee\xa4\xbf" // U+e93f
#define ICON_KI_SIGN_OUT "\xee\xa5\x80" // U+e940
#define ICON_KI_SIGN_OUT_INVERSE "\xee\xa5\x81" // U+e941
#define ICON_KI_ARROW_TOP "\xee\xa5\x82" // U+e942
#define ICON_KI_ARROW_RIGHT "\xee\xa5\x83" // U+e943
#define ICON_KI_ARROW_BOTTOM "\xee\xa5\x84" // U+e944
#define ICON_KI_ARROW_LEFT "\xee\xa5\x85" // U+e945
#define ICON_KI_ARROW_TOP_LEFT "\xee\xa5\x86" // U+e946
#define ICON_KI_ARROW_TOP_RIGHT "\xee\xa5\x87" // U+e947
#define ICON_KI_ARROW_BOTTOM_RIGHT "\xee\xa5\x88" // U+e948
#define ICON_KI_ARROW_BOTTOM_LEFT "\xee\xa5\x89" // U+e949
#define ICON_KI_CARET_TOP "\xee\xa5\x8a" // U+e94a
#define ICON_KI_CARET_RIGHT "\xee\xa5\x8b" // U+e94b
#define ICON_KI_CARET_BOTTOM "\xee\xa5\x8c" // U+e94c
#define ICON_KI_CARET_LEFT "\xee\xa5\x8d" // U+e94d
#define ICON_KI_NEXT_ALT "\xee\xa5\x8e" // U+e94e
#define ICON_KI_NEXT "\xee\xa5\x8f" // U+e94f
#define ICON_KI_PREVIOUS "\xee\xa5\x90" // U+e950
#define ICON_KI_PREVIOUS_ALT "\xee\xa5\x91" // U+e951
#define ICON_KI_FILL "\xee\xa5\x92" // U+e952
#define ICON_KI_ERASER "\xee\xa5\x93" // U+e953
#define ICON_KI_SAVE "\xee\xa5\x94" // U+e954
#define ICON_KI_STEP_BACKWARD "\xee\xa5\x95" // U+e955
#define ICON_KI_BACKWARD "\xee\xa5\x96" // U+e956
#define ICON_KI_PAUSE "\xee\xa5\x97" // U+e957
#define ICON_KI_FORWARD "\xee\xa5\x98" // U+e958
#define ICON_KI_STEP_FORWARD "\xee\xa5\x99" // U+e959
#define ICON_KI_STOP "\xee\xa5\x9a" // U+e95a
#define ICON_KI_REC "\xee\xa5\x9b" // U+e95b
#define ICON_KI_CURSOR "\xee\xa5\x9c" // U+e95c
#define ICON_KI_POINTER "\xee\xa5\x9d" // U+e95d
#define ICON_KI_EXIT "\xee\xa5\x9e" // U+e95e
#define ICON_KI_FIGURE "\xee\xa5\x9f" // U+e95f
#define ICON_KI_CAR "\xee\xa5\xa0" // U+e960
#define ICON_KI_COIN "\xee\xa5\xa1" // U+e961
#define ICON_KI_KEY "\xee\xa5\xa2" // U+e962
#define ICON_KI_CUB "\xee\xa5\xa3" // U+e963
#define ICON_KI_DIAMOND "\xee\xa5\xa4" // U+e964
#define ICON_KI_BADGE "\xee\xa5\xa5" // U+e965
#define ICON_KI_BADGE_ALT "\xee\xa5\xa6" // U+e966
#define ICON_KI_PODIUM "\xee\xa5\xa7" // U+e967
#define ICON_KI_PODIUM_ALT "\xee\xa5\xa8" // U+e968
#define ICON_KI_FLAG "\xee\xa5\xa9" // U+e969
#define ICON_KI_FIST "\xee\xa5\xaa" // U+e96a
#define ICON_KI_FIST_CIRCLE "\xee\xa5\xab" // U+e96b
#define ICON_KI_HEART "\xee\xa5\xac" // U+e96c
#define ICON_KI_HEART_HALF "\xee\xa5\xad" // U+e96d
#define ICON_KI_HEART_HALF_O "\xee\xa5\xae" // U+e96e
#define ICON_KI_HEART_O "\xee\xa5\xaf" // U+e96f
#define ICON_KI_STAR "\xee\xa5\xb0" // U+e970
#define ICON_KI_STAR_HALF "\xee\xa5\xb1" // U+e971
#define ICON_KI_STAR_HALF_O "\xee\xa5\xb2" // U+e972
#define ICON_KI_STAR_O "\xee\xa5\xb3" // U+e973
#define ICON_KI_BUTTON_B "\xee\xa5\xb4" // U+e974
#define ICON_KI_MUSIC_ON "\xee\xa5\xb5" // U+e975
#define ICON_KI_MUSIC_OFF "\xee\xa5\xb6" // U+e976
#define ICON_KI_SOUND_ON "\xee\xa5\xb7" // U+e977
#define ICON_KI_SOUND_OFF "\xee\xa5\xb8" // U+e978
#define ICON_KI_SOUND_OFF_ALT "\xee\xa5\xb9" // U+e979
#define ICON_KI_ROBOT "\xee\xa5\xba" // U+e97a
#define ICON_KI_COMPUTER "\xee\xa5\xbb" // U+e97b
#define ICON_KI_TABLET "\xee\xa5\xbc" // U+e97c
#define ICON_KI_SMARTPHONE "\xee\xa5\xbd" // U+e97d
#define ICON_KI_DEVICE "\xee\xa5\xbe" // U+e97e
#define ICON_KI_DEVICE_TILT_LEFT "\xee\xa5\xbf" // U+e97f
#define ICON_KI_DEVICE_TILT_RIGHT "\xee\xa6\x80" // U+e980
#define ICON_KI_GAMEPAD "\xee\xa6\x81" // U+e981
#define ICON_KI_GAMEPAD_ALT "\xee\xa6\x82" // U+e982
#define ICON_KI_GAMEPAD_TILT_LEFT "\xee\xa6\x83" // U+e983
#define ICON_KI_GAMEPAD_TILT_RIGHT "\xee\xa6\x84" // U+e984
#define ICON_KI_PLAYER_ONE "\xee\xa6\x85" // U+e985
#define ICON_KI_PLAYER_TWO "\xee\xa6\x86" // U+e986
#define ICON_KI_PLAYER_THREE "\xee\xa6\x87" // U+e987
#define ICON_KI_PLAYER_FOUR "\xee\xa6\x88" // U+e988
#define ICON_KI_JOYSTICK "\xee\xa6\x89" // U+e989
#define ICON_KI_JOYSTICK_ALT "\xee\xa6\x8a" // U+e98a
#define ICON_KI_JOYSTICK_LEFT "\xee\xa6\x8b" // U+e98b
#define ICON_KI_JOYSTICK_RIGHT "\xee\xa6\x8c" // U+e98c
#define ICON_KI_MOUSE_ALT "\xee\xa6\x8d" // U+e98d
#define ICON_KI_MOUSE "\xee\xa6\x8e" // U+e98e
#define ICON_KI_MOUSE_LEFT_BUTTON "\xee\xa6\x8f" // U+e98f
#define ICON_KI_MOUSE_RIGHT_BUTTON "\xee\xa6\x90" // U+e990
#define ICON_KI_BUTTON_ONE "\xee\xa6\x91" // U+e991
#define ICON_KI_BUTTON_TWO "\xee\xa6\x92" // U+e992
#define ICON_KI_BUTTON_THREE "\xee\xa6\x93" // U+e993
#define ICON_KI_BUTTON_A "\xee\xa6\x94" // U+e994
#define ICON_KI_BUTTON_X "\xee\xa6\x95" // U+e995
#define ICON_KI_BUTON_Y "\xee\xa6\x96" // U+e996
#define ICON_KI_BUTTON_TIMES "\xee\xa6\x97" // U+e997
#define ICON_KI_BUTTON_SQUARE "\xee\xa6\x98" // U+e998
#define ICON_KI_BUTTON_CIRCLE "\xee\xa6\x99" // U+e999
#define ICON_KI_BUTTON_TRIANGLE "\xee\xa6\x9a" // U+e99a
#define ICON_KI_BUTTON_LEFT "\xee\xa6\x9b" // U+e99b
#define ICON_KI_BUTTON_L "\xee\xa6\x9c" // U+e99c
#define ICON_KI_BUTTON_L1 "\xee\xa6\x9d" // U+e99d
#define ICON_KI_BUTTON_L2 "\xee\xa6\x9e" // U+e99e
#define ICON_KI_BUTTON_LB "\xee\xa6\x9f" // U+e99f
#define ICON_KI_BUTTON_LT "\xee\xa6\xa0" // U+e9a0
#define ICON_KI_BUTTON_RT "\xee\xa6\xa1" // U+e9a1
#define ICON_KI_BUTTON_RB "\xee\xa6\xa2" // U+e9a2
#define ICON_KI_BUTTON_R2 "\xee\xa6\xa3" // U+e9a3
#define ICON_KI_BUTTON_R1 "\xee\xa6\xa4" // U+e9a4
#define ICON_KI_BUTTON_R "\xee\xa6\xa5" // U+e9a5
#define ICON_KI_BUTTON_RIGHT "\xee\xa6\xa6" // U+e9a6
#define ICON_KI_BUTTON_EMPTY "\xee\xa6\xa7" // U+e9a7
#define ICON_KI_BUTTON_START "\xee\xa6\xa8" // U+e9a8
#define ICON_KI_BUTTON_SELECT "\xee\xa6\xa9" // U+e9a9
#define ICON_KI_DPAD "\xee\xa6\xaa" // U+e9aa
#define ICON_KI_DPAD_ALT "\xee\xa6\xab" // U+e9ab
#define ICON_KI_DPAD_TOP "\xee\xa6\xac" // U+e9ac
#define ICON_KI_DPAD_RIGHT "\xee\xa6\xad" // U+e9ad
#define ICON_KI_DPAD_BOTTOM "\xee\xa6\xae" // U+e9ae
#define ICON_KI_DPAD_LEFT "\xee\xa6\xaf" // U+e9af
#define ICON_KI_KEY_LARGE "\xee\xa6\xb0" // U+e9b0
#define ICON_KI_KEY_LARGE_3D "\xee\xa6\xb1" // U+e9b1
#define ICON_KI_KEY_SMALL "\xee\xa6\xb2" // U+e9b2
#define ICON_KI_KEY_SMALL_3D "\xee\xa6\xb3" // U+e9b3
#define ICON_KI_STICK_LEFT_TOP "\xee\xa6\xb4" // U+e9b4
#define ICON_KI_STICK_LEFT_SIDE "\xee\xa6\xb5" // U+e9b5
#define ICON_KI_STICK_RIGHT_SIDE "\xee\xa6\xb6" // U+e9b6
#define ICON_KI_STICK_RIGHT_TOP "\xee\xa6\xb7" // U+e9b7
#define ICON_KI_STICK_SIDE "\xee\xa6\xb8" // U+e9b8
#define ICON_KI_STICK_TILT_LEFT "\xee\xa6\xb9" // U+e9b9
#define ICON_KI_STICK_TILT_RIGHT "\xee\xa6\xba" // U+e9ba
#define ICON_KI_MOVE_BL "\xee\xa6\xbb" // U+e9bb
#define ICON_KI_MOVE_BR "\xee\xa6\xbc" // U+e9bc
#define ICON_KI_MOVE_BT "\xee\xa6\xbd" // U+e9bd
#define ICON_KI_MOVE_BT_ALT "\xee\xa6\xbe" // U+e9be
#define ICON_KI_MOVE_LB "\xee\xa6\xbf" // U+e9bf
#define ICON_KI_MOVE_LR "\xee\xa7\x80" // U+e9c0
#define ICON_KI_MOVE_LR_ALT "\xee\xa7\x81" // U+e9c1
#define ICON_KI_MOVE_LT "\xee\xa7\x82" // U+e9c2
#define ICON_KI_MOVE_RB "\xee\xa7\x83" // U+e9c3
#define ICON_KI_MOVE_RL "\xee\xa7\x84" // U+e9c4
#define ICON_KI_MOVE_RL_ALT "\xee\xa7\x85" // U+e9c5
#define ICON_KI_MOVE_RT "\xee\xa7\x86" // U+e9c6
#define ICON_KI_MOVE_TB "\xee\xa7\x87" // U+e9c7
#define ICON_KI_MOVE_TB_ALT "\xee\xa7\x88" // U+e9c8
#define ICON_KI_MOVE_TL "\xee\xa7\x89" // U+e9c9
#define ICON_KI_MOVE_TR "\xee\xa7\x8a" // U+e9ca
#define ICON_KI_STICK_MOVE_BL "\xee\xa7\x8b" // U+e9cb
#define ICON_KI_STICK_MOVE_BR "\xee\xa7\x8c" // U+e9cc
#define ICON_KI_STICK_MOVE_BT "\xee\xa7\x8d" // U+e9cd
#define ICON_KI_STICK_MOVE_BT_ALT "\xee\xa7\x8e" // U+e9ce
#define ICON_KI_STICK_MOVE_LB "\xee\xa7\x8f" // U+e9cf
#define ICON_KI_STICK_MOVE_LR "\xee\xa7\x90" // U+e9d0
#define ICON_KI_STICK_MOVE_LR_ALT "\xee\xa7\x91" // U+e9d1
#define ICON_KI_STICK_MOVE_LT "\xee\xa7\x92" // U+e9d2
#define ICON_KI_STICK_MOVE_RB "\xee\xa7\x93" // U+e9d3
#define ICON_KI_STICK_MOVE_RL "\xee\xa7\x94" // U+e9d4
#define ICON_KI_STICK_MOVE_RL_ALT "\xee\xa7\x95" // U+e9d5
#define ICON_KI_STICK_MOVE_RT "\xee\xa7\x96" // U+e9d6
#define ICON_KI_STICK_MOVE_TB "\xee\xa7\x97" // U+e9d7
#define ICON_KI_STICK_MOVE_TB_ALT "\xee\xa7\x98" // U+e9d8
#define ICON_KI_STICK_MOVE_TL "\xee\xa7\x99" // U+e9d9
#define ICON_KI_STICK_MOVE_TR "\xee\xa7\x9a" // U+e9da
#define ICON_KI_GITHUB "\xee\xa7\x9b" // U+e9db
#define ICON_KI_GITHUB_ALT "\xee\xa7\x9c" // U+e9dc
#define ICON_KI_TWITTER "\xee\xa7\x9d" // U+e9dd
#define ICON_KI_FACEBOOK "\xee\xa7\x9e" // U+e9de
#define ICON_KI_GOOGLE_PLUS "\xee\xa7\x9f" // U+e9df
#define ICON_KI_YOUTUBE "\xee\xa7\xa2" // U+e9e2
#define ICON_KI_WE_HEART "\xee\xa7\xa3" // U+e9e3
#define ICON_KI_WOLFCMS "\xee\xa7\xa0" // U+e9e0
#define ICON_KI_WOLFCMS_ALT "\xee\xa7\xa1" // U+e9e1
Binary file added Fonts/NotoSansDisplay-Regular.ttf
Binary file not shown.
Binary file added Fonts/kenney-icon-font.ttf
Binary file not shown.
29 changes: 29 additions & 0 deletions Include/AssetDatabase/AssetHelper.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//
// Created by Shawn on 2022/4/5.
//
#pragma once

#include <OpenGL/Mesh.h>
#include <AssetDatabase/AssetDatabase.h>
#include <imgui.h>
#include <IconsKenney.h>
#include <tuple>

namespace PlatinumEngine
{
class AssetHelper
{
public:
AssetHelper(AssetDatabase* assetDatabase);
~AssetHelper();
/**
* Responsible for the pop up window opened by
* the render component in Inspector Window
*/
std::tuple<bool, Mesh*, std::string> ShowGuiWindow();

std::string GetFilePath();
private:
AssetDatabase* _assetDatabase;
};
}
8 changes: 4 additions & 4 deletions Include/ComponentComposition/RenderComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
#include "Component.h"
#include "Renderer/Renderer.h"
#include "Loaders/MeshLoader.h"
#include <AssetDatabase/AssetHelper.h>

namespace PlatinumEngine
{
class RenderComponent: public Component
{
public:
RenderComponent();
~RenderComponent();
RenderComponent(Mesh &mesh);

// update mesh from mesh loader
void LoadMesh(const std::string &filePath);
void SetMesh(Mesh* mesh);

// return mesh
Mesh& GetMesh();
Expand All @@ -26,7 +26,7 @@ namespace PlatinumEngine
void OnRender(Scene& scene, Renderer &render) override;

private:
Mesh _mesh;
Mesh* _mesh;
ShaderInput _shaderInput;
};
}
5 changes: 3 additions & 2 deletions Include/Inspector/InspectorWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@

#pragma once

#include <imgui.h>
#include "WindowManager/Filedialog.h"
#include <ComponentComposition/Component.h>
#include <ComponentComposition/RenderComponent.h>
#include <ComponentComposition/TransformComponent.h>
#include <ComponentComposition/GameObject.h>
#include <SceneManager/SceneManager.h>


namespace PlatinumEngine
{
class InspectorWindow
{
public:
InspectorWindow() = default;
InspectorWindow(AssetHelper* assetHelper);
void ShowGUIWindow(bool* isOpen, Scene& scene);
void SetActiveGameObject(GameObject* gameObject);
private:
Expand All @@ -28,6 +28,7 @@ namespace PlatinumEngine
// Shown when add component button pressed
void ShowAddComponent(Scene& scene);
private:
AssetHelper* _assetHelper;
GameObject* _activeGameObject = nullptr;
std::string _meshFileName;
bool _isAddComponentWindowOpen = false;
Expand Down
1 change: 0 additions & 1 deletion Include/Logger/Logger.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include <vector>
#include <string>
#include <sstream>

namespace PlatinumEngine
{

Expand Down
2 changes: 1 addition & 1 deletion Include/SceneEditor/SceneEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <SceneManager/Scene.h>
#include <OpenGL/Framebuffer.h>
#include <InputManager/InputManager.h>

#include <IconsKenney.h>
namespace PlatinumEngine
{
class SceneEditor
Expand Down
2 changes: 1 addition & 1 deletion Include/SceneManager/HierarchyWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <SceneManager/Scene.h>
#include <Logger/Logger.h>
#include <algorithm>

#include <IconsKenney.h>
namespace PlatinumEngine
{
class HierarchyWindow
Expand Down
Loading