benkyd/Aeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

well that was an oversight

Browse Source
This commit is contained in:
Ben
2021-11-12 19:57:20 +00:00
parent d69b6af375
commit fc1e5200dd
5 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aeon/Aeon.cpp
View File

@@ -15,7 +15,7 @@ App::App( const AppProperties& props, const DisplayProperties& dispProps )
: mDisplay()
, mInput()
{
RegisterAsSink( "ENGINE_DISPLAY_CORE", 0 );
PushThisAsSink( "ENGINE_DISPLAY_CORE" );
mDisplay.Create( dispProps );
}

2
Aeon/Core/Display.cpp
View File

@@ -12,7 +12,7 @@ Display::Display()
, mContext( NULL )
, mClearColour{ 1.0f, 1.0f, 1.0f, 1.0f }
{
RegisterAsSink( "ENGINE_DISPLAY_CORE", 0 );
PushThisAsSink( "ENGINE_DISPLAY_CORE" );
}
Display::~Display()

7
Aeon/Core/Events.cpp
View File

@@ -122,7 +122,7 @@ int EventManager::RegisterSinkPush( EventListener* sink, std::string system )
{
std::vector<std::tuple<EventListener*, int>> v;
mSinks.insert( { system, v } );
return;
return -1;
}
auto& sinkVector = mSinks[system];
@@ -141,7 +141,7 @@ int EventManager::RegisterSinkPushStick( EventListener* sink, std::string system
{
std::vector<std::tuple<EventListener*, int>> v;
mStickySinks.insert( { system, v } );
return;
return -1;
}
auto& sinkVector = mStickySinks[system];
@@ -158,8 +158,7 @@ int EventManager::RegisterSinkUnshift( EventListener* sink, std::string system )
if ( !mSinks.count( system ) )
{
RegisterSinkPush( sink, system );
return;
return RegisterSinkPush( sink, system );
}
auto& sinkVector = mSinks[system];

2
CMakeLists.txt
View File

@@ -5,7 +5,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
set(THREADS_PREFER_PTHREAD_FLAD ON)
find_package(Threads REQUIRED)

50
CMakeSettings.json
View File

@@ -1,26 +1,26 @@
{
"configurations": [
{
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "-v",
"ctestCommandArgs": ""
},
{
"name": "x64-Release",
"generator": "Ninja",
"configurationType": "RelWithDebInfo",
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "-v",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ]
}
]
{
"configurations": [
{
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "-DSDL2_PATH=\"C:/Users/benja/Programming/lib/SDL2-2.0.16/\"",
"buildCommandArgs": "-v",
"ctestCommandArgs": ""
},
{
"name": "x64-Release",
"generator": "Ninja",
"configurationType": "RelWithDebInfo",
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "-DSDL2_DIR=\"C:/Users/benja/Programming/lib/SDL2-2.0.16/\"",
"buildCommandArgs": "-v",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ]
}
]
}