Skip to content

Commit

Permalink
Merge pull request #273 from kimkulling/feature/add_axis_to_editor
Browse files Browse the repository at this point in the history
Feature/add axis to editor
kimkulling authored Jan 31, 2025
2 parents ee955b4 + e943c40 commit feec300
Showing 31 changed files with 209 additions and 817 deletions.
9 changes: 0 additions & 9 deletions src/Editor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -52,13 +52,6 @@ set(actions_src
src/Actions/ImportAction.h
)

set( gui_src
src/Gui/UIElementsWin32.h
src/Gui/UIElementsWin32.cpp
src/Gui/UIElements.cpp
src/Gui/UIElements.h
)

set(main_src
src/OsreEdApp.cpp
src/OsreEdApp.h
@@ -70,7 +63,6 @@ set(main_src
)
SOURCE_GROUP(RenderView FILES ${renderview_src})
SOURCE_GROUP(Actions FILES ${actions_src})
source_group(Gui FILES ${gui_src})
SOURCE_GROUP(Modules\\InspectorModule FILES ${inspector_module_src} )
SOURCE_GROUP(Modules\\LogModule FILES ${log_module_src} )
SOURCE_GROUP(Modules\\EditorModule FILES ${editor_module_src} )
@@ -80,7 +72,6 @@ SOURCE_GROUP(Main\\ FILES ${main_src})

ADD_EXECUTABLE( osre_ed
${actions_src}
${gui_src}
${inspector_module_src}
${log_module_src}
${editor_module_src}
2 changes: 1 addition & 1 deletion src/Editor/src/Actions/ActionBase.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------------------------------------
The MIT License (MIT)
Copyright (c) 2015-2024 OSRE ( Open Source Render Engine ) by Kim Kulling
Copyright (c) 2015-2025 OSRE ( Open Source Render Engine ) by Kim Kulling
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
2 changes: 1 addition & 1 deletion src/Editor/src/Actions/ImportAction.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------------------------------------
The MIT License (MIT)
Copyright (c) 2015-2024 OSRE ( Open Source Render Engine ) by Kim Kulling
Copyright (c) 2015-2025 OSRE ( Open Source Render Engine ) by Kim Kulling
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
2 changes: 1 addition & 1 deletion src/Editor/src/Actions/ImportAction.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------------------------------------
The MIT License (MIT)
Copyright (c) 2015-2024 OSRE ( Open Source Render Engine ) by Kim Kulling
Copyright (c) 2015-2025 OSRE ( Open Source Render Engine ) by Kim Kulling
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
168 changes: 0 additions & 168 deletions src/Editor/src/Gui/UIElements.cpp

This file was deleted.

106 changes: 0 additions & 106 deletions src/Editor/src/Gui/UIElements.h

This file was deleted.

Loading

0 comments on commit feec300

Please sign in to comment.