Merge pull request #135 from Vulpovile/bugfix/vs2003_stack_obliteration
Visual Studio 2003 stack clobbering workaround
This commit is contained in:
@@ -21,7 +21,7 @@
|
|||||||
CharacterSet="2">
|
CharacterSet="2">
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
Optimization="0"
|
Optimization="3"
|
||||||
InlineFunctionExpansion="2"
|
InlineFunctionExpansion="2"
|
||||||
EnableIntrinsicFunctions="TRUE"
|
EnableIntrinsicFunctions="TRUE"
|
||||||
FavorSizeOrSpeed="1"
|
FavorSizeOrSpeed="1"
|
||||||
@@ -480,15 +480,6 @@
|
|||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="Properties">
|
|
||||||
<File
|
|
||||||
RelativePath=".\src\source\Properties\BoolProperty.cpp">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath=".\src\source\Properties\Property.cpp">
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
<Filter
|
<Filter
|
||||||
Name="Helpers">
|
Name="Helpers">
|
||||||
<File
|
<File
|
||||||
@@ -694,15 +685,6 @@
|
|||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="Properties">
|
|
||||||
<File
|
|
||||||
RelativePath=".\src\include\Properties\BoolProperty.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath=".\src\include\Properties\Property.h">
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
<Filter
|
<Filter
|
||||||
Name="Helpers">
|
Name="Helpers">
|
||||||
<File
|
<File
|
||||||
|
|||||||
@@ -675,18 +675,6 @@
|
|||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="Properties"
|
|
||||||
>
|
|
||||||
<File
|
|
||||||
RelativePath=".\src\source\Properties\BoolProperty.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath=".\src\source\Properties\Property.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
<Filter
|
<Filter
|
||||||
Name="Helpers"
|
Name="Helpers"
|
||||||
>
|
>
|
||||||
@@ -960,18 +948,6 @@
|
|||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="Properties"
|
|
||||||
>
|
|
||||||
<File
|
|
||||||
RelativePath=".\src\include\Properties\BoolProperty.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath=".\src\include\Properties\Property.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
<Filter
|
<Filter
|
||||||
Name="Helpers"
|
Name="Helpers"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
|||||||
VALUE "FileDescription", "Blocks 3D"
|
VALUE "FileDescription", "Blocks 3D"
|
||||||
VALUE "FileVersion", VER_STR(APP_VER_STRING)
|
VALUE "FileVersion", VER_STR(APP_VER_STRING)
|
||||||
VALUE "InternalName", "Blocks3D"
|
VALUE "InternalName", "Blocks3D"
|
||||||
VALUE "LegalCopyright", "Blocks3D Team - 2022"
|
VALUE "LegalCopyright", "Blocks3D Team 2018-2023"
|
||||||
VALUE "LegalTrademarks", ""
|
VALUE "LegalTrademarks", ""
|
||||||
VALUE "OriginalFilename", "Blocks3D.exe"
|
VALUE "OriginalFilename", "Blocks3D.exe"
|
||||||
VALUE "PrivateBuild", ""
|
VALUE "PrivateBuild", ""
|
||||||
|
|||||||
BIN
Installer/Redist/msvcp71.dll
Normal file
BIN
Installer/Redist/msvcp71.dll
Normal file
Binary file not shown.
BIN
Installer/Redist/msvcr71.dll
Normal file
BIN
Installer/Redist/msvcr71.dll
Normal file
Binary file not shown.
@@ -1,4 +1,5 @@
|
|||||||
;InnoSetupVersion=5.4.3
|
;InnoSetupVersion=5.4.3
|
||||||
|
;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2005!!!
|
||||||
#define AppVer GetFileVersion('..\Blocks3D.exe')
|
#define AppVer GetFileVersion('..\Blocks3D.exe')
|
||||||
|
|
||||||
[Setup]
|
[Setup]
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
;InnoSetupVersion=5.4.3
|
;InnoSetupVersion=5.4.3
|
||||||
|
;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2005!!!
|
||||||
#define AppVer GetFileVersion('..\Blocks3D.exe')
|
#define AppVer GetFileVersion('..\Blocks3D.exe')
|
||||||
|
|
||||||
[Setup]
|
[Setup]
|
||||||
|
|||||||
48
Installer/install_script_floppy_vs2003.iss
Normal file
48
Installer/install_script_floppy_vs2003.iss
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
;InnoSetupVersion=5.4.3
|
||||||
|
;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2003!!!
|
||||||
|
#define AppVer GetFileVersion('..\Blocks3D.exe')
|
||||||
|
|
||||||
|
[Setup]
|
||||||
|
AppName=Blocks3D
|
||||||
|
AppVersion=v{#AppVer}
|
||||||
|
AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
|
||||||
|
AppPublisherURL=http://blocks3d.com/
|
||||||
|
AppSupportURL=http://blocks3d.com/
|
||||||
|
AppUpdatesURL=http://blocks3d.com/
|
||||||
|
DefaultDirName={%localappdata}\Blocks3D
|
||||||
|
OutputBaseFilename=B3DSTP
|
||||||
|
Compression=lzma2
|
||||||
|
PrivilegesRequired=lowest
|
||||||
|
WizardImageFile=setup.bmp
|
||||||
|
DefaultGroupName=Blocks3D
|
||||||
|
DiskSpanning=yes
|
||||||
|
SlicesPerDisk=1
|
||||||
|
DiskSliceSize=1457664
|
||||||
|
|
||||||
|
|
||||||
|
[UninstallDelete]
|
||||||
|
Type: filesandordirs; Name: "{app}"
|
||||||
|
|
||||||
|
[Files]
|
||||||
|
Source: "Redist\msvcr71.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
|
Source: "Redist\msvcp71.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
|
Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
|
||||||
|
Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
|
||||||
|
|
||||||
|
[Registry]
|
||||||
|
|
||||||
|
|
||||||
|
[Run]
|
||||||
|
Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
|
||||||
|
|
||||||
|
[Icons]
|
||||||
|
Name: "{group}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
|
||||||
|
Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscut;
|
||||||
|
|
||||||
|
Name: "{userdesktop}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
|
||||||
|
Name: "{userdesktop}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: desktopicon
|
||||||
|
|
||||||
|
[Tasks]
|
||||||
|
Name: "desktopicon"; Description: "Create Desktop Icons";
|
||||||
|
Name: "startscut"; Description: "Create Start Menu Icons";
|
||||||
|
|
||||||
45
Installer/install_script_vs2003.iss
Normal file
45
Installer/install_script_vs2003.iss
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
;InnoSetupVersion=5.4.3
|
||||||
|
;ONLY USE THIS IF YOU COMPILED WITH VISUAL STUDIO 2003!!!
|
||||||
|
#define AppVer GetFileVersion('..\Blocks3D.exe')
|
||||||
|
|
||||||
|
[Setup]
|
||||||
|
AppName=Blocks3D
|
||||||
|
AppVersion=v{#AppVer}
|
||||||
|
AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
|
||||||
|
AppPublisherURL=http://blocks3d.com/
|
||||||
|
AppSupportURL=http://blocks3d.com/
|
||||||
|
AppUpdatesURL=http://blocks3d.com/
|
||||||
|
DefaultDirName={%localappdata}\Blocks3D
|
||||||
|
OutputBaseFilename=Blocks3D_Setup_v{#AppVer}
|
||||||
|
Compression=lzma2
|
||||||
|
PrivilegesRequired=lowest
|
||||||
|
WizardImageFile=setup.bmp
|
||||||
|
DefaultGroupName=Blocks3D
|
||||||
|
|
||||||
|
|
||||||
|
[UninstallDelete]
|
||||||
|
Type: filesandordirs; Name: "{app}"
|
||||||
|
|
||||||
|
[Files]
|
||||||
|
Source: "Redist\msvcp71.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
|
Source: "Redist\msvcr71.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
|
Source: "..\content\*"; DestDir: "{app}\content"; Flags: ignoreversion recursesubdirs
|
||||||
|
Source: "..\Blocks3D.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
|
||||||
|
|
||||||
|
[Registry]
|
||||||
|
|
||||||
|
|
||||||
|
[Run]
|
||||||
|
Filename: "iexplore.exe"; Parameters: "http://www.blocks3d.com/FirstInstall"; Description: Start playing Blocks3D; Flags: shellexec postinstall nowait skipifsilent
|
||||||
|
|
||||||
|
[Icons]
|
||||||
|
Name: "{group}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
|
||||||
|
Name: "{group}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: startscut;
|
||||||
|
|
||||||
|
Name: "{userdesktop}\Play Blocks3D"; Filename: "{%programfiles}\Internet Explorer\iexplore.exe"; Parameters: "http://www.blocks3d.com/Games"; IconFilename: "{app}\Blocks3D.exe"; Tasks: startscut;
|
||||||
|
Name: "{userdesktop}\Blocks3D Editor"; Filename: "{app}\Blocks3D.exe"; Tasks: desktopicon
|
||||||
|
|
||||||
|
[Tasks]
|
||||||
|
Name: "desktopicon"; Description: "Create Desktop Icons";
|
||||||
|
Name: "startscut"; Description: "Create Start Menu Icons";
|
||||||
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
#include "Property.h"
|
|
||||||
class BoolProperty : public Property<bool>
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
BoolProperty(std::string name, bool& value, Instance& owner)
|
|
||||||
{
|
|
||||||
Property<bool>(name, value, owner);
|
|
||||||
}
|
|
||||||
~BoolProperty(void);
|
|
||||||
PROPGRIDITEM getPropGridItem();
|
|
||||||
};
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
#include "DataModelV2/Instance.h"
|
|
||||||
#include <string>
|
|
||||||
class Instance;
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
class Property
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
Property(std::string name, T& value, Instance& owner)
|
|
||||||
{
|
|
||||||
_value = value;
|
|
||||||
_owner = owner;
|
|
||||||
}
|
|
||||||
~Property(void);
|
|
||||||
const T getValue()
|
|
||||||
{
|
|
||||||
return _value;
|
|
||||||
}
|
|
||||||
const void setValue(T val)
|
|
||||||
{
|
|
||||||
_value = val;
|
|
||||||
}
|
|
||||||
virtual PROPGRIDITEM getPropGridItem();
|
|
||||||
void setProperty(LPPROPGRIDITEM item);
|
|
||||||
protected:
|
|
||||||
Instance* _owner;
|
|
||||||
std::string _name;
|
|
||||||
T* _value;
|
|
||||||
};
|
|
||||||
@@ -280,13 +280,13 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
button->setButtonListener(menuListener);
|
button->setButtonListener(menuListener);
|
||||||
|
|
||||||
ImageButtonInstance* instance = new ToggleImageButtonInstance(
|
ImageButtonInstance* instance = new ToggleImageButtonInstance(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/Run.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/Run.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/Run_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/Run_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/Run_dn.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/Run_dn.png")),
|
||||||
NULL,
|
NULL,
|
||||||
Texture::fromFile(GetFileInPath("/content/images/Stop.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/Stop.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/Stop_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/Stop_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/Stop_dn.png"))
|
Texture::fromFile(&GetFileInPath("/content/images/Stop_dn.png"))
|
||||||
);
|
);
|
||||||
instance->setButtonListener(menuListener);
|
instance->setButtonListener(menuListener);
|
||||||
instance->name = "go";
|
instance->name = "go";
|
||||||
@@ -296,17 +296,17 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
|
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/ArrowTool.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/ArrowTool.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/ArrowTool_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/ArrowTool_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/ArrowTool_dn.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/ArrowTool_dn.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/ArrowTool_ds.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/ArrowTool_ds.png")));
|
||||||
instance->size = Vector2(50,50);
|
instance->size = Vector2(50,50);
|
||||||
instance->position = Vector2(15, 90);
|
instance->position = Vector2(15, 90);
|
||||||
instance->setParent(this);
|
instance->setParent(this);
|
||||||
instance->name = "Cursor";
|
instance->name = "Cursor";
|
||||||
instance->setButtonListener(msl);
|
instance->setButtonListener(msl);
|
||||||
|
|
||||||
instance = makeImageButton(Texture::fromFile(GetFileInPath("/content/images/ScaleTool.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ovr.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_dn.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ds.png")));
|
instance = makeImageButton(Texture::fromFile(&GetFileInPath("/content/images/ScaleTool.png")),Texture::fromFile(&GetFileInPath("/content/images/ScaleTool_ovr.png")),Texture::fromFile(&GetFileInPath("/content/images/ScaleTool_dn.png")),Texture::fromFile(&GetFileInPath("/content/images/ScaleTool_ds.png")));
|
||||||
instance->size = Vector2(40,40);
|
instance->size = Vector2(40,40);
|
||||||
instance->position = Vector2(0, 140);
|
instance->position = Vector2(0, 140);
|
||||||
instance->setParent(this);
|
instance->setParent(this);
|
||||||
@@ -315,10 +315,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
|
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/MoveTool.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/MoveTool.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/MoveTool_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/MoveTool_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/MoveTool_dn.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/MoveTool_dn.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/MoveTool_ds.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/MoveTool_ds.png")));
|
||||||
instance->size = Vector2(40,40);
|
instance->size = Vector2(40,40);
|
||||||
instance->position = Vector2(40, 140);
|
instance->position = Vector2(40, 140);
|
||||||
instance->setParent(this);
|
instance->setParent(this);
|
||||||
@@ -326,10 +326,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
instance->setButtonListener(msl);
|
instance->setButtonListener(msl);
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/SelectionRotate.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/SelectionRotate.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/SelectionRotate_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/SelectionRotate_ovr.png")),
|
||||||
NULL,
|
NULL,
|
||||||
Texture::fromFile(GetFileInPath("/content/images/SelectionRotate_ds.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/SelectionRotate_ds.png")));
|
||||||
instance->size = Vector2(30,30);
|
instance->size = Vector2(30,30);
|
||||||
instance->position = Vector2(10, 175);
|
instance->position = Vector2(10, 175);
|
||||||
instance->setParent(this);
|
instance->setParent(this);
|
||||||
@@ -337,10 +337,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
instance->setButtonListener(rbl);
|
instance->setButtonListener(rbl);
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/SelectionTilt.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/SelectionTilt.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/SelectionTilt_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/SelectionTilt_ovr.png")),
|
||||||
NULL,
|
NULL,
|
||||||
Texture::fromFile(GetFileInPath("/content/images/SelectionTilt_ds.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/SelectionTilt_ds.png")));
|
||||||
instance->size = Vector2(30,30);
|
instance->size = Vector2(30,30);
|
||||||
instance->position = Vector2(40, 175);
|
instance->position = Vector2(40, 175);
|
||||||
instance->setParent(this);
|
instance->setParent(this);
|
||||||
@@ -349,10 +349,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
|
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/Delete.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/Delete.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/Delete_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/Delete_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/Delete_dn.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/Delete_dn.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/Delete_ds.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/Delete_ds.png")));
|
||||||
instance->size = Vector2(40,46);
|
instance->size = Vector2(40,46);
|
||||||
instance->position = Vector2(20, 284);
|
instance->position = Vector2(20, 284);
|
||||||
instance->setParent(this);
|
instance->setParent(this);
|
||||||
@@ -360,9 +360,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
instance->setButtonListener(delet);
|
instance->setButtonListener(delet);
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraZoomIn.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraZoomIn_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn_dn.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/CameraZoomIn_dn.png")));
|
||||||
instance->size = Vector2(34,25);
|
instance->size = Vector2(34,25);
|
||||||
instance->floatBottom = true;
|
instance->floatBottom = true;
|
||||||
instance->floatRight = true;
|
instance->floatRight = true;
|
||||||
@@ -372,9 +372,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
instance->setButtonListener(cam);
|
instance->setButtonListener(cam);
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraZoomOut.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraZoomOut_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut_dn.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/CameraZoomOut_dn.png")));
|
||||||
instance->size = Vector2(34,26);
|
instance->size = Vector2(34,26);
|
||||||
instance->floatBottom = true;
|
instance->floatBottom = true;
|
||||||
instance->floatRight = true;
|
instance->floatRight = true;
|
||||||
@@ -384,9 +384,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
instance->setButtonListener(cam);
|
instance->setButtonListener(cam);
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraPanLeft.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraPanLeft_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft_dn.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/CameraPanLeft_dn.png")));
|
||||||
instance->size = Vector2(34,34);
|
instance->size = Vector2(34,34);
|
||||||
instance->floatBottom = true;
|
instance->floatBottom = true;
|
||||||
instance->floatRight = true;
|
instance->floatRight = true;
|
||||||
@@ -396,9 +396,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
instance->setButtonListener(cam);
|
instance->setButtonListener(cam);
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraPanRight.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraPanRight.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraPanRight_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraPanRight_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraPanRight_dn.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/CameraPanRight_dn.png")));
|
||||||
instance->size = Vector2(34,34);
|
instance->size = Vector2(34,34);
|
||||||
instance->floatBottom = true;
|
instance->floatBottom = true;
|
||||||
instance->floatRight = true;
|
instance->floatRight = true;
|
||||||
@@ -408,9 +408,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
instance->setButtonListener(cam);
|
instance->setButtonListener(cam);
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraCenter.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraCenter.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraCenter_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraCenter_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraCenter_dn.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/CameraCenter_dn.png")));
|
||||||
instance->size = Vector2(34,20);
|
instance->size = Vector2(34,20);
|
||||||
instance->floatBottom = true;
|
instance->floatBottom = true;
|
||||||
instance->floatRight = true;
|
instance->floatRight = true;
|
||||||
@@ -420,9 +420,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
instance->setButtonListener(cam);
|
instance->setButtonListener(cam);
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraTiltUp.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraTiltUp_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp_dn.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/CameraTiltUp_dn.png")));
|
||||||
instance->size = Vector2(24,24);
|
instance->size = Vector2(24,24);
|
||||||
instance->floatBottom = true;
|
instance->floatBottom = true;
|
||||||
instance->floatRight = true;
|
instance->floatRight = true;
|
||||||
@@ -432,9 +432,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
|
|||||||
instance->setButtonListener(cam);
|
instance->setButtonListener(cam);
|
||||||
|
|
||||||
instance = makeImageButton(
|
instance = makeImageButton(
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraTiltDown.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown_ovr.png")),
|
Texture::fromFile(&GetFileInPath("/content/images/CameraTiltDown_ovr.png")),
|
||||||
Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown_dn.png")));
|
Texture::fromFile(&GetFileInPath("/content/images/CameraTiltDown_dn.png")));
|
||||||
instance->size = Vector2(24,24);
|
instance->size = Vector2(24,24);
|
||||||
instance->floatBottom = true;
|
instance->floatBottom = true;
|
||||||
instance->floatRight = true;
|
instance->floatRight = true;
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
//#include "Properties/BoolProperty.h"
|
|
||||||
//PROPGRIDITEM BoolProperty::getPropGridItem()
|
|
||||||
//{
|
|
||||||
//return PROPGRIDITEM();
|
|
||||||
//}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
#include "Properties/Property.h"
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
void Property<T>::setProperty(LPPROPGRIDITEM item)
|
|
||||||
{
|
|
||||||
_owner->propertiesChanged();
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user