CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finished DataModel refactor

Browse Source
This commit is contained in:
Vulpovile
2021-03-04 22:50:11 -08:00
parent 299e22cf92
commit e044b606c1
7 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
G3DTest.vcproj
View File

@@ -144,7 +144,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;C:\Users\Andreja\Documents\C++\G3D-Fun\src\include\DataModel&quot;;&quot;C:\Users\Andreja\Documents\C++\G3D-Fun\src\include&quot;" AdditionalIncludeDirectories="&quot;C:\Users\Andreja\Documents\C++\G3D-Fun\src\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="false" MinimalRebuild="false"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"

2
src/include/Listener/ButtonListener.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
//#include "Application.h" //#include "Application.h"
#include "BaseButtonInstance.h" #include "DataModel/BaseButtonInstance.h"
class BaseButtonInstance; class BaseButtonInstance;

5
src/source/DataModel/PVInstance.cpp
View File

@@ -42,6 +42,7 @@ static TCHAR* enumStr(int controller)
case Enum::Controller::Flee: case Enum::Controller::Flee:
return "Joypad2"; return "Joypad2";
} }
return "None";
} }
static Enum::Controller::Value strEnum(TCHAR * tval) static Enum::Controller::Value strEnum(TCHAR * tval)
@@ -93,11 +94,11 @@ void PVInstance::PropUpdate(LPPROPGRIDITEM &pItem)
{ {
if(strcmp(pItem->lpszPropName, "NameShown") == 0) if(strcmp(pItem->lpszPropName, "NameShown") == 0)
{ {
nameShown = (bool)pItem->lpCurValue; nameShown = pItem->lpCurValue == TRUE;
} }
if(strcmp(pItem->lpszPropName, "ControllerFlagShown") == 0) if(strcmp(pItem->lpszPropName, "ControllerFlagShown") == 0)
{ {
controllerFlagShown = (bool)pItem->lpCurValue; controllerFlagShown = pItem->lpCurValue == TRUE;
} }
if(strcmp(pItem->lpszPropName, "Controller") == 0) if(strcmp(pItem->lpszPropName, "Controller") == 0)
{ {

2
src/source/Listener/ButtonListener.cpp
View File

@@ -1,4 +1,4 @@
#include "BaseButtonInstance.h" #include "DataModel/BaseButtonInstance.h"
#include "Listener/ButtonListener.h" #include "Listener/ButtonListener.h"

2
src/source/Listener/MenuButtonListener.cpp
View File

@@ -1,5 +1,5 @@
#include "Listener/MenuButtonListener.h" #include "Listener/MenuButtonListener.h"
#include "toggleimagebuttoninstance.h" #include "DataModel/ToggleImageButtonInstance.h"
#include "Globals.h" #include "Globals.h"
void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button) void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button)
{ {

2
src/source/Listener/ModeSelectionListener.cpp
View File

@@ -1,5 +1,5 @@
#include "Globals.h" #include "Globals.h"
#include "Instance.h" #include "DataModel/Instance.h"
#include "Listener/ModeSelectionListener.h" #include "Listener/ModeSelectionListener.h"
#include "Application.h" #include "Application.h"
#include "Tool/ArrowTool.h" #include "Tool/ArrowTool.h"

2
src/source/Listener/RotateButtonListener.cpp
View File

@@ -1,4 +1,4 @@
#include "BaseButtonInstance.h" #include "DataModel/BaseButtonInstance.h"
#include "Listener/RotateButtonListener.h" #include "Listener/RotateButtonListener.h"
#include "Globals.h" #include "Globals.h"
#include "AudioPlayer.h" #include "AudioPlayer.h"