-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop/premake' of https://github.com/Rythe-Interactiv…
…e/Rythe-Engine into develop/premake
- Loading branch information
Showing
21 changed files
with
100 additions
and
176 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -131,3 +131,6 @@ docs/venv | |
| *.sln | ||
| *.vcxproj | ||
| *.filters | ||
| build/.cmake | ||
| build/CMakeFiles | ||
| build/CMakeCache.txt | ||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
applications/sandbox/src/sandbox/engine/resources/rythe/Icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
File renamed without changes.
Binary file added
BIN
+2.33 MB
applications/sandbox/src/sandbox/engine/tools/lgnspre/lgncleancache.exe
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,109 +1,27 @@ | ||
| //#define RYTHE_ENTRY | ||
| //#define RYTHE_LOG_DEBUG | ||
|
|
||
| //#if defined(NDEBUG) | ||
| // #define RYTHE_KEEP_CONSOLE | ||
| //#endif | ||
| //#include <core/core.hpp> | ||
| //#include <application/application.hpp> | ||
| //#include <graphics/graphics.hpp> | ||
| //#include "module/examplemodule.hpp" | ||
| // | ||
| //#ifdef RYTHE_AUDIO | ||
| //#include <audio/audio.hpp> | ||
| //#endif | ||
| // | ||
| //void LEGION_CCONV reportModules(legion::Engine* engine) | ||
| //{ | ||
| // using namespace legion; | ||
| // engine->reportModule<app::ApplicationModule>(); | ||
| // engine->reportModule<gfx::RenderingModule>(); | ||
| // engine->reportModule<ExampleModule>(); | ||
| // | ||
| //#ifdef RYTHE_AUDIO | ||
| // engine->reportModule<audio::AudioModule>(); | ||
| //#endif | ||
| //} | ||
|
|
||
| //#define LEGION_ENTRY | ||
|
|
||
| #include <iostream> | ||
| #define RYTHE_ENTRY | ||
| #define RYTHE_LOG_DEBUG | ||
|
|
||
| #if defined(NDEBUG) | ||
| #define RYTHE_KEEP_CONSOLE | ||
| #endif | ||
| #include <core/core.hpp> | ||
| #include <application/application.hpp> | ||
| #include <graphics/graphics.hpp> | ||
|
|
||
| struct StartFeature : public rythe::feature { | ||
| void invoke() {} | ||
| }; | ||
|
|
||
| struct UpdateFeature : public rythe::feature { | ||
| void invoke() {} | ||
| }; | ||
|
|
||
| struct RaycastFeature : public rythe::feature { | ||
| void invoke() {} | ||
| }; | ||
|
|
||
| struct RaycastTerrainFeature : public rythe::feature { | ||
| void invoke() {} | ||
| }; | ||
|
|
||
|
|
||
| struct RenderFeature : public rythe::feature { | ||
| void invoke() {} | ||
| }; | ||
|
|
||
| class GameModule : public rythe::module<rythe::feature_set<StartFeature, UpdateFeature, RenderFeature>> { | ||
| }; | ||
|
|
||
| class PhysicsModule : public rythe::module<rythe::feature_set<RaycastFeature, RaycastTerrainFeature>> { | ||
| }; | ||
|
|
||
| class Game : public rythe::program<GameModule, PhysicsModule> { | ||
| }; | ||
|
|
||
| template<typename T> | ||
| void logType() { | ||
| std::cout << rsl::type_name<T>() << '\n'; | ||
| } | ||
|
|
||
| template<typename... Types> | ||
| void logTypeSequenceImpl(rsl::type_sequence<Types...>) { | ||
| (logType<Types>(), ...); | ||
| } | ||
|
|
||
| template<rsl::type_sequence_c Seq> | ||
| void logTypeSequence() { | ||
| logTypeSequenceImpl(Seq{}); | ||
| } | ||
|
|
||
| template<rythe::feature_set_c Seq> | ||
| void logFeatureSet() { | ||
| logTypeSequenceImpl(typename Seq::type_sequence{}); | ||
| } | ||
|
|
||
| template<typename ProgramT, rythe::feature_c feature> | ||
| void checkFeature() { | ||
| static_assert(ProgramT::template has_feature<feature>(), "Missing feature!"); | ||
| } | ||
|
|
||
| int main() { | ||
| using t = rsl::concat_sequence_t<rsl::type_sequence<StartFeature, UpdateFeature>, rsl::type_sequence<RaycastFeature, RaycastTerrainFeature, RenderFeature>>; | ||
| std::cout << "type sequence:\n"; | ||
| logTypeSequence<t>(); | ||
| #include "module/examplemodule.hpp" | ||
|
|
||
| std::cout << "\nfeature set:\n"; | ||
| logFeatureSet<Game::features>(); | ||
| #ifdef RYTHE_AUDIO | ||
| #include <audio/audio.hpp> | ||
| #endif | ||
|
|
||
| checkFeature<Game, StartFeature>(); | ||
| checkFeature<Game, UpdateFeature>(); | ||
| checkFeature<Game, RaycastFeature>(); | ||
| checkFeature<Game, RaycastTerrainFeature>(); | ||
| if constexpr (!Game::has_feature<RenderFeature>()) { | ||
| std::cout << "Game does not have \"" << rsl::type_name<RenderFeature>() << "\"\n"; | ||
| } | ||
| else { | ||
| std::cout << "Game has \"" << rsl::type_name<RenderFeature>() << "\"\n"; | ||
| } | ||
| void RYTHE_CCONV reportModules(rythe::Engine* engine) | ||
| { | ||
| using namespace rythe; | ||
| engine->reportModule<app::ApplicationModule>(); | ||
| engine->reportModule<gfx::RenderingModule>(); | ||
| engine->reportModule<ExampleModule>(); | ||
|
|
||
| return 0; | ||
| #ifdef RYTHE_AUDIO | ||
| engine->reportModule<audio::AudioModule>(); | ||
| #endif | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| //#include "gui_test.hpp" | ||
| // | ||
| //bool legion::GuiTestSystem::captured = false; | ||
| //bool legion::GuiTestSystem::isEditingText = false; | ||
| #include "gui_test.hpp" | ||
|
|
||
| bool rythe::GuiTestSystem::captured = false; | ||
| bool rythe::GuiTestSystem::isEditingText = false; |
Oops, something went wrong.