remove auto generated comments from all files, fix some missing tabs, remove unused variables from config.h
This commit is contained in:
parent
ad951eb9af
commit
037618e6f8
@ -1,28 +1,28 @@
|
|||||||
static const char *introTextData =
|
static const char *introTextData =
|
||||||
"\blThe Powder Toy - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - http://powdertoy.co.uk, irc.freenode.net #powder\n"
|
"\blThe Powder Toy - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - http://powdertoy.co.uk, irc.freenode.net #powder\n"
|
||||||
"\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\n"
|
"\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\n"
|
||||||
"\n"
|
"\n"
|
||||||
"\bgControl+C/V/X are Copy, Paste and cut respectively.\n"
|
"\bgControl+C/V/X are Copy, Paste and cut respectively.\n"
|
||||||
"\bgTo choose a material, hover over one of the icons on the right, it will show a selection of elements in that group.\n"
|
"\bgTo choose a material, hover over one of the icons on the right, it will show a selection of elements in that group.\n"
|
||||||
"\bgPick your material from the menu using mouse left/right buttons.\n"
|
"\bgPick your material from the menu using mouse left/right buttons.\n"
|
||||||
"Draw freeform lines by dragging your mouse left/right button across the drawing area.\n"
|
"Draw freeform lines by dragging your mouse left/right button across the drawing area.\n"
|
||||||
"Shift+drag will create straight lines of particles.\n"
|
"Shift+drag will create straight lines of particles.\n"
|
||||||
"Ctrl+drag will result in filled rectangles.\n"
|
"Ctrl+drag will result in filled rectangles.\n"
|
||||||
"Ctrl+Shift+click will flood-fill a closed area.\n"
|
"Ctrl+Shift+click will flood-fill a closed area.\n"
|
||||||
"Ctrl+Z will act as Undo.\n"
|
"Ctrl+Z will act as Undo.\n"
|
||||||
"Middle click or Alt+Click to \"sample\" the particles.\n"
|
"Middle click or Alt+Click to \"sample\" the particles.\n"
|
||||||
"\n\boUse 'Z' for a zoom tool. Click to make the drawable zoom window stay around. Use the wheel to change the zoom strength\n"
|
"\n\boUse 'Z' for a zoom tool. Click to make the drawable zoom window stay around. Use the wheel to change the zoom strength\n"
|
||||||
"Use 'S' to save parts of the window as 'stamps'.\n"
|
"Use 'S' to save parts of the window as 'stamps'.\n"
|
||||||
"'L' will load the most recent stamp, 'K' shows a library of stamps you saved.\n"
|
"'L' will load the most recent stamp, 'K' shows a library of stamps you saved.\n"
|
||||||
"Use the mouse scroll wheel to change the tool size for particles.\n"
|
"Use the mouse scroll wheel to change the tool size for particles.\n"
|
||||||
"The spacebar can be used to pause physics.\n"
|
"The spacebar can be used to pause physics.\n"
|
||||||
"'P' will take a screenshot and save it into the current directory.\n"
|
"'P' will take a screenshot and save it into the current directory.\n"
|
||||||
"\n"
|
"\n"
|
||||||
"Contributors: \bgStanislaw K Skowronek (\brhttp://powder.unaligned.org\bg, \bbirc.unaligned.org #wtf\bg),\n"
|
"Contributors: \bgStanislaw K Skowronek (\brhttp://powder.unaligned.org\bg, \bbirc.unaligned.org #wtf\bg),\n"
|
||||||
"\bgSimon Robertshaw, Skresanov Savely, cracker64, Catelite, Bryan Hoyle, Nathan Cousins, jacksonmj,\n"
|
"\bgSimon Robertshaw, Skresanov Savely, cracker64, Catelite, Bryan Hoyle, Nathan Cousins, jacksonmj,\n"
|
||||||
"\bgLieuwe Mosch, Anthony Boot, Matthew \"me4502\", MaksProg, jacob1\n"
|
"\bgLieuwe Mosch, Anthony Boot, Matthew \"me4502\", MaksProg, jacob1\n"
|
||||||
"\n"
|
"\n"
|
||||||
"\bgTo use online features such as saving, you need to register at: \brhttp://powdertoy.co.uk/Register.html\n"
|
"\bgTo use online features such as saving, you need to register at: \brhttp://powdertoy.co.uk/Register.html\n"
|
||||||
"\n"
|
"\n"
|
||||||
"\bt" MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) "." MTOS(BUILD_NUM) " " IDENT_PLATFORM " "
|
"\bt" MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) "." MTOS(BUILD_NUM) " " IDENT_PLATFORM " "
|
||||||
#ifdef X86
|
#ifdef X86
|
||||||
@ -49,4 +49,4 @@ static const char *introTextData =
|
|||||||
#ifdef REALISTIC
|
#ifdef REALISTIC
|
||||||
"REALISTIC"
|
"REALISTIC"
|
||||||
#endif
|
#endif
|
||||||
;
|
;
|
@ -1,18 +1,11 @@
|
|||||||
/*
|
|
||||||
* Shaders.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 7, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SHADERS_H_
|
#ifndef SHADERS_H_
|
||||||
#define SHADERS_H_
|
#define SHADERS_H_
|
||||||
|
|
||||||
const char * fireFragment = "#version 120\n\
|
const char * fireFragment = "#version 120\n\
|
||||||
uniform sampler2D fireAlpha;\
|
uniform sampler2D fireAlpha;\
|
||||||
void main () {\
|
void main () {\
|
||||||
vec4 texColor = texture2D(fireAlpha, gl_PointCoord);\
|
vec4 texColor = texture2D(fireAlpha, gl_PointCoord);\
|
||||||
gl_FragColor = vec4(gl_Color.rgb, texColor.a*gl_Color.a);\
|
gl_FragColor = vec4(gl_Color.rgb, texColor.a*gl_Color.a);\
|
||||||
}";
|
}";
|
||||||
const char * fireVertex = "#version 120\n\
|
const char * fireVertex = "#version 120\n\
|
||||||
void main(void)\
|
void main(void)\
|
||||||
@ -31,13 +24,13 @@ void main () {\
|
|||||||
vec4 transformY = -texture2D(tfY, vec2(gl_TexCoord[0].s, -gl_TexCoord[0].t));\
|
vec4 transformY = -texture2D(tfY, vec2(gl_TexCoord[0].s, -gl_TexCoord[0].t));\
|
||||||
transformX.r /= xres;\
|
transformX.r /= xres;\
|
||||||
transformY.g /= yres;\
|
transformY.g /= yres;\
|
||||||
vec4 texColor = vec4(\
|
vec4 texColor = vec4(\
|
||||||
texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r*0.75, transformY.g*0.75)).r,\
|
texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r*0.75, transformY.g*0.75)).r,\
|
||||||
texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r*0.875, transformY.g*0.875)).g,\
|
texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r*0.875, transformY.g*0.875)).g,\
|
||||||
texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r, transformY.g)).b,\
|
texture2D(pTex, gl_TexCoord[0].st-vec2(transformX.r, transformY.g)).b,\
|
||||||
1.0\
|
1.0\
|
||||||
);\
|
);\
|
||||||
gl_FragColor = texColor;\
|
gl_FragColor = texColor;\
|
||||||
}";
|
}";
|
||||||
const char * lensVertex = "#version 120\n\
|
const char * lensVertex = "#version 120\n\
|
||||||
void main(void)\
|
void main(void)\
|
||||||
@ -69,7 +62,7 @@ uniform sampler2D airY;\
|
|||||||
uniform sampler2D airP;\
|
uniform sampler2D airP;\
|
||||||
void main () {\
|
void main () {\
|
||||||
vec4 texP = texture2D(airP, gl_TexCoord[0].st);\
|
vec4 texP = texture2D(airP, gl_TexCoord[0].st);\
|
||||||
gl_FragColor = vec4(max(texP.b/2.0, 0), 0, abs(min(texP.b/2.0, 0)), 1.0);\
|
gl_FragColor = vec4(max(texP.b/2.0, 0), 0, abs(min(texP.b/2.0, 0)), 1.0);\
|
||||||
}";
|
}";
|
||||||
const char * airPVertex = "#version 120\n\
|
const char * airPVertex = "#version 120\n\
|
||||||
void main(void)\
|
void main(void)\
|
||||||
@ -86,7 +79,7 @@ void main () {\
|
|||||||
vec4 texX = texture2D(airX, gl_TexCoord[0].st);\
|
vec4 texX = texture2D(airX, gl_TexCoord[0].st);\
|
||||||
vec4 texY = texture2D(airY, gl_TexCoord[0].st);\
|
vec4 texY = texture2D(airY, gl_TexCoord[0].st);\
|
||||||
vec4 texP = texture2D(airP, gl_TexCoord[0].st);\
|
vec4 texP = texture2D(airP, gl_TexCoord[0].st);\
|
||||||
gl_FragColor = vec4(max(texP.b/2.0, 0), 0, abs(min(texP.b/2.0, 0)), 1.0) + vec4(abs(texX.r)/8.0, abs(texX.r)/8.0, abs(texX.r)/8.0, 1.0) + vec4(abs(texY.g)/8.0, abs(texY.g)/8.0, abs(texY.g)/8.0, 1.0);\
|
gl_FragColor = vec4(max(texP.b/2.0, 0), 0, abs(min(texP.b/2.0, 0)), 1.0) + vec4(abs(texX.r)/8.0, abs(texX.r)/8.0, abs(texX.r)/8.0, 1.0) + vec4(abs(texY.g)/8.0, abs(texY.g)/8.0, abs(texY.g)/8.0, 1.0);\
|
||||||
}";
|
}";
|
||||||
const char * airCVertex = "#version 120\n\
|
const char * airCVertex = "#version 120\n\
|
||||||
void main(void)\
|
void main(void)\
|
||||||
|
52
src/Config.h
52
src/Config.h
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Config.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 5, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
//#ifndef CONFIG_H_
|
//#ifndef CONFIG_H_
|
||||||
//#define CONFIG_H_
|
//#define CONFIG_H_
|
||||||
|
|
||||||
@ -99,8 +92,6 @@
|
|||||||
|
|
||||||
#define BRUSH_DIR "Brushes"
|
#define BRUSH_DIR "Brushes"
|
||||||
|
|
||||||
#define APPDATA_SUBDIR "\\HardWIRED"
|
|
||||||
|
|
||||||
//Number of unique thumbnails to have in cache at one time
|
//Number of unique thumbnails to have in cache at one time
|
||||||
#define THUMB_CACHE_SIZE 256
|
#define THUMB_CACHE_SIZE 256
|
||||||
|
|
||||||
@ -111,7 +102,7 @@
|
|||||||
#define M_GRAV 6.67300e-1
|
#define M_GRAV 6.67300e-1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//Number of asynchronous connections used to retrieve thumnails
|
//Number of asynchronous connections used to retrieve thumbnails
|
||||||
#define IMGCONNS 5
|
#define IMGCONNS 5
|
||||||
//Not sure
|
//Not sure
|
||||||
#define TIMEOUT 100
|
#define TIMEOUT 100
|
||||||
@ -139,15 +130,14 @@
|
|||||||
#define GRAV_DIFF
|
#define GRAV_DIFF
|
||||||
|
|
||||||
#define MAXSIGNS 16
|
#define MAXSIGNS 16
|
||||||
#define TAG_MAX 256
|
|
||||||
|
|
||||||
#define ZSIZE_D 16
|
#define ZSIZE_D 16
|
||||||
#define ZFACTOR_D 8
|
#define ZFACTOR_D 8
|
||||||
extern unsigned char ZFACTOR;
|
extern unsigned char ZFACTOR;
|
||||||
extern unsigned char ZSIZE;
|
extern unsigned char ZSIZE;
|
||||||
|
|
||||||
#define CELL 4
|
#define CELL 4
|
||||||
#define ISTP (CELL/2)
|
#define ISTP (CELL/2)
|
||||||
#define CFDS (4.0f/CELL)
|
#define CFDS (4.0f/CELL)
|
||||||
|
|
||||||
#define AIR_TSTEPP 0.3f
|
#define AIR_TSTEPP 0.3f
|
||||||
@ -156,40 +146,24 @@ extern unsigned char ZSIZE;
|
|||||||
#define AIR_VLOSS 0.999f
|
#define AIR_VLOSS 0.999f
|
||||||
#define AIR_PLOSS 0.9999f
|
#define AIR_PLOSS 0.9999f
|
||||||
|
|
||||||
#define GRID_X 5
|
|
||||||
#define GRID_Y 4
|
|
||||||
#define GRID_P 3
|
|
||||||
#define GRID_S 6
|
|
||||||
#define GRID_Z 3
|
|
||||||
|
|
||||||
#define CATALOGUE_X 4
|
|
||||||
#define CATALOGUE_Y 3
|
|
||||||
#define CATALOGUE_S 6
|
|
||||||
#define CATALOGUE_Z 3
|
|
||||||
|
|
||||||
#define STAMP_MAX 240
|
|
||||||
|
|
||||||
#define SAVE_OPS
|
|
||||||
|
|
||||||
#define NGOL 24
|
#define NGOL 24
|
||||||
#define NGOLALT 24 //NGOL should be 24, but use this var until I find out why
|
|
||||||
|
|
||||||
#define CIRCLE_BRUSH 0
|
#define CIRCLE_BRUSH 0
|
||||||
#define SQUARE_BRUSH 1
|
#define SQUARE_BRUSH 1
|
||||||
#define TRI_BRUSH 2
|
#define TRI_BRUSH 2
|
||||||
#define BRUSH_NUM 3
|
#define BRUSH_NUM 3
|
||||||
|
|
||||||
#define SURF_RANGE 10
|
#define SURF_RANGE 10
|
||||||
#define NORMAL_MIN_EST 3
|
#define NORMAL_MIN_EST 3
|
||||||
#define NORMAL_INTERP 20
|
#define NORMAL_INTERP 20
|
||||||
#define NORMAL_FRAC 16
|
#define NORMAL_FRAC 16
|
||||||
|
|
||||||
#define REFRACT 0x80000000
|
#define REFRACT 0x80000000
|
||||||
|
|
||||||
/* heavy flint glass, for awesome refraction/dispersion
|
/* heavy flint glass, for awesome refraction/dispersion
|
||||||
this way you can make roof prisms easily */
|
this way you can make roof prisms easily */
|
||||||
#define GLASS_IOR 1.9
|
#define GLASS_IOR 1.9
|
||||||
#define GLASS_DISP 0.07
|
#define GLASS_DISP 0.07
|
||||||
|
|
||||||
#ifdef WIN
|
#ifdef WIN
|
||||||
#define strcasecmp stricmp
|
#define strcasecmp stricmp
|
||||||
@ -215,10 +189,4 @@ extern unsigned char ZSIZE;
|
|||||||
#define SDEUT
|
#define SDEUT
|
||||||
//#define REALHEAT
|
//#define REALHEAT
|
||||||
|
|
||||||
#define DEBUG_PARTS 0x0001
|
|
||||||
#define DEBUG_PARTCOUNT 0x0002
|
|
||||||
#define DEBUG_DRAWTOOL 0x0004
|
|
||||||
#define DEBUG_PERFORMANCE_CALC 0x0008
|
|
||||||
#define DEBUG_PERFORMANCE_FRAME 0x0010
|
|
||||||
|
|
||||||
//#endif /* CONFIG_H_ */
|
//#endif /* CONFIG_H_ */
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Controller.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 25, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CONTROLLER_H_
|
#ifndef CONTROLLER_H_
|
||||||
#define CONTROLLER_H_
|
#define CONTROLLER_H_
|
||||||
|
|
||||||
|
@ -1,11 +1,3 @@
|
|||||||
//
|
|
||||||
// Style.cpp
|
|
||||||
// The Powder Toy
|
|
||||||
//
|
|
||||||
// Created by Simon Robertshaw on 14/05/2012.
|
|
||||||
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
|
|
||||||
//
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include "Style.h"
|
#include "Style.h"
|
||||||
|
11
src/Style.h
11
src/Style.h
@ -1,12 +1,5 @@
|
|||||||
//
|
#ifndef STYLE_H_
|
||||||
// Style.h
|
#define STYLE_H_
|
||||||
// The Powder Toy
|
|
||||||
//
|
|
||||||
// Created by Simon Robertshaw on 14/05/2012.
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifndef The_Powder_Toy_Style_h
|
|
||||||
#define The_Powder_Toy_Style_h
|
|
||||||
|
|
||||||
namespace ui { class Colour; }
|
namespace ui { class Colour; }
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Update.h
|
|
||||||
*
|
|
||||||
* Created on: Jun 21, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef UPDATE_H_
|
#ifndef UPDATE_H_
|
||||||
#define UPDATE_H_
|
#define UPDATE_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Kitty.cpp
|
|
||||||
*
|
|
||||||
* Created on: Feb 2, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -1,12 +1,5 @@
|
|||||||
/*
|
#ifndef COMMANDINTERFACE_H_
|
||||||
* Kitty.h
|
#define COMMANDINTERFACE_H_
|
||||||
*
|
|
||||||
* Created on: Feb 2, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef KITTY_H_
|
|
||||||
#define KITTY_H_
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "interface/Engine.h"
|
#include "interface/Engine.h"
|
||||||
@ -43,4 +36,4 @@ public:
|
|||||||
virtual ~CommandInterface();
|
virtual ~CommandInterface();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* KITTY_H_ */
|
#endif /* COMMANDINTERFACE_H_ */
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* LuaScriptHelper.h
|
|
||||||
*
|
|
||||||
* Created on: Feb 12, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef LUASCRIPTHELPER_H_
|
#ifndef LUASCRIPTHELPER_H_
|
||||||
#define LUASCRIPTHELPER_H_
|
#define LUASCRIPTHELPER_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* LuaScriptInterface.cpp
|
|
||||||
*
|
|
||||||
* Created on: Feb 11, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
@ -1699,8 +1692,8 @@ void LuaScriptInterface::initGraphicsAPI()
|
|||||||
|
|
||||||
int LuaScriptInterface::graphics_textSize(lua_State * l)
|
int LuaScriptInterface::graphics_textSize(lua_State * l)
|
||||||
{
|
{
|
||||||
char * text;
|
char * text;
|
||||||
int width, height;
|
int width, height;
|
||||||
text = (char*)lua_tostring(l, 1);
|
text = (char*)lua_tostring(l, 1);
|
||||||
Graphics::textsize(text, width, height);
|
Graphics::textsize(text, width, height);
|
||||||
|
|
||||||
@ -1711,7 +1704,7 @@ int LuaScriptInterface::graphics_textSize(lua_State * l)
|
|||||||
|
|
||||||
int LuaScriptInterface::graphics_drawText(lua_State * l)
|
int LuaScriptInterface::graphics_drawText(lua_State * l)
|
||||||
{
|
{
|
||||||
char * text;
|
char * text;
|
||||||
int x, y, r, g, b, a;
|
int x, y, r, g, b, a;
|
||||||
x = lua_tointeger(l, 1);
|
x = lua_tointeger(l, 1);
|
||||||
y = lua_tointeger(l, 2);
|
y = lua_tointeger(l, 2);
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* LuaScriptInterface.h
|
|
||||||
*
|
|
||||||
* Created on: Feb 11, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef LUASCRIPTINTERFACE_H_
|
#ifndef LUASCRIPTINTERFACE_H_
|
||||||
#define LUASCRIPTINTERFACE_H_
|
#define LUASCRIPTINTERFACE_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* TPTSTypes.cpp
|
|
||||||
*
|
|
||||||
* Created on: Feb 4, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* TPTSTypes.h
|
|
||||||
*
|
|
||||||
* Created on: Feb 4, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef TPTSTYPES_H_
|
#ifndef TPTSTYPES_H_
|
||||||
#define TPTSTYPES_H_
|
#define TPTSTYPES_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* TPTScriptInterface.cpp
|
|
||||||
*
|
|
||||||
* Created on: Feb 5, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stack>
|
#include <stack>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* TPTScriptInterface.h
|
|
||||||
*
|
|
||||||
* Created on: Feb 5, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef TPTSCRIPTINTERFACE_H_
|
#ifndef TPTSCRIPTINTERFACE_H_
|
||||||
#define TPTSCRIPTINTERFACE_H_
|
#define TPTSCRIPTINTERFACE_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ClientListener.h
|
|
||||||
*
|
|
||||||
* Created on: Jun 19, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CLIENTLISTENER_H_
|
#ifndef CLIENTLISTENER_H_
|
||||||
#define CLIENTLISTENER_H_
|
#define CLIENTLISTENER_H_
|
||||||
|
|
||||||
|
@ -1318,7 +1318,7 @@ void GameSave::readPSv(char * data, int dataLength)
|
|||||||
ttv |= (d[p++]);
|
ttv |= (d[p++]);
|
||||||
particles[i-1].tmp = ttv;
|
particles[i-1].tmp = ttv;
|
||||||
if (ver<53 && !particles[i-1].tmp)
|
if (ver<53 && !particles[i-1].tmp)
|
||||||
for (q = 1; q<=NGOLALT; q++) {
|
for (q = 1; q<=NGOL; q++) {
|
||||||
if (particles[i-1].type==goltype[q-1] && grule[q][9]==2)
|
if (particles[i-1].type==goltype[q-1] && grule[q][9]==2)
|
||||||
particles[i-1].tmp = grule[q][9]-1;
|
particles[i-1].tmp = grule[q][9]-1;
|
||||||
}
|
}
|
||||||
@ -1500,7 +1500,7 @@ void GameSave::readPSv(char * data, int dataLength)
|
|||||||
if(ver<51 && ((ty>=78 && ty<=89) || (ty>=134 && ty<=146 && ty!=141))){
|
if(ver<51 && ((ty>=78 && ty<=89) || (ty>=134 && ty<=146 && ty!=141))){
|
||||||
//Replace old GOL
|
//Replace old GOL
|
||||||
particles[i-1].type = PT_LIFE;
|
particles[i-1].type = PT_LIFE;
|
||||||
for (gnum = 0; gnum<NGOLALT; gnum++){
|
for (gnum = 0; gnum<NGOL; gnum++){
|
||||||
if (ty==goltype[gnum])
|
if (ty==goltype[gnum])
|
||||||
particles[i-1].ctype = gnum;
|
particles[i-1].ctype = gnum;
|
||||||
}
|
}
|
||||||
@ -1508,7 +1508,7 @@ void GameSave::readPSv(char * data, int dataLength)
|
|||||||
}
|
}
|
||||||
if(ver<52 && (ty==PT_CLNE || ty==PT_PCLN || ty==PT_BCLN)){
|
if(ver<52 && (ty==PT_CLNE || ty==PT_PCLN || ty==PT_BCLN)){
|
||||||
//Replace old GOL ctypes in clone
|
//Replace old GOL ctypes in clone
|
||||||
for (gnum = 0; gnum<NGOLALT; gnum++){
|
for (gnum = 0; gnum<NGOL; gnum++){
|
||||||
if (particles[i-1].ctype==goltype[gnum])
|
if (particles[i-1].ctype==goltype[gnum])
|
||||||
{
|
{
|
||||||
particles[i-1].ctype = PT_LIFE;
|
particles[i-1].ctype = PT_LIFE;
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
//
|
|
||||||
// GameSave.h
|
|
||||||
// The Powder Toy
|
|
||||||
//
|
|
||||||
// Created by Simon Robertshaw on 04/06/2012.
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifndef The_Powder_Toy_GameSave_h
|
#ifndef The_Powder_Toy_GameSave_h
|
||||||
#define The_Powder_Toy_GameSave_h
|
#define The_Powder_Toy_GameSave_h
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* SaveFile.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jun 6, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "SaveFile.h"
|
#include "SaveFile.h"
|
||||||
#include "GameSave.h"
|
#include "GameSave.h"
|
||||||
#include "Client.h"
|
#include "Client.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* SaveFile.h
|
|
||||||
*
|
|
||||||
* Created on: Jun 6, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SAVEFILE_H_
|
#ifndef SAVEFILE_H_
|
||||||
#define SAVEFILE_H_
|
#define SAVEFILE_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Save.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 26, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "SaveInfo.h"
|
#include "SaveInfo.h"
|
||||||
#include "GameSave.h"
|
#include "GameSave.h"
|
||||||
#include "Client.h"
|
#include "Client.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* User.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 25, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef USER_H_
|
#ifndef USER_H_
|
||||||
#define USER_H_
|
#define USER_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ElementSearchActivity.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jun 24, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include "ColourPickerActivity.h"
|
#include "ColourPickerActivity.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConsoleCommand.h
|
|
||||||
*
|
|
||||||
* Created on: Feb 1, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CONSOLECOMMAND_H_
|
#ifndef CONSOLECOMMAND_H_
|
||||||
#define CONSOLECOMMAND_H_
|
#define CONSOLECOMMAND_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConsoleController.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 31, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stack>
|
#include <stack>
|
||||||
#include "ConsoleController.h"
|
#include "ConsoleController.h"
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConsoleController.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 31, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CONSOLECONTROLLER_H_
|
#ifndef CONSOLECONTROLLER_H_
|
||||||
#define CONSOLECONTROLLER_H_
|
#define CONSOLECONTROLLER_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConsoleModel.cpp
|
|
||||||
*
|
|
||||||
* Created on: Feb 1, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "client/Client.h"
|
#include "client/Client.h"
|
||||||
#include "ConsoleModel.h"
|
#include "ConsoleModel.h"
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConsoleModel.h
|
|
||||||
*
|
|
||||||
* Created on: Feb 1, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CONSOLEMODEL_H_
|
#ifndef CONSOLEMODEL_H_
|
||||||
#define CONSOLEMODEL_H_
|
#define CONSOLEMODEL_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConsoleView.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 31, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ConsoleView.h"
|
#include "ConsoleView.h"
|
||||||
#include "interface/Keys.h"
|
#include "interface/Keys.h"
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConsoleView.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 31, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CONSOLEVIEW_H_
|
#ifndef CONSOLEVIEW_H_
|
||||||
#define CONSOLEVIEW_H_
|
#define CONSOLEVIEW_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConfirmPrompt.cpp
|
|
||||||
*
|
|
||||||
* Created on: Apr 6, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ConfirmPrompt.h"
|
#include "ConfirmPrompt.h"
|
||||||
#include "Style.h"
|
#include "Style.h"
|
||||||
#include "interface/Label.h"
|
#include "interface/Label.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConfirmPrompt.h
|
|
||||||
*
|
|
||||||
* Created on: Apr 6, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CONFIRMPROMPT_H_
|
#ifndef CONFIRMPROMPT_H_
|
||||||
#define CONFIRMPROMPT_H_
|
#define CONFIRMPROMPT_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ErrorMessage.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "Style.h"
|
#include "Style.h"
|
||||||
#include "ErrorMessage.h"
|
#include "ErrorMessage.h"
|
||||||
#include "interface/Button.h"
|
#include "interface/Button.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ErrorMessage.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ERRORMESSAGE_H_
|
#ifndef ERRORMESSAGE_H_
|
||||||
#define ERRORMESSAGE_H_
|
#define ERRORMESSAGE_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* InformationMessage.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "Style.h"
|
#include "Style.h"
|
||||||
#include "InformationMessage.h"
|
#include "InformationMessage.h"
|
||||||
#include "interface/Button.h"
|
#include "interface/Button.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* InformationMessage.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef INFORMATIONMESSAGE_H_
|
#ifndef INFORMATIONMESSAGE_H_
|
||||||
#define INFORMATIONMESSAGE_H_
|
#define INFORMATIONMESSAGE_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConfirmPrompt.cpp
|
|
||||||
*
|
|
||||||
* Created on: Apr 6, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "TextPrompt.h"
|
#include "TextPrompt.h"
|
||||||
#include "interface/Label.h"
|
#include "interface/Label.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ConfirmPrompt.h
|
|
||||||
*
|
|
||||||
* Created on: Apr 6, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef TEXTPROMPT_H_
|
#ifndef TEXTPROMPT_H_
|
||||||
#define TEXTPROMPT_H_
|
#define TEXTPROMPT_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ElementSearchActivity.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jun 24, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "ElementSearchActivity.h"
|
#include "ElementSearchActivity.h"
|
||||||
#include "interface/Textbox.h"
|
#include "interface/Textbox.h"
|
||||||
@ -187,6 +180,5 @@ void ElementSearchActivity::OnKeyPress(int key, Uint16 character, bool shift, bo
|
|||||||
}
|
}
|
||||||
|
|
||||||
ElementSearchActivity::~ElementSearchActivity() {
|
ElementSearchActivity::~ElementSearchActivity() {
|
||||||
// TODO Auto-generated destructor stub
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ElementSearchActivity.h
|
|
||||||
*
|
|
||||||
* Created on: Jun 24, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ELEMENTSEARCHACTIVITY_H_
|
#ifndef ELEMENTSEARCHACTIVITY_H_
|
||||||
#define ELEMENTSEARCHACTIVITY_H_
|
#define ELEMENTSEARCHACTIVITY_H_
|
||||||
|
|
||||||
|
@ -1,9 +1,3 @@
|
|||||||
/*
|
|
||||||
* Brush.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 22, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
#ifndef BRUSH_H_
|
#ifndef BRUSH_H_
|
||||||
#define BRUSH_H_
|
#define BRUSH_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ElipseBrush.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 26, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ELIPSEBRUSH_H_
|
#ifndef ELIPSEBRUSH_H_
|
||||||
#define ELIPSEBRUSH_H_
|
#define ELIPSEBRUSH_H_
|
||||||
|
|
||||||
|
@ -1,12 +1,5 @@
|
|||||||
/*
|
#ifndef GAMEMODELEXCEPTION_H_
|
||||||
* SaveLoadException.h
|
#define GAMEMODELEXCEPTION_H_
|
||||||
*
|
|
||||||
* Created on: Mar 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SAVELOADEXCEPTION_H_
|
|
||||||
#define SAVELOADEXCEPTION_H_
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
@ -23,4 +16,4 @@ public:
|
|||||||
~GameModelException() throw() {};
|
~GameModelException() throw() {};
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* SAVELOADEXCEPTION_H_ */
|
#endif /* GAMEMODELEXCEPTION_H_ */
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Menu.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 22, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef MENU_H_
|
#ifndef MENU_H_
|
||||||
#define MENU_H_
|
#define MENU_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Notification.h
|
|
||||||
*
|
|
||||||
* Created on: Jun 20, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef NOTIFICATION_H_
|
#ifndef NOTIFICATION_H_
|
||||||
#define NOTIFICATION_H_
|
#define NOTIFICATION_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Tool.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jun 24, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "Tool.h"
|
#include "Tool.h"
|
||||||
#include "game/Brush.h"
|
#include "game/Brush.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Tool.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 22, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef TOOL_H_
|
#ifndef TOOL_H_
|
||||||
#define TOOL_H_
|
#define TOOL_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ToolButton.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 30, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ToolButton.h"
|
#include "ToolButton.h"
|
||||||
#include "interface/Keys.h"
|
#include "interface/Keys.h"
|
||||||
|
|
||||||
@ -17,7 +10,7 @@ ToolButton::ToolButton(ui::Point position, ui::Point size, std::string text_, st
|
|||||||
|
|
||||||
void ToolButton::OnMouseClick(int x, int y, unsigned int button)
|
void ToolButton::OnMouseClick(int x, int y, unsigned int button)
|
||||||
{
|
{
|
||||||
isButtonDown = true;
|
isButtonDown = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ToolButton::OnMouseUnclick(int x, int y, unsigned int button)
|
void ToolButton::OnMouseUnclick(int x, int y, unsigned int button)
|
||||||
@ -94,6 +87,5 @@ int ToolButton::GetSelectionState()
|
|||||||
}
|
}
|
||||||
|
|
||||||
ToolButton::~ToolButton() {
|
ToolButton::~ToolButton() {
|
||||||
// TODO Auto-generated destructor stub
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* ToolButton.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 30, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef TOOLBUTTON_H_
|
#ifndef TOOLBUTTON_H_
|
||||||
#define TOOLBUTTON_H_
|
#define TOOLBUTTON_H_
|
||||||
|
|
||||||
|
@ -1,9 +1,3 @@
|
|||||||
/*
|
|
||||||
* Renderer.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 7, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
//
|
|
||||||
// Appearance.cpp
|
|
||||||
// The Powder Toy
|
|
||||||
//
|
|
||||||
// Created by Simon Robertshaw on 15/05/2012.
|
|
||||||
//
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "Appearance.h"
|
#include "Appearance.h"
|
||||||
|
|
||||||
|
@ -1,12 +1,5 @@
|
|||||||
//
|
#ifndef APPEARANCE_H_
|
||||||
// Appearance.h
|
#define APPEARANCE_H_
|
||||||
// The Powder Toy
|
|
||||||
//
|
|
||||||
// Created by Simon Robertshaw on 15/05/2012.
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifndef The_Powder_Toy_Appearance_h
|
|
||||||
#define The_Powder_Toy_Appearance_h
|
|
||||||
|
|
||||||
#include "Border.h"
|
#include "Border.h"
|
||||||
#include "Colour.h"
|
#include "Colour.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Button.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 8, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "interface/Button.h"
|
#include "interface/Button.h"
|
||||||
#include "graphics/Graphics.h"
|
#include "graphics/Graphics.h"
|
||||||
@ -156,21 +149,21 @@ void Button::Draw(const Point& screenPos)
|
|||||||
|
|
||||||
void Button::OnMouseUnclick(int x, int y, unsigned int button)
|
void Button::OnMouseUnclick(int x, int y, unsigned int button)
|
||||||
{
|
{
|
||||||
if(button == 1)
|
if(button == 1)
|
||||||
{
|
{
|
||||||
if(isButtonDown)
|
if(isButtonDown)
|
||||||
{
|
{
|
||||||
isButtonDown = false;
|
isButtonDown = false;
|
||||||
DoAction();
|
DoAction();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(button == 3)
|
else if(button == 3)
|
||||||
{
|
{
|
||||||
if(isAltButtonDown)
|
if(isAltButtonDown)
|
||||||
{
|
{
|
||||||
isAltButtonDown = false;
|
isAltButtonDown = false;
|
||||||
DoAltAction();
|
DoAltAction();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -178,8 +171,8 @@ void Button::OnMouseClick(int x, int y, unsigned int button)
|
|||||||
{
|
{
|
||||||
if(!Enabled)
|
if(!Enabled)
|
||||||
return;
|
return;
|
||||||
if(button == 1)
|
if(button == 1)
|
||||||
{
|
{
|
||||||
if(isTogglable)
|
if(isTogglable)
|
||||||
{
|
{
|
||||||
toggle = !toggle;
|
toggle = !toggle;
|
||||||
@ -187,14 +180,14 @@ void Button::OnMouseClick(int x, int y, unsigned int button)
|
|||||||
isButtonDown = true;
|
isButtonDown = true;
|
||||||
}
|
}
|
||||||
else if(button == 3)
|
else if(button == 3)
|
||||||
{
|
{
|
||||||
isAltButtonDown = true;
|
isAltButtonDown = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Button::OnMouseEnter(int x, int y)
|
void Button::OnMouseEnter(int x, int y)
|
||||||
{
|
{
|
||||||
isMouseInside = true;
|
isMouseInside = true;
|
||||||
if(!Enabled)
|
if(!Enabled)
|
||||||
return;
|
return;
|
||||||
if(actionCallback)
|
if(actionCallback)
|
||||||
@ -208,8 +201,8 @@ void Button::OnMouseEnter(int x, int y)
|
|||||||
|
|
||||||
void Button::OnMouseLeave(int x, int y)
|
void Button::OnMouseLeave(int x, int y)
|
||||||
{
|
{
|
||||||
isMouseInside = false;
|
isMouseInside = false;
|
||||||
isButtonDown = false;
|
isButtonDown = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Button::DoAction()
|
void Button::DoAction()
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Button.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 8, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef BUTTON_H_
|
#ifndef BUTTON_H_
|
||||||
#define BUTTON_H_
|
#define BUTTON_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Checkbox.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 26, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "Checkbox.h"
|
#include "Checkbox.h"
|
||||||
|
|
||||||
using namespace ui;
|
using namespace ui;
|
||||||
@ -17,7 +10,6 @@ Checkbox::Checkbox(ui::Point position, ui::Point size, std::string text, std::st
|
|||||||
checked(false),
|
checked(false),
|
||||||
actionCallback(NULL)
|
actionCallback(NULL)
|
||||||
{
|
{
|
||||||
// TODO Auto-generated constructor stub
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Checkbox.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 26, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CHECKBOX_H_
|
#ifndef CHECKBOX_H_
|
||||||
#define CHECKBOX_H_
|
#define CHECKBOX_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* DropDown.cpp
|
|
||||||
*
|
|
||||||
* Created on: Apr 16, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "Style.h"
|
#include "Style.h"
|
||||||
#include "Button.h"
|
#include "Button.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* DropDown.h
|
|
||||||
*
|
|
||||||
* Created on: Apr 16, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef DROPDOWN_H_
|
#ifndef DROPDOWN_H_
|
||||||
#define DROPDOWN_H_
|
#define DROPDOWN_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Slider.cpp
|
|
||||||
*
|
|
||||||
* Created on: Mar 3, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "Slider.h"
|
#include "Slider.h"
|
||||||
#include "Colour.h"
|
#include "Colour.h"
|
||||||
@ -20,7 +13,6 @@ Slider::Slider(Point position, Point size, int steps):
|
|||||||
col1(0, 0, 0, 0),
|
col1(0, 0, 0, 0),
|
||||||
col2(0, 0, 0, 0)
|
col2(0, 0, 0, 0)
|
||||||
{
|
{
|
||||||
// TODO Auto-generated constructor stub
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Slider.h
|
|
||||||
*
|
|
||||||
* Created on: Mar 3, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SLIDER_H_
|
#ifndef SLIDER_H_
|
||||||
#define SLIDER_H_
|
#define SLIDER_H_
|
||||||
|
|
||||||
|
@ -1,11 +1,3 @@
|
|||||||
/*
|
|
||||||
* Spinner.cpp
|
|
||||||
*
|
|
||||||
* Created on: Feb 11, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "Spinner.h"
|
#include "Spinner.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Spinner.h
|
|
||||||
*
|
|
||||||
* Created on: Feb 11, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SPINNER_H_
|
#ifndef SPINNER_H_
|
||||||
#define SPINNER_H_
|
#define SPINNER_H_
|
||||||
|
|
||||||
|
@ -1,9 +1,3 @@
|
|||||||
/*
|
|
||||||
* StampsController.cpp
|
|
||||||
*
|
|
||||||
* Created on: Mar 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#include "client/Client.h"
|
#include "client/Client.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* StampsController.h
|
|
||||||
*
|
|
||||||
* Created on: Mar 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef STAMPSCONTROLLER_H_
|
#ifndef STAMPSCONTROLLER_H_
|
||||||
#define STAMPSCONTROLLER_H_
|
#define STAMPSCONTROLLER_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* StampsModel.cpp
|
|
||||||
*
|
|
||||||
* Created on: Mar 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "LocalBrowserModel.h"
|
#include "LocalBrowserModel.h"
|
||||||
#include "LocalBrowserView.h"
|
#include "LocalBrowserView.h"
|
||||||
#include "LocalBrowserModelException.h"
|
#include "LocalBrowserModelException.h"
|
||||||
@ -16,7 +9,6 @@ LocalBrowserModel::LocalBrowserModel():
|
|||||||
currentPage(1),
|
currentPage(1),
|
||||||
stampToFront(1)
|
stampToFront(1)
|
||||||
{
|
{
|
||||||
// TODO Auto-generated constructor stub
|
|
||||||
//stampIDs = Client::Ref().GetStamps();
|
//stampIDs = Client::Ref().GetStamps();
|
||||||
stampIDs = Client::Ref().GetStamps(0, 16);
|
stampIDs = Client::Ref().GetStamps(0, 16);
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* StampsModel.h
|
|
||||||
*
|
|
||||||
* Created on: Mar 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef STAMPSMODEL_H_
|
#ifndef STAMPSMODEL_H_
|
||||||
#define STAMPSMODEL_H_
|
#define STAMPSMODEL_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* StampsModelException.h
|
|
||||||
*
|
|
||||||
* Created on: Mar 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef STAMPSMODELEXCEPTION_H_
|
#ifndef STAMPSMODELEXCEPTION_H_
|
||||||
#define STAMPSMODELEXCEPTION_H_
|
#define STAMPSMODELEXCEPTION_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* StampsView.cpp
|
|
||||||
*
|
|
||||||
* Created on: Mar 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include "client/Client.h"
|
#include "client/Client.h"
|
||||||
#include "LocalBrowserView.h"
|
#include "LocalBrowserView.h"
|
||||||
@ -219,6 +212,5 @@ void LocalBrowserView::OnKeyPress(int key, Uint16 character, bool shift, bool ct
|
|||||||
}
|
}
|
||||||
|
|
||||||
LocalBrowserView::~LocalBrowserView() {
|
LocalBrowserView::~LocalBrowserView() {
|
||||||
// TODO Auto-generated destructor stub
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* StampsView.h
|
|
||||||
*
|
|
||||||
* Created on: Mar 29, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef STAMPSVIEW_H_
|
#ifndef STAMPSVIEW_H_
|
||||||
#define STAMPSVIEW_H_
|
#define STAMPSVIEW_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* LoginController.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 24, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "LoginController.h"
|
#include "LoginController.h"
|
||||||
#include "client/User.h"
|
#include "client/User.h"
|
||||||
#include "client/Client.h"
|
#include "client/Client.h"
|
||||||
@ -12,7 +5,6 @@
|
|||||||
LoginController::LoginController(ControllerCallback * callback):
|
LoginController::LoginController(ControllerCallback * callback):
|
||||||
HasExited(false)
|
HasExited(false)
|
||||||
{
|
{
|
||||||
// TODO Auto-generated constructor stub
|
|
||||||
loginView = new LoginView();
|
loginView = new LoginView();
|
||||||
loginModel = new LoginModel();
|
loginModel = new LoginModel();
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* LoginController.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 24, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef LOGINCONTROLLER_H_
|
#ifndef LOGINCONTROLLER_H_
|
||||||
#define LOGINCONTROLLER_H_
|
#define LOGINCONTROLLER_H_
|
||||||
|
|
||||||
|
@ -1,16 +1,8 @@
|
|||||||
/*
|
|
||||||
* LoginModel.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 24, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "LoginModel.h"
|
#include "LoginModel.h"
|
||||||
|
|
||||||
LoginModel::LoginModel():
|
LoginModel::LoginModel():
|
||||||
currentUser(0, "")
|
currentUser(0, "")
|
||||||
{
|
{
|
||||||
// TODO Auto-generated constructor stub
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -62,6 +54,5 @@ void LoginModel::notifyStatusChanged()
|
|||||||
}
|
}
|
||||||
|
|
||||||
LoginModel::~LoginModel() {
|
LoginModel::~LoginModel() {
|
||||||
// TODO Auto-generated destructor stub
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* LoginModel.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 24, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef LOGINMODEL_H_
|
#ifndef LOGINMODEL_H_
|
||||||
#define LOGINMODEL_H_
|
#define LOGINMODEL_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* LoginView.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 24, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "LoginView.h"
|
#include "LoginView.h"
|
||||||
|
|
||||||
#include "interface/Button.h"
|
#include "interface/Button.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* LoginView.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 24, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef LOGINVIEW_H_
|
#ifndef LOGINVIEW_H_
|
||||||
#define LOGINVIEW_H_
|
#define LOGINVIEW_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* OptionsController.cpp
|
|
||||||
*
|
|
||||||
* Created on: Apr 14, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "OptionsController.h"
|
#include "OptionsController.h"
|
||||||
#include "dialogues/ErrorMessage.h"
|
#include "dialogues/ErrorMessage.h"
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* OptionsController.h
|
|
||||||
*
|
|
||||||
* Created on: Apr 14, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef OPTIONSCONTROLLER_H_
|
#ifndef OPTIONSCONTROLLER_H_
|
||||||
#define OPTIONSCONTROLLER_H_
|
#define OPTIONSCONTROLLER_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* OptionsModel.cpp
|
|
||||||
*
|
|
||||||
* Created on: Apr 14, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "simulation/Air.h"
|
#include "simulation/Air.h"
|
||||||
#include "game/GameModel.h"
|
#include "game/GameModel.h"
|
||||||
#include "OptionsModel.h"
|
#include "OptionsModel.h"
|
||||||
@ -140,6 +133,5 @@ void OptionsModel::notifySettingsChanged()
|
|||||||
}
|
}
|
||||||
|
|
||||||
OptionsModel::~OptionsModel() {
|
OptionsModel::~OptionsModel() {
|
||||||
// TODO Auto-generated destructor stub
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* OptionsModel.h
|
|
||||||
*
|
|
||||||
* Created on: Apr 14, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef OPTIONSMODEL_H_
|
#ifndef OPTIONSMODEL_H_
|
||||||
#define OPTIONSMODEL_H_
|
#define OPTIONSMODEL_H_
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* OptionsView.cpp
|
|
||||||
*
|
|
||||||
* Created on: Apr 14, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "OptionsView.h"
|
#include "OptionsView.h"
|
||||||
#include "Style.h"
|
#include "Style.h"
|
||||||
#include "interface/Button.h"
|
#include "interface/Button.h"
|
||||||
@ -235,6 +228,5 @@ void OptionsView::OnTryExit(ExitMethod method)
|
|||||||
|
|
||||||
|
|
||||||
OptionsView::~OptionsView() {
|
OptionsView::~OptionsView() {
|
||||||
// TODO Auto-generated destructor stub
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* OptionsView.h
|
|
||||||
*
|
|
||||||
* Created on: Apr 14, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef OPTIONSVIEW_H_
|
#ifndef OPTIONSVIEW_H_
|
||||||
#define OPTIONSVIEW_H_
|
#define OPTIONSVIEW_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Comment.h
|
|
||||||
*
|
|
||||||
* Created on: Feb 11, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef COMMENT_H_
|
#ifndef COMMENT_H_
|
||||||
#define COMMENT_H_
|
#define COMMENT_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* PreviewController.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 21, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PREVIEWCONTROLLER_H_
|
#ifndef PREVIEWCONTROLLER_H_
|
||||||
#define PREVIEWCONTROLLER_H_
|
#define PREVIEWCONTROLLER_H_
|
||||||
|
|
||||||
|
@ -1,17 +1,10 @@
|
|||||||
/*
|
|
||||||
* PreviewModel.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 21, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PREVIEWMODEL_H_
|
#ifndef PREVIEWMODEL_H_
|
||||||
#define PREVIEWMODEL_H_
|
#define PREVIEWMODEL_H_
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#undef GetUserName //God dammit microsoft!
|
#undef GetUserName //God dammit microsoft!
|
||||||
#include "PreviewView.h"
|
#include "PreviewView.h"
|
||||||
#include "client/SaveInfo.h"
|
#include "client/SaveInfo.h"
|
||||||
#include "preview/Comment.h"
|
#include "preview/Comment.h"
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* PreviewModelException.h
|
|
||||||
*
|
|
||||||
* Created on: Apr 14, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PREVIEWMODELEXCEPTION_H_
|
#ifndef PREVIEWMODELEXCEPTION_H_
|
||||||
#define PREVIEWMODELEXCEPTION_H_
|
#define PREVIEWMODELEXCEPTION_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* PreviewView.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 21, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PREVIEWVIEW_H_
|
#ifndef PREVIEWVIEW_H_
|
||||||
#define PREVIEWVIEW_H_
|
#define PREVIEWVIEW_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* RenderController.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 23, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "RenderController.h"
|
#include "RenderController.h"
|
||||||
|
|
||||||
RenderController::RenderController(Renderer * ren, ControllerCallback * callback):
|
RenderController::RenderController(Renderer * ren, ControllerCallback * callback):
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* RenderController.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 23, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef RENDERCONTROLLER_H_
|
#ifndef RENDERCONTROLLER_H_
|
||||||
#define RENDERCONTROLLER_H_
|
#define RENDERCONTROLLER_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* RenderModel.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 23, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "RenderModel.h"
|
#include "RenderModel.h"
|
||||||
|
|
||||||
RenderModel::RenderModel():
|
RenderModel::RenderModel():
|
||||||
@ -139,5 +132,4 @@ void RenderModel::notifyColourChanged()
|
|||||||
}
|
}
|
||||||
|
|
||||||
RenderModel::~RenderModel() {
|
RenderModel::~RenderModel() {
|
||||||
// TODO Auto-generated destructor stub
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* RenderModel.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 23, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef RENDERMODEL_H_
|
#ifndef RENDERMODEL_H_
|
||||||
#define RENDERMODEL_H_
|
#define RENDERMODEL_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* RenderView.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jan 23, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "simulation/ElementGraphics.h"
|
#include "simulation/ElementGraphics.h"
|
||||||
#include "graphics/Graphics.h"
|
#include "graphics/Graphics.h"
|
||||||
#include "graphics/Renderer.h"
|
#include "graphics/Renderer.h"
|
||||||
@ -405,5 +398,4 @@ void RenderView::ToolTip(ui::Component * sender, ui::Point mousePosition, std::s
|
|||||||
}
|
}
|
||||||
|
|
||||||
RenderView::~RenderView() {
|
RenderView::~RenderView() {
|
||||||
// TODO Auto-generated destructor stub
|
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* RenderView.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 23, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef RENDERVIEW_H_
|
#ifndef RENDERVIEW_H_
|
||||||
#define RENDERVIEW_H_
|
#define RENDERVIEW_H_
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Thumbnail.cpp
|
|
||||||
*
|
|
||||||
* Created on: Apr 3, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "Thumbnail.h"
|
#include "Thumbnail.h"
|
||||||
|
|
||||||
Thumbnail::Thumbnail(const Thumbnail & thumb):
|
Thumbnail::Thumbnail(const Thumbnail & thumb):
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Elements.h
|
|
||||||
*
|
|
||||||
* Created on: Jan 5, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ELEMENTS_H_
|
#ifndef ELEMENTS_H_
|
||||||
#define ELEMENTS_H_
|
#define ELEMENTS_H_
|
||||||
|
|
||||||
@ -35,7 +28,7 @@
|
|||||||
#define PROP_LIFE_KILL 0x08000 //2^15 Kill when life value is <= zero
|
#define PROP_LIFE_KILL 0x08000 //2^15 Kill when life value is <= zero
|
||||||
#define PROP_LIFE_KILL_DEC 0x10000 //2^16 Kill when life value is decremented to <= zero
|
#define PROP_LIFE_KILL_DEC 0x10000 //2^16 Kill when life value is decremented to <= zero
|
||||||
#define PROP_SPARKSETTLE 0x20000 //2^17 Allow Sparks/Embers to settle
|
#define PROP_SPARKSETTLE 0x20000 //2^17 Allow Sparks/Embers to settle
|
||||||
#define PROP_NOAMBHEAT 0x40000 //2^18 Don't transfer or receive heat from ambient heat.
|
#define PROP_NOAMBHEAT 0x40000 //2^18 Don't transfer or receive heat from ambient heat.
|
||||||
|
|
||||||
#define FLAG_STAGNANT 0x1
|
#define FLAG_STAGNANT 0x1
|
||||||
#define FLAG_SKIPMOVE 0x2 // skip movement for one frame, only implemented for PHOT
|
#define FLAG_SKIPMOVE 0x2 // skip movement for one frame, only implemented for PHOT
|
||||||
|
@ -1,11 +1,3 @@
|
|||||||
//
|
|
||||||
// GOLMenu.h
|
|
||||||
// The Powder Toy
|
|
||||||
//
|
|
||||||
// Created by Simon Robertshaw on 04/06/2012.
|
|
||||||
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifndef The_Powder_Toy_GOLMenu_h
|
#ifndef The_Powder_Toy_GOLMenu_h
|
||||||
#define The_Powder_Toy_GOLMenu_h
|
#define The_Powder_Toy_GOLMenu_h
|
||||||
|
|
||||||
|
@ -1,13 +1,5 @@
|
|||||||
//
|
#ifndef MENUSECTION_H_
|
||||||
// MenuSection.h
|
#define MENUSECTION_H_
|
||||||
// The Powder Toy
|
|
||||||
//
|
|
||||||
// Created by Simon Robertshaw on 04/06/2012.
|
|
||||||
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifndef The_Powder_Toy_MenuSection_h
|
|
||||||
#define The_Powder_Toy_MenuSection_h
|
|
||||||
|
|
||||||
struct menu_section
|
struct menu_section
|
||||||
{
|
{
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* Particle.cpp
|
|
||||||
*
|
|
||||||
* Created on: Jun 6, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include "Particle.h"
|
#include "Particle.h"
|
||||||
|
|
||||||
|
@ -1,13 +1,5 @@
|
|||||||
//
|
#ifndef PARTICLE_H_
|
||||||
// Particle.h
|
#define PARTICLE_H_
|
||||||
// The Powder Toy
|
|
||||||
//
|
|
||||||
// Created by Simon Robertshaw on 04/06/2012.
|
|
||||||
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifndef The_Powder_Toy_Particle_h
|
|
||||||
#define The_Powder_Toy_Particle_h
|
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "StructProperty.h"
|
#include "StructProperty.h"
|
||||||
@ -24,7 +16,7 @@ struct Particle
|
|||||||
int tmp2;
|
int tmp2;
|
||||||
unsigned int dcolour;
|
unsigned int dcolour;
|
||||||
/** Returns a list of properties, their type and offset within the structure that can be changed
|
/** Returns a list of properties, their type and offset within the structure that can be changed
|
||||||
by higher-level processes refering to them by name such as Lua or the property tool **/
|
by higher-level processes referring to them by name such as Lua or the property tool **/
|
||||||
static std::vector<StructProperty> GetProperties();
|
static std::vector<StructProperty> GetProperties();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
/*
|
|
||||||
* SaveRenderer.cpp
|
|
||||||
*
|
|
||||||
* Created on: Apr 3, 2012
|
|
||||||
* Author: Simon
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "SaveRenderer.h"
|
#include "SaveRenderer.h"
|
||||||
#include "client/GameSave.h"
|
#include "client/GameSave.h"
|
||||||
#include "graphics/Graphics.h"
|
#include "graphics/Graphics.h"
|
||||||
@ -61,11 +54,11 @@ Thumbnail * SaveRenderer::Render(GameSave * save, bool decorations, bool fire)
|
|||||||
|
|
||||||
glTranslated(0, MENUSIZE, 0);
|
glTranslated(0, MENUSIZE, 0);
|
||||||
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo);
|
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo);
|
||||||
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
|
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
|
||||||
glClear(GL_COLOR_BUFFER_BIT);
|
glClear(GL_COLOR_BUFFER_BIT);
|
||||||
|
|
||||||
ren->clearScreen(1.0f);
|
ren->clearScreen(1.0f);
|
||||||
ren->ClearAccumulation();
|
ren->ClearAccumulation();
|
||||||
|
|
||||||
#ifdef OGLR
|
#ifdef OGLR
|
||||||
ren->RenderBegin();
|
ren->RenderBegin();
|
||||||
@ -120,7 +113,7 @@ Thumbnail * SaveRenderer::Render(GameSave * save, bool decorations, bool fire)
|
|||||||
pixel * dst;
|
pixel * dst;
|
||||||
pixel * src = g->vid;
|
pixel * src = g->vid;
|
||||||
|
|
||||||
ren->ClearAccumulation();
|
ren->ClearAccumulation();
|
||||||
|
|
||||||
if (fire)
|
if (fire)
|
||||||
{
|
{
|
||||||
@ -178,6 +171,5 @@ Thumbnail * SaveRenderer::Render(unsigned char * saveData, int dataSize, bool de
|
|||||||
}
|
}
|
||||||
|
|
||||||
SaveRenderer::~SaveRenderer() {
|
SaveRenderer::~SaveRenderer() {
|
||||||
// TODO Auto-generated destructor stub
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user