Use forward declarations more to avoid excessive includes

This commit is contained in:
Simon Robertshaw 2012-08-12 22:32:57 +01:00
parent ca7c0e7370
commit 8ca27520a4
129 changed files with 106839 additions and 228 deletions

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/cajun/elements.o \
../build/obj/powder/cajun/reader.o \
../build/obj/powder/cajun/writer.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,14 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/cat/CommandInterface.o \
../build/obj/powder/cat/LuaScriptInterface.o \
../build/obj/powder/cat/TPTSTypes.o \
../build/obj/powder/cat/TPTScriptInterface.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/client/Client.o \
../build/obj/powder/client/HTTP.o \
../build/obj/powder/client/MD5.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/console/ConsoleController.o \
../build/obj/powder/console/ConsoleModel.o \
../build/obj/powder/console/ConsoleView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/dialogues/ConfirmPrompt.o \
../build/obj/powder/dialogues/ErrorMessage.o \
../build/obj/powder/dialogues/TextPrompt.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,113 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/elements/O2.o \
../build/obj/powder/elements/acel.o \
../build/obj/powder/elements/acid.o \
../build/obj/powder/elements/amtr.o \
../build/obj/powder/elements/anar.o \
../build/obj/powder/elements/aray.o \
../build/obj/powder/elements/bang.o \
../build/obj/powder/elements/bcln.o \
../build/obj/powder/elements/bcol.o \
../build/obj/powder/elements/bizr.o \
../build/obj/powder/elements/bmtl.o \
../build/obj/powder/elements/bomb.o \
../build/obj/powder/elements/boyl.o \
../build/obj/powder/elements/brmt.o \
../build/obj/powder/elements/btry.o \
../build/obj/powder/elements/c5.o \
../build/obj/powder/elements/caus.o \
../build/obj/powder/elements/cbnw.o \
../build/obj/powder/elements/clne.o \
../build/obj/powder/elements/clst.o \
../build/obj/powder/elements/co2.o \
../build/obj/powder/elements/coal.o \
../build/obj/powder/elements/conv.o \
../build/obj/powder/elements/dest.o \
../build/obj/powder/elements/deut.o \
../build/obj/powder/elements/dlay.o \
../build/obj/powder/elements/dstw.o \
../build/obj/powder/elements/elec.o \
../build/obj/powder/elements/elementmisc.o \
../build/obj/powder/elements/emp.o \
../build/obj/powder/elements/figh.o \
../build/obj/powder/elements/fire.o \
../build/obj/powder/elements/firw.o \
../build/obj/powder/elements/fog.o \
../build/obj/powder/elements/fray.o \
../build/obj/powder/elements/frzw.o \
../build/obj/powder/elements/frzz.o \
../build/obj/powder/elements/fsep.o \
../build/obj/powder/elements/fuse.o \
../build/obj/powder/elements/fwrk.o \
../build/obj/powder/elements/gbmb.o \
../build/obj/powder/elements/gel.o \
../build/obj/powder/elements/glas.o \
../build/obj/powder/elements/glow.o \
../build/obj/powder/elements/goo.o \
../build/obj/powder/elements/gpmp.o \
../build/obj/powder/elements/graphics_default.o \
../build/obj/powder/elements/h2.o \
../build/obj/powder/elements/hswc.o \
../build/obj/powder/elements/ice.o \
../build/obj/powder/elements/ignt.o \
../build/obj/powder/elements/iron.o \
../build/obj/powder/elements/isz.o \
../build/obj/powder/elements/lava.o \
../build/obj/powder/elements/lcry.o \
../build/obj/powder/elements/legacy.o \
../build/obj/powder/elements/ligh.o \
../build/obj/powder/elements/merc.o \
../build/obj/powder/elements/mort.o \
../build/obj/powder/elements/nbhl.o \
../build/obj/powder/elements/nble.o \
../build/obj/powder/elements/neut.o \
../build/obj/powder/elements/newgraphics.o \
../build/obj/powder/elements/none.o \
../build/obj/powder/elements/nptct.o \
../build/obj/powder/elements/nwhl.o \
../build/obj/powder/elements/pbcn.o \
../build/obj/powder/elements/pcln.o \
../build/obj/powder/elements/phot.o \
../build/obj/powder/elements/pipe.o \
../build/obj/powder/elements/plnt.o \
../build/obj/powder/elements/plsm.o \
../build/obj/powder/elements/plut.o \
../build/obj/powder/elements/prti.o \
../build/obj/powder/elements/prto.o \
../build/obj/powder/elements/pump.o \
../build/obj/powder/elements/pvod.o \
../build/obj/powder/elements/pyro.o \
../build/obj/powder/elements/qrtz.o \
../build/obj/powder/elements/repl.o \
../build/obj/powder/elements/rime.o \
../build/obj/powder/elements/shld.o \
../build/obj/powder/elements/sing.o \
../build/obj/powder/elements/sltw.o \
../build/obj/powder/elements/smke.o \
../build/obj/powder/elements/soap.o \
../build/obj/powder/elements/spng.o \
../build/obj/powder/elements/sprk.o \
../build/obj/powder/elements/stkm.o \
../build/obj/powder/elements/stkm2.o \
../build/obj/powder/elements/stor.o \
../build/obj/powder/elements/swch.o \
../build/obj/powder/elements/thdr.o \
../build/obj/powder/elements/thrm.o \
../build/obj/powder/elements/tron.o \
../build/obj/powder/elements/uran.o \
../build/obj/powder/elements/vine.o \
../build/obj/powder/elements/warp.o \
../build/obj/powder/elements/watr.o \
../build/obj/powder/elements/wifi.o \
../build/obj/powder/elements/wire.o \
../build/obj/powder/elements/wtrv.o \
../build/obj/powder/elements/yest.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,14 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/game/GameController.o \
../build/obj/powder/game/GameModel.o \
../build/obj/powder/game/GameView.o \
../build/obj/powder/game/ToolButton.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,25 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/interface/Button.o \
../build/obj/powder/interface/Checkbox.o \
../build/obj/powder/interface/Component.o \
../build/obj/powder/interface/ControlFactory.o \
../build/obj/powder/interface/DropDown.o \
../build/obj/powder/interface/Engine.o \
../build/obj/powder/interface/Label.o \
../build/obj/powder/interface/Panel.o \
../build/obj/powder/interface/SaveButton.o \
../build/obj/powder/interface/Slider.o \
../build/obj/powder/interface/Spinner.o \
../build/obj/powder/interface/Textarea.o \
../build/obj/powder/interface/Textblock.o \
../build/obj/powder/interface/Textbox.o \
../build/obj/powder/interface/Window.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/login/LoginController.o \
../build/obj/powder/login/LoginModel.o \
../build/obj/powder/login/LoginView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/options/OptionsController.o \
../build/obj/powder/options/OptionsModel.o \
../build/obj/powder/options/OptionsView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/preview/PreviewController.o \
../build/obj/powder/preview/PreviewModel.o \
../build/obj/powder/preview/PreviewView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/render/RenderController.o \
../build/obj/powder/render/RenderModel.o \
../build/obj/powder/render/RenderView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,15 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/search/Save.o \
../build/obj/powder/search/SearchController.o \
../build/obj/powder/search/SearchModel.o \
../build/obj/powder/search/SearchView.o \
../build/obj/powder/search/Thumbnail.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,17 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/simulation/Air.o \
../build/obj/powder/simulation/Gravity.o \
../build/obj/powder/simulation/SaveLoader.o \
../build/obj/powder/simulation/SaveRenderer.o \
../build/obj/powder/simulation/Simulation.o \
../build/obj/powder/simulation/SimulationData.o \
../build/obj/powder/simulation/Solids.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/ssave/SSaveController.o \
../build/obj/powder/ssave/SSaveModel.o \
../build/obj/powder/ssave/SSaveView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/stamps/StampsController.o \
../build/obj/powder/stamps/StampsModel.o \
../build/obj/powder/stamps/StampsView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,15 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/Console.o \
../build/obj/powder/Graphics.o \
../build/obj/powder/Misc.o \
../build/obj/powder/PowderToy.o \
../build/obj/powder/Renderer.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/tags/TagsController.o \
../build/obj/powder/tags/TagsModel.o \
../build/obj/powder/tags/TagsView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,12 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/tasks/Task.o \
../build/obj/powder/tasks/TaskWindow.o
# Each subdirectory must supply rules for building sources it contributes

96
Debug/makefile Normal file
View File

@ -0,0 +1,96 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
-include ../makefile.init
RM := rm -rf
# All of the sources participating in the build are defined here
-include sources.mk
-include subdir.mk
-include src/tasks/subdir.mk
-include src/tags/subdir.mk
-include src/stamps/subdir.mk
-include src/ssave/subdir.mk
-include src/simulation/subdir.mk
-include src/search/subdir.mk
-include src/render/subdir.mk
-include src/preview/subdir.mk
-include src/options/subdir.mk
-include src/login/subdir.mk
-include src/interface/subdir.mk
-include src/game/subdir.mk
-include src/elements/subdir.mk
-include src/dialogues/subdir.mk
-include src/console/subdir.mk
-include src/client/subdir.mk
-include src/cat/subdir.mk
-include src/cajun/subdir.mk
-include src/subdir.mk
-include build/obj/powder/tasks/subdir.mk
-include build/obj/powder/tags/subdir.mk
-include build/obj/powder/stamps/subdir.mk
-include build/obj/powder/ssave/subdir.mk
-include build/obj/powder/simulation/subdir.mk
-include build/obj/powder/search/subdir.mk
-include build/obj/powder/render/subdir.mk
-include build/obj/powder/preview/subdir.mk
-include build/obj/powder/options/subdir.mk
-include build/obj/powder/login/subdir.mk
-include build/obj/powder/interface/subdir.mk
-include build/obj/powder/game/subdir.mk
-include build/obj/powder/elements/subdir.mk
-include build/obj/powder/dialogues/subdir.mk
-include build/obj/powder/console/subdir.mk
-include build/obj/powder/client/subdir.mk
-include build/obj/powder/cat/subdir.mk
-include build/obj/powder/cajun/subdir.mk
-include build/obj/powder/subdir.mk
-include objects.mk
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(strip $(C++_DEPS)),)
-include $(C++_DEPS)
endif
ifneq ($(strip $(C_DEPS)),)
-include $(C_DEPS)
endif
ifneq ($(strip $(CC_DEPS)),)
-include $(CC_DEPS)
endif
ifneq ($(strip $(CPP_DEPS)),)
-include $(CPP_DEPS)
endif
ifneq ($(strip $(CXX_DEPS)),)
-include $(CXX_DEPS)
endif
ifneq ($(strip $(C_UPPER_DEPS)),)
-include $(C_UPPER_DEPS)
endif
endif
-include ../makefile.defs
# Add inputs and outputs from these tool invocations to the build variables
# All Target
all: PowderToypp
# Tool invocations
PowderToypp: $(OBJS) $(USER_OBJS)
@echo 'Building target: $@'
@echo 'Invoking: GCC C++ Linker'
g++ -o"PowderToypp" $(OBJS) $(USER_OBJS) $(LIBS)
@echo 'Finished building target: $@'
@echo ' '
# Other Targets
clean:
-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) PowderToypp
-@echo ' '
.PHONY: all clean dependents
.SECONDARY:
-include ../makefile.targets

7
Debug/objects.mk Normal file
View File

@ -0,0 +1,7 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
USER_OBJS :=
LIBS :=

64
Debug/sources.mk Normal file
View File

@ -0,0 +1,64 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
O_SRCS :=
CPP_SRCS :=
C_UPPER_SRCS :=
C_SRCS :=
S_UPPER_SRCS :=
OBJ_SRCS :=
ASM_SRCS :=
CXX_SRCS :=
C++_SRCS :=
CC_SRCS :=
OBJS :=
C++_DEPS :=
C_DEPS :=
CC_DEPS :=
CPP_DEPS :=
EXECUTABLES :=
CXX_DEPS :=
C_UPPER_DEPS :=
# Every subdirectory with source files must be described here
SUBDIRS := \
src/tasks \
src/tags \
src/stamps \
src/ssave \
src/simulation \
src/search \
src/render \
src/preview \
src/options \
src/login \
src/interface \
src/game \
src/elements \
src/dialogues \
src/console \
src/client \
src/cat \
src/cajun \
src \
build/obj/powder/tasks \
build/obj/powder/tags \
build/obj/powder/stamps \
build/obj/powder/ssave \
build/obj/powder/simulation \
build/obj/powder/search \
build/obj/powder/render \
build/obj/powder/preview \
build/obj/powder/options \
build/obj/powder/login \
build/obj/powder/interface \
build/obj/powder/game \
build/obj/powder/elements \
build/obj/powder/dialogues \
build/obj/powder/console \
build/obj/powder/client \
build/obj/powder/cat \
build/obj/powder/cajun \
build/obj/powder \

30
Debug/src/cajun/subdir.mk Normal file
View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/cajun/elements.cpp \
../src/cajun/reader.cpp \
../src/cajun/writer.cpp
OBJS += \
./src/cajun/elements.o \
./src/cajun/reader.o \
./src/cajun/writer.o
CPP_DEPS += \
./src/cajun/elements.d \
./src/cajun/reader.d \
./src/cajun/writer.d
# Each subdirectory must supply rules for building sources it contributes
src/cajun/%.o: ../src/cajun/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

33
Debug/src/cat/subdir.mk Normal file
View File

@ -0,0 +1,33 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/cat/CommandInterface.cpp \
../src/cat/LuaScriptInterface.cpp \
../src/cat/TPTSTypes.cpp \
../src/cat/TPTScriptInterface.cpp
OBJS += \
./src/cat/CommandInterface.o \
./src/cat/LuaScriptInterface.o \
./src/cat/TPTSTypes.o \
./src/cat/TPTScriptInterface.o
CPP_DEPS += \
./src/cat/CommandInterface.d \
./src/cat/LuaScriptInterface.d \
./src/cat/TPTSTypes.d \
./src/cat/TPTScriptInterface.d
# Each subdirectory must supply rules for building sources it contributes
src/cat/%.o: ../src/cat/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/client/Client.cpp \
../src/client/HTTP.cpp \
../src/client/MD5.cpp
OBJS += \
./src/client/Client.o \
./src/client/HTTP.o \
./src/client/MD5.o
CPP_DEPS += \
./src/client/Client.d \
./src/client/HTTP.d \
./src/client/MD5.d
# Each subdirectory must supply rules for building sources it contributes
src/client/%.o: ../src/client/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/console/ConsoleController.cpp \
../src/console/ConsoleModel.cpp \
../src/console/ConsoleView.cpp
OBJS += \
./src/console/ConsoleController.o \
./src/console/ConsoleModel.o \
./src/console/ConsoleView.o
CPP_DEPS += \
./src/console/ConsoleController.d \
./src/console/ConsoleModel.d \
./src/console/ConsoleView.d
# Each subdirectory must supply rules for building sources it contributes
src/console/%.o: ../src/console/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/dialogues/ConfirmPrompt.cpp \
../src/dialogues/ErrorMessage.cpp \
../src/dialogues/TextPrompt.cpp
OBJS += \
./src/dialogues/ConfirmPrompt.o \
./src/dialogues/ErrorMessage.o \
./src/dialogues/TextPrompt.o
CPP_DEPS += \
./src/dialogues/ConfirmPrompt.d \
./src/dialogues/ErrorMessage.d \
./src/dialogues/TextPrompt.d
# Each subdirectory must supply rules for building sources it contributes
src/dialogues/%.o: ../src/dialogues/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,330 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/elements/O2.cpp \
../src/elements/acel.cpp \
../src/elements/acid.cpp \
../src/elements/amtr.cpp \
../src/elements/anar.cpp \
../src/elements/aray.cpp \
../src/elements/bang.cpp \
../src/elements/bcln.cpp \
../src/elements/bcol.cpp \
../src/elements/bizr.cpp \
../src/elements/bmtl.cpp \
../src/elements/bomb.cpp \
../src/elements/boyl.cpp \
../src/elements/brmt.cpp \
../src/elements/btry.cpp \
../src/elements/c5.cpp \
../src/elements/caus.cpp \
../src/elements/cbnw.cpp \
../src/elements/clne.cpp \
../src/elements/clst.cpp \
../src/elements/co2.cpp \
../src/elements/coal.cpp \
../src/elements/conv.cpp \
../src/elements/dest.cpp \
../src/elements/deut.cpp \
../src/elements/dlay.cpp \
../src/elements/dstw.cpp \
../src/elements/elec.cpp \
../src/elements/elementmisc.cpp \
../src/elements/emp.cpp \
../src/elements/figh.cpp \
../src/elements/fire.cpp \
../src/elements/firw.cpp \
../src/elements/fog.cpp \
../src/elements/fray.cpp \
../src/elements/frzw.cpp \
../src/elements/frzz.cpp \
../src/elements/fsep.cpp \
../src/elements/fuse.cpp \
../src/elements/fwrk.cpp \
../src/elements/gbmb.cpp \
../src/elements/gel.cpp \
../src/elements/glas.cpp \
../src/elements/glow.cpp \
../src/elements/goo.cpp \
../src/elements/gpmp.cpp \
../src/elements/graphics_default.cpp \
../src/elements/h2.cpp \
../src/elements/hswc.cpp \
../src/elements/ice.cpp \
../src/elements/ignt.cpp \
../src/elements/iron.cpp \
../src/elements/isz.cpp \
../src/elements/lava.cpp \
../src/elements/lcry.cpp \
../src/elements/legacy.cpp \
../src/elements/ligh.cpp \
../src/elements/merc.cpp \
../src/elements/mort.cpp \
../src/elements/nbhl.cpp \
../src/elements/nble.cpp \
../src/elements/neut.cpp \
../src/elements/newgraphics.cpp \
../src/elements/none.cpp \
../src/elements/nptct.cpp \
../src/elements/nwhl.cpp \
../src/elements/pbcn.cpp \
../src/elements/pcln.cpp \
../src/elements/phot.cpp \
../src/elements/pipe.cpp \
../src/elements/plnt.cpp \
../src/elements/plsm.cpp \
../src/elements/plut.cpp \
../src/elements/prti.cpp \
../src/elements/prto.cpp \
../src/elements/pump.cpp \
../src/elements/pvod.cpp \
../src/elements/pyro.cpp \
../src/elements/qrtz.cpp \
../src/elements/repl.cpp \
../src/elements/rime.cpp \
../src/elements/shld.cpp \
../src/elements/sing.cpp \
../src/elements/sltw.cpp \
../src/elements/smke.cpp \
../src/elements/soap.cpp \
../src/elements/spng.cpp \
../src/elements/sprk.cpp \
../src/elements/stkm.cpp \
../src/elements/stkm2.cpp \
../src/elements/stor.cpp \
../src/elements/swch.cpp \
../src/elements/thdr.cpp \
../src/elements/thrm.cpp \
../src/elements/tron.cpp \
../src/elements/uran.cpp \
../src/elements/vine.cpp \
../src/elements/warp.cpp \
../src/elements/watr.cpp \
../src/elements/wifi.cpp \
../src/elements/wire.cpp \
../src/elements/wtrv.cpp \
../src/elements/yest.cpp
OBJS += \
./src/elements/O2.o \
./src/elements/acel.o \
./src/elements/acid.o \
./src/elements/amtr.o \
./src/elements/anar.o \
./src/elements/aray.o \
./src/elements/bang.o \
./src/elements/bcln.o \
./src/elements/bcol.o \
./src/elements/bizr.o \
./src/elements/bmtl.o \
./src/elements/bomb.o \
./src/elements/boyl.o \
./src/elements/brmt.o \
./src/elements/btry.o \
./src/elements/c5.o \
./src/elements/caus.o \
./src/elements/cbnw.o \
./src/elements/clne.o \
./src/elements/clst.o \
./src/elements/co2.o \
./src/elements/coal.o \
./src/elements/conv.o \
./src/elements/dest.o \
./src/elements/deut.o \
./src/elements/dlay.o \
./src/elements/dstw.o \
./src/elements/elec.o \
./src/elements/elementmisc.o \
./src/elements/emp.o \
./src/elements/figh.o \
./src/elements/fire.o \
./src/elements/firw.o \
./src/elements/fog.o \
./src/elements/fray.o \
./src/elements/frzw.o \
./src/elements/frzz.o \
./src/elements/fsep.o \
./src/elements/fuse.o \
./src/elements/fwrk.o \
./src/elements/gbmb.o \
./src/elements/gel.o \
./src/elements/glas.o \
./src/elements/glow.o \
./src/elements/goo.o \
./src/elements/gpmp.o \
./src/elements/graphics_default.o \
./src/elements/h2.o \
./src/elements/hswc.o \
./src/elements/ice.o \
./src/elements/ignt.o \
./src/elements/iron.o \
./src/elements/isz.o \
./src/elements/lava.o \
./src/elements/lcry.o \
./src/elements/legacy.o \
./src/elements/ligh.o \
./src/elements/merc.o \
./src/elements/mort.o \
./src/elements/nbhl.o \
./src/elements/nble.o \
./src/elements/neut.o \
./src/elements/newgraphics.o \
./src/elements/none.o \
./src/elements/nptct.o \
./src/elements/nwhl.o \
./src/elements/pbcn.o \
./src/elements/pcln.o \
./src/elements/phot.o \
./src/elements/pipe.o \
./src/elements/plnt.o \
./src/elements/plsm.o \
./src/elements/plut.o \
./src/elements/prti.o \
./src/elements/prto.o \
./src/elements/pump.o \
./src/elements/pvod.o \
./src/elements/pyro.o \
./src/elements/qrtz.o \
./src/elements/repl.o \
./src/elements/rime.o \
./src/elements/shld.o \
./src/elements/sing.o \
./src/elements/sltw.o \
./src/elements/smke.o \
./src/elements/soap.o \
./src/elements/spng.o \
./src/elements/sprk.o \
./src/elements/stkm.o \
./src/elements/stkm2.o \
./src/elements/stor.o \
./src/elements/swch.o \
./src/elements/thdr.o \
./src/elements/thrm.o \
./src/elements/tron.o \
./src/elements/uran.o \
./src/elements/vine.o \
./src/elements/warp.o \
./src/elements/watr.o \
./src/elements/wifi.o \
./src/elements/wire.o \
./src/elements/wtrv.o \
./src/elements/yest.o
CPP_DEPS += \
./src/elements/O2.d \
./src/elements/acel.d \
./src/elements/acid.d \
./src/elements/amtr.d \
./src/elements/anar.d \
./src/elements/aray.d \
./src/elements/bang.d \
./src/elements/bcln.d \
./src/elements/bcol.d \
./src/elements/bizr.d \
./src/elements/bmtl.d \
./src/elements/bomb.d \
./src/elements/boyl.d \
./src/elements/brmt.d \
./src/elements/btry.d \
./src/elements/c5.d \
./src/elements/caus.d \
./src/elements/cbnw.d \
./src/elements/clne.d \
./src/elements/clst.d \
./src/elements/co2.d \
./src/elements/coal.d \
./src/elements/conv.d \
./src/elements/dest.d \
./src/elements/deut.d \
./src/elements/dlay.d \
./src/elements/dstw.d \
./src/elements/elec.d \
./src/elements/elementmisc.d \
./src/elements/emp.d \
./src/elements/figh.d \
./src/elements/fire.d \
./src/elements/firw.d \
./src/elements/fog.d \
./src/elements/fray.d \
./src/elements/frzw.d \
./src/elements/frzz.d \
./src/elements/fsep.d \
./src/elements/fuse.d \
./src/elements/fwrk.d \
./src/elements/gbmb.d \
./src/elements/gel.d \
./src/elements/glas.d \
./src/elements/glow.d \
./src/elements/goo.d \
./src/elements/gpmp.d \
./src/elements/graphics_default.d \
./src/elements/h2.d \
./src/elements/hswc.d \
./src/elements/ice.d \
./src/elements/ignt.d \
./src/elements/iron.d \
./src/elements/isz.d \
./src/elements/lava.d \
./src/elements/lcry.d \
./src/elements/legacy.d \
./src/elements/ligh.d \
./src/elements/merc.d \
./src/elements/mort.d \
./src/elements/nbhl.d \
./src/elements/nble.d \
./src/elements/neut.d \
./src/elements/newgraphics.d \
./src/elements/none.d \
./src/elements/nptct.d \
./src/elements/nwhl.d \
./src/elements/pbcn.d \
./src/elements/pcln.d \
./src/elements/phot.d \
./src/elements/pipe.d \
./src/elements/plnt.d \
./src/elements/plsm.d \
./src/elements/plut.d \
./src/elements/prti.d \
./src/elements/prto.d \
./src/elements/pump.d \
./src/elements/pvod.d \
./src/elements/pyro.d \
./src/elements/qrtz.d \
./src/elements/repl.d \
./src/elements/rime.d \
./src/elements/shld.d \
./src/elements/sing.d \
./src/elements/sltw.d \
./src/elements/smke.d \
./src/elements/soap.d \
./src/elements/spng.d \
./src/elements/sprk.d \
./src/elements/stkm.d \
./src/elements/stkm2.d \
./src/elements/stor.d \
./src/elements/swch.d \
./src/elements/thdr.d \
./src/elements/thrm.d \
./src/elements/tron.d \
./src/elements/uran.d \
./src/elements/vine.d \
./src/elements/warp.d \
./src/elements/watr.d \
./src/elements/wifi.d \
./src/elements/wire.d \
./src/elements/wtrv.d \
./src/elements/yest.d
# Each subdirectory must supply rules for building sources it contributes
src/elements/%.o: ../src/elements/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

33
Debug/src/game/subdir.mk Normal file
View File

@ -0,0 +1,33 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/game/GameController.cpp \
../src/game/GameModel.cpp \
../src/game/GameView.cpp \
../src/game/ToolButton.cpp
OBJS += \
./src/game/GameController.o \
./src/game/GameModel.o \
./src/game/GameView.o \
./src/game/ToolButton.o
CPP_DEPS += \
./src/game/GameController.d \
./src/game/GameModel.d \
./src/game/GameView.d \
./src/game/ToolButton.d
# Each subdirectory must supply rules for building sources it contributes
src/game/%.o: ../src/game/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,66 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/interface/Button.cpp \
../src/interface/Checkbox.cpp \
../src/interface/Component.cpp \
../src/interface/ControlFactory.cpp \
../src/interface/DropDown.cpp \
../src/interface/Engine.cpp \
../src/interface/Label.cpp \
../src/interface/Panel.cpp \
../src/interface/SaveButton.cpp \
../src/interface/Slider.cpp \
../src/interface/Spinner.cpp \
../src/interface/Textarea.cpp \
../src/interface/Textblock.cpp \
../src/interface/Textbox.cpp \
../src/interface/Window.cpp
OBJS += \
./src/interface/Button.o \
./src/interface/Checkbox.o \
./src/interface/Component.o \
./src/interface/ControlFactory.o \
./src/interface/DropDown.o \
./src/interface/Engine.o \
./src/interface/Label.o \
./src/interface/Panel.o \
./src/interface/SaveButton.o \
./src/interface/Slider.o \
./src/interface/Spinner.o \
./src/interface/Textarea.o \
./src/interface/Textblock.o \
./src/interface/Textbox.o \
./src/interface/Window.o
CPP_DEPS += \
./src/interface/Button.d \
./src/interface/Checkbox.d \
./src/interface/Component.d \
./src/interface/ControlFactory.d \
./src/interface/DropDown.d \
./src/interface/Engine.d \
./src/interface/Label.d \
./src/interface/Panel.d \
./src/interface/SaveButton.d \
./src/interface/Slider.d \
./src/interface/Spinner.d \
./src/interface/Textarea.d \
./src/interface/Textblock.d \
./src/interface/Textbox.d \
./src/interface/Window.d
# Each subdirectory must supply rules for building sources it contributes
src/interface/%.o: ../src/interface/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

30
Debug/src/login/subdir.mk Normal file
View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/login/LoginController.cpp \
../src/login/LoginModel.cpp \
../src/login/LoginView.cpp
OBJS += \
./src/login/LoginController.o \
./src/login/LoginModel.o \
./src/login/LoginView.o
CPP_DEPS += \
./src/login/LoginController.d \
./src/login/LoginModel.d \
./src/login/LoginView.d
# Each subdirectory must supply rules for building sources it contributes
src/login/%.o: ../src/login/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/options/OptionsController.cpp \
../src/options/OptionsModel.cpp \
../src/options/OptionsView.cpp
OBJS += \
./src/options/OptionsController.o \
./src/options/OptionsModel.o \
./src/options/OptionsView.o
CPP_DEPS += \
./src/options/OptionsController.d \
./src/options/OptionsModel.d \
./src/options/OptionsView.d
# Each subdirectory must supply rules for building sources it contributes
src/options/%.o: ../src/options/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/preview/PreviewController.cpp \
../src/preview/PreviewModel.cpp \
../src/preview/PreviewView.cpp
OBJS += \
./src/preview/PreviewController.o \
./src/preview/PreviewModel.o \
./src/preview/PreviewView.o
CPP_DEPS += \
./src/preview/PreviewController.d \
./src/preview/PreviewModel.d \
./src/preview/PreviewView.d
# Each subdirectory must supply rules for building sources it contributes
src/preview/%.o: ../src/preview/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/render/RenderController.cpp \
../src/render/RenderModel.cpp \
../src/render/RenderView.cpp
OBJS += \
./src/render/RenderController.o \
./src/render/RenderModel.o \
./src/render/RenderView.o
CPP_DEPS += \
./src/render/RenderController.d \
./src/render/RenderModel.d \
./src/render/RenderView.d
# Each subdirectory must supply rules for building sources it contributes
src/render/%.o: ../src/render/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,36 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/search/Save.cpp \
../src/search/SearchController.cpp \
../src/search/SearchModel.cpp \
../src/search/SearchView.cpp \
../src/search/Thumbnail.cpp
OBJS += \
./src/search/Save.o \
./src/search/SearchController.o \
./src/search/SearchModel.o \
./src/search/SearchView.o \
./src/search/Thumbnail.o
CPP_DEPS += \
./src/search/Save.d \
./src/search/SearchController.d \
./src/search/SearchModel.d \
./src/search/SearchView.d \
./src/search/Thumbnail.d
# Each subdirectory must supply rules for building sources it contributes
src/search/%.o: ../src/search/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,42 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/simulation/Air.cpp \
../src/simulation/Gravity.cpp \
../src/simulation/SaveLoader.cpp \
../src/simulation/SaveRenderer.cpp \
../src/simulation/Simulation.cpp \
../src/simulation/SimulationData.cpp \
../src/simulation/Solids.cpp
OBJS += \
./src/simulation/Air.o \
./src/simulation/Gravity.o \
./src/simulation/SaveLoader.o \
./src/simulation/SaveRenderer.o \
./src/simulation/Simulation.o \
./src/simulation/SimulationData.o \
./src/simulation/Solids.o
CPP_DEPS += \
./src/simulation/Air.d \
./src/simulation/Gravity.d \
./src/simulation/SaveLoader.d \
./src/simulation/SaveRenderer.d \
./src/simulation/Simulation.d \
./src/simulation/SimulationData.d \
./src/simulation/Solids.d
# Each subdirectory must supply rules for building sources it contributes
src/simulation/%.o: ../src/simulation/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

30
Debug/src/ssave/subdir.mk Normal file
View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/ssave/SSaveController.cpp \
../src/ssave/SSaveModel.cpp \
../src/ssave/SSaveView.cpp
OBJS += \
./src/ssave/SSaveController.o \
./src/ssave/SSaveModel.o \
./src/ssave/SSaveView.o
CPP_DEPS += \
./src/ssave/SSaveController.d \
./src/ssave/SSaveModel.d \
./src/ssave/SSaveView.d
# Each subdirectory must supply rules for building sources it contributes
src/ssave/%.o: ../src/ssave/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/stamps/StampsController.cpp \
../src/stamps/StampsModel.cpp \
../src/stamps/StampsView.cpp
OBJS += \
./src/stamps/StampsController.o \
./src/stamps/StampsModel.o \
./src/stamps/StampsView.o
CPP_DEPS += \
./src/stamps/StampsController.d \
./src/stamps/StampsModel.d \
./src/stamps/StampsView.d
# Each subdirectory must supply rules for building sources it contributes
src/stamps/%.o: ../src/stamps/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

36
Debug/src/subdir.mk Normal file
View File

@ -0,0 +1,36 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/Console.cpp \
../src/Graphics.cpp \
../src/Misc.cpp \
../src/PowderToy.cpp \
../src/Renderer.cpp
OBJS += \
./src/Console.o \
./src/Graphics.o \
./src/Misc.o \
./src/PowderToy.o \
./src/Renderer.o
CPP_DEPS += \
./src/Console.d \
./src/Graphics.d \
./src/Misc.d \
./src/PowderToy.d \
./src/Renderer.d
# Each subdirectory must supply rules for building sources it contributes
src/%.o: ../src/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

30
Debug/src/tags/subdir.mk Normal file
View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/tags/TagsController.cpp \
../src/tags/TagsModel.cpp \
../src/tags/TagsView.cpp
OBJS += \
./src/tags/TagsController.o \
./src/tags/TagsModel.o \
./src/tags/TagsView.o
CPP_DEPS += \
./src/tags/TagsController.d \
./src/tags/TagsModel.d \
./src/tags/TagsView.d
# Each subdirectory must supply rules for building sources it contributes
src/tags/%.o: ../src/tags/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

6
Debug/src/tasks/Task.d Normal file
View File

@ -0,0 +1,6 @@
src/tasks/Task.d: ../src/tasks/Task.cpp ../src/tasks/Task.h \
../src/tasks/TaskListener.h
../src/tasks/Task.h:
../src/tasks/TaskListener.h:

27
Debug/src/tasks/subdir.mk Normal file
View File

@ -0,0 +1,27 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/tasks/Task.cpp \
../src/tasks/TaskWindow.cpp
OBJS += \
./src/tasks/Task.o \
./src/tasks/TaskWindow.o
CPP_DEPS += \
./src/tasks/Task.d \
./src/tasks/TaskWindow.d
# Each subdirectory must supply rules for building sources it contributes
src/tasks/%.o: ../src/tasks/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

4
PowderToypp.layout Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Debug" />
</CodeBlocks_layout_file>

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/cajun/elements.o \
../build/obj/powder/cajun/reader.o \
../build/obj/powder/cajun/writer.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,14 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/cat/CommandInterface.o \
../build/obj/powder/cat/LuaScriptInterface.o \
../build/obj/powder/cat/TPTSTypes.o \
../build/obj/powder/cat/TPTScriptInterface.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/client/Client.o \
../build/obj/powder/client/HTTP.o \
../build/obj/powder/client/MD5.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/console/ConsoleController.o \
../build/obj/powder/console/ConsoleModel.o \
../build/obj/powder/console/ConsoleView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/dialogues/ConfirmPrompt.o \
../build/obj/powder/dialogues/ErrorMessage.o \
../build/obj/powder/dialogues/TextPrompt.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,113 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/elements/O2.o \
../build/obj/powder/elements/acel.o \
../build/obj/powder/elements/acid.o \
../build/obj/powder/elements/amtr.o \
../build/obj/powder/elements/anar.o \
../build/obj/powder/elements/aray.o \
../build/obj/powder/elements/bang.o \
../build/obj/powder/elements/bcln.o \
../build/obj/powder/elements/bcol.o \
../build/obj/powder/elements/bizr.o \
../build/obj/powder/elements/bmtl.o \
../build/obj/powder/elements/bomb.o \
../build/obj/powder/elements/boyl.o \
../build/obj/powder/elements/brmt.o \
../build/obj/powder/elements/btry.o \
../build/obj/powder/elements/c5.o \
../build/obj/powder/elements/caus.o \
../build/obj/powder/elements/cbnw.o \
../build/obj/powder/elements/clne.o \
../build/obj/powder/elements/clst.o \
../build/obj/powder/elements/co2.o \
../build/obj/powder/elements/coal.o \
../build/obj/powder/elements/conv.o \
../build/obj/powder/elements/dest.o \
../build/obj/powder/elements/deut.o \
../build/obj/powder/elements/dlay.o \
../build/obj/powder/elements/dstw.o \
../build/obj/powder/elements/elec.o \
../build/obj/powder/elements/elementmisc.o \
../build/obj/powder/elements/emp.o \
../build/obj/powder/elements/figh.o \
../build/obj/powder/elements/fire.o \
../build/obj/powder/elements/firw.o \
../build/obj/powder/elements/fog.o \
../build/obj/powder/elements/fray.o \
../build/obj/powder/elements/frzw.o \
../build/obj/powder/elements/frzz.o \
../build/obj/powder/elements/fsep.o \
../build/obj/powder/elements/fuse.o \
../build/obj/powder/elements/fwrk.o \
../build/obj/powder/elements/gbmb.o \
../build/obj/powder/elements/gel.o \
../build/obj/powder/elements/glas.o \
../build/obj/powder/elements/glow.o \
../build/obj/powder/elements/goo.o \
../build/obj/powder/elements/gpmp.o \
../build/obj/powder/elements/graphics_default.o \
../build/obj/powder/elements/h2.o \
../build/obj/powder/elements/hswc.o \
../build/obj/powder/elements/ice.o \
../build/obj/powder/elements/ignt.o \
../build/obj/powder/elements/iron.o \
../build/obj/powder/elements/isz.o \
../build/obj/powder/elements/lava.o \
../build/obj/powder/elements/lcry.o \
../build/obj/powder/elements/legacy.o \
../build/obj/powder/elements/ligh.o \
../build/obj/powder/elements/merc.o \
../build/obj/powder/elements/mort.o \
../build/obj/powder/elements/nbhl.o \
../build/obj/powder/elements/nble.o \
../build/obj/powder/elements/neut.o \
../build/obj/powder/elements/newgraphics.o \
../build/obj/powder/elements/none.o \
../build/obj/powder/elements/nptct.o \
../build/obj/powder/elements/nwhl.o \
../build/obj/powder/elements/pbcn.o \
../build/obj/powder/elements/pcln.o \
../build/obj/powder/elements/phot.o \
../build/obj/powder/elements/pipe.o \
../build/obj/powder/elements/plnt.o \
../build/obj/powder/elements/plsm.o \
../build/obj/powder/elements/plut.o \
../build/obj/powder/elements/prti.o \
../build/obj/powder/elements/prto.o \
../build/obj/powder/elements/pump.o \
../build/obj/powder/elements/pvod.o \
../build/obj/powder/elements/pyro.o \
../build/obj/powder/elements/qrtz.o \
../build/obj/powder/elements/repl.o \
../build/obj/powder/elements/rime.o \
../build/obj/powder/elements/shld.o \
../build/obj/powder/elements/sing.o \
../build/obj/powder/elements/sltw.o \
../build/obj/powder/elements/smke.o \
../build/obj/powder/elements/soap.o \
../build/obj/powder/elements/spng.o \
../build/obj/powder/elements/sprk.o \
../build/obj/powder/elements/stkm.o \
../build/obj/powder/elements/stkm2.o \
../build/obj/powder/elements/stor.o \
../build/obj/powder/elements/swch.o \
../build/obj/powder/elements/thdr.o \
../build/obj/powder/elements/thrm.o \
../build/obj/powder/elements/tron.o \
../build/obj/powder/elements/uran.o \
../build/obj/powder/elements/vine.o \
../build/obj/powder/elements/warp.o \
../build/obj/powder/elements/watr.o \
../build/obj/powder/elements/wifi.o \
../build/obj/powder/elements/wire.o \
../build/obj/powder/elements/wtrv.o \
../build/obj/powder/elements/yest.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,14 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/game/GameController.o \
../build/obj/powder/game/GameModel.o \
../build/obj/powder/game/GameView.o \
../build/obj/powder/game/ToolButton.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,25 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/interface/Button.o \
../build/obj/powder/interface/Checkbox.o \
../build/obj/powder/interface/Component.o \
../build/obj/powder/interface/ControlFactory.o \
../build/obj/powder/interface/DropDown.o \
../build/obj/powder/interface/Engine.o \
../build/obj/powder/interface/Label.o \
../build/obj/powder/interface/Panel.o \
../build/obj/powder/interface/SaveButton.o \
../build/obj/powder/interface/Slider.o \
../build/obj/powder/interface/Spinner.o \
../build/obj/powder/interface/Textarea.o \
../build/obj/powder/interface/Textblock.o \
../build/obj/powder/interface/Textbox.o \
../build/obj/powder/interface/Window.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/login/LoginController.o \
../build/obj/powder/login/LoginModel.o \
../build/obj/powder/login/LoginView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/options/OptionsController.o \
../build/obj/powder/options/OptionsModel.o \
../build/obj/powder/options/OptionsView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/preview/PreviewController.o \
../build/obj/powder/preview/PreviewModel.o \
../build/obj/powder/preview/PreviewView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/render/RenderController.o \
../build/obj/powder/render/RenderModel.o \
../build/obj/powder/render/RenderView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,15 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/search/Save.o \
../build/obj/powder/search/SearchController.o \
../build/obj/powder/search/SearchModel.o \
../build/obj/powder/search/SearchView.o \
../build/obj/powder/search/Thumbnail.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,17 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/simulation/Air.o \
../build/obj/powder/simulation/Gravity.o \
../build/obj/powder/simulation/SaveLoader.o \
../build/obj/powder/simulation/SaveRenderer.o \
../build/obj/powder/simulation/Simulation.o \
../build/obj/powder/simulation/SimulationData.o \
../build/obj/powder/simulation/Solids.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/ssave/SSaveController.o \
../build/obj/powder/ssave/SSaveModel.o \
../build/obj/powder/ssave/SSaveView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/stamps/StampsController.o \
../build/obj/powder/stamps/StampsModel.o \
../build/obj/powder/stamps/StampsView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,15 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/Console.o \
../build/obj/powder/Graphics.o \
../build/obj/powder/Misc.o \
../build/obj/powder/PowderToy.o \
../build/obj/powder/Renderer.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,13 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/tags/TagsController.o \
../build/obj/powder/tags/TagsModel.o \
../build/obj/powder/tags/TagsView.o
# Each subdirectory must supply rules for building sources it contributes

View File

@ -0,0 +1,12 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
O_SRCS += \
../build/obj/powder/tasks/Task.o \
../build/obj/powder/tasks/TaskWindow.o
# Each subdirectory must supply rules for building sources it contributes

96
Release/makefile Normal file
View File

@ -0,0 +1,96 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
-include ../makefile.init
RM := rm -rf
# All of the sources participating in the build are defined here
-include sources.mk
-include subdir.mk
-include src/tasks/subdir.mk
-include src/tags/subdir.mk
-include src/stamps/subdir.mk
-include src/ssave/subdir.mk
-include src/simulation/subdir.mk
-include src/search/subdir.mk
-include src/render/subdir.mk
-include src/preview/subdir.mk
-include src/options/subdir.mk
-include src/login/subdir.mk
-include src/interface/subdir.mk
-include src/game/subdir.mk
-include src/elements/subdir.mk
-include src/dialogues/subdir.mk
-include src/console/subdir.mk
-include src/client/subdir.mk
-include src/cat/subdir.mk
-include src/cajun/subdir.mk
-include src/subdir.mk
-include build/obj/powder/tasks/subdir.mk
-include build/obj/powder/tags/subdir.mk
-include build/obj/powder/stamps/subdir.mk
-include build/obj/powder/ssave/subdir.mk
-include build/obj/powder/simulation/subdir.mk
-include build/obj/powder/search/subdir.mk
-include build/obj/powder/render/subdir.mk
-include build/obj/powder/preview/subdir.mk
-include build/obj/powder/options/subdir.mk
-include build/obj/powder/login/subdir.mk
-include build/obj/powder/interface/subdir.mk
-include build/obj/powder/game/subdir.mk
-include build/obj/powder/elements/subdir.mk
-include build/obj/powder/dialogues/subdir.mk
-include build/obj/powder/console/subdir.mk
-include build/obj/powder/client/subdir.mk
-include build/obj/powder/cat/subdir.mk
-include build/obj/powder/cajun/subdir.mk
-include build/obj/powder/subdir.mk
-include objects.mk
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(strip $(C++_DEPS)),)
-include $(C++_DEPS)
endif
ifneq ($(strip $(C_DEPS)),)
-include $(C_DEPS)
endif
ifneq ($(strip $(CC_DEPS)),)
-include $(CC_DEPS)
endif
ifneq ($(strip $(CPP_DEPS)),)
-include $(CPP_DEPS)
endif
ifneq ($(strip $(CXX_DEPS)),)
-include $(CXX_DEPS)
endif
ifneq ($(strip $(C_UPPER_DEPS)),)
-include $(C_UPPER_DEPS)
endif
endif
-include ../makefile.defs
# Add inputs and outputs from these tool invocations to the build variables
# All Target
all: PowderToypp
# Tool invocations
PowderToypp: $(OBJS) $(USER_OBJS)
@echo 'Building target: $@'
@echo 'Invoking: GCC C++ Linker'
g++ -o"PowderToypp" $(OBJS) $(USER_OBJS) $(LIBS)
@echo 'Finished building target: $@'
@echo ' '
# Other Targets
clean:
-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) PowderToypp
-@echo ' '
.PHONY: all clean dependents
.SECONDARY:
-include ../makefile.targets

7
Release/objects.mk Normal file
View File

@ -0,0 +1,7 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
USER_OBJS :=
LIBS :=

64
Release/sources.mk Normal file
View File

@ -0,0 +1,64 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
O_SRCS :=
CPP_SRCS :=
C_UPPER_SRCS :=
C_SRCS :=
S_UPPER_SRCS :=
OBJ_SRCS :=
ASM_SRCS :=
CXX_SRCS :=
C++_SRCS :=
CC_SRCS :=
OBJS :=
C++_DEPS :=
C_DEPS :=
CC_DEPS :=
CPP_DEPS :=
EXECUTABLES :=
CXX_DEPS :=
C_UPPER_DEPS :=
# Every subdirectory with source files must be described here
SUBDIRS := \
src/tasks \
src/tags \
src/stamps \
src/ssave \
src/simulation \
src/search \
src/render \
src/preview \
src/options \
src/login \
src/interface \
src/game \
src/elements \
src/dialogues \
src/console \
src/client \
src/cat \
src/cajun \
src \
build/obj/powder/tasks \
build/obj/powder/tags \
build/obj/powder/stamps \
build/obj/powder/ssave \
build/obj/powder/simulation \
build/obj/powder/search \
build/obj/powder/render \
build/obj/powder/preview \
build/obj/powder/options \
build/obj/powder/login \
build/obj/powder/interface \
build/obj/powder/game \
build/obj/powder/elements \
build/obj/powder/dialogues \
build/obj/powder/console \
build/obj/powder/client \
build/obj/powder/cat \
build/obj/powder/cajun \
build/obj/powder \

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/cajun/elements.cpp \
../src/cajun/reader.cpp \
../src/cajun/writer.cpp
OBJS += \
./src/cajun/elements.o \
./src/cajun/reader.o \
./src/cajun/writer.o
CPP_DEPS += \
./src/cajun/elements.d \
./src/cajun/reader.d \
./src/cajun/writer.d
# Each subdirectory must supply rules for building sources it contributes
src/cajun/%.o: ../src/cajun/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

33
Release/src/cat/subdir.mk Normal file
View File

@ -0,0 +1,33 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/cat/CommandInterface.cpp \
../src/cat/LuaScriptInterface.cpp \
../src/cat/TPTSTypes.cpp \
../src/cat/TPTScriptInterface.cpp
OBJS += \
./src/cat/CommandInterface.o \
./src/cat/LuaScriptInterface.o \
./src/cat/TPTSTypes.o \
./src/cat/TPTScriptInterface.o
CPP_DEPS += \
./src/cat/CommandInterface.d \
./src/cat/LuaScriptInterface.d \
./src/cat/TPTSTypes.d \
./src/cat/TPTScriptInterface.d
# Each subdirectory must supply rules for building sources it contributes
src/cat/%.o: ../src/cat/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/client/Client.cpp \
../src/client/HTTP.cpp \
../src/client/MD5.cpp
OBJS += \
./src/client/Client.o \
./src/client/HTTP.o \
./src/client/MD5.o
CPP_DEPS += \
./src/client/Client.d \
./src/client/HTTP.d \
./src/client/MD5.d
# Each subdirectory must supply rules for building sources it contributes
src/client/%.o: ../src/client/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/console/ConsoleController.cpp \
../src/console/ConsoleModel.cpp \
../src/console/ConsoleView.cpp
OBJS += \
./src/console/ConsoleController.o \
./src/console/ConsoleModel.o \
./src/console/ConsoleView.o
CPP_DEPS += \
./src/console/ConsoleController.d \
./src/console/ConsoleModel.d \
./src/console/ConsoleView.d
# Each subdirectory must supply rules for building sources it contributes
src/console/%.o: ../src/console/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/dialogues/ConfirmPrompt.cpp \
../src/dialogues/ErrorMessage.cpp \
../src/dialogues/TextPrompt.cpp
OBJS += \
./src/dialogues/ConfirmPrompt.o \
./src/dialogues/ErrorMessage.o \
./src/dialogues/TextPrompt.o
CPP_DEPS += \
./src/dialogues/ConfirmPrompt.d \
./src/dialogues/ErrorMessage.d \
./src/dialogues/TextPrompt.d
# Each subdirectory must supply rules for building sources it contributes
src/dialogues/%.o: ../src/dialogues/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,330 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/elements/O2.cpp \
../src/elements/acel.cpp \
../src/elements/acid.cpp \
../src/elements/amtr.cpp \
../src/elements/anar.cpp \
../src/elements/aray.cpp \
../src/elements/bang.cpp \
../src/elements/bcln.cpp \
../src/elements/bcol.cpp \
../src/elements/bizr.cpp \
../src/elements/bmtl.cpp \
../src/elements/bomb.cpp \
../src/elements/boyl.cpp \
../src/elements/brmt.cpp \
../src/elements/btry.cpp \
../src/elements/c5.cpp \
../src/elements/caus.cpp \
../src/elements/cbnw.cpp \
../src/elements/clne.cpp \
../src/elements/clst.cpp \
../src/elements/co2.cpp \
../src/elements/coal.cpp \
../src/elements/conv.cpp \
../src/elements/dest.cpp \
../src/elements/deut.cpp \
../src/elements/dlay.cpp \
../src/elements/dstw.cpp \
../src/elements/elec.cpp \
../src/elements/elementmisc.cpp \
../src/elements/emp.cpp \
../src/elements/figh.cpp \
../src/elements/fire.cpp \
../src/elements/firw.cpp \
../src/elements/fog.cpp \
../src/elements/fray.cpp \
../src/elements/frzw.cpp \
../src/elements/frzz.cpp \
../src/elements/fsep.cpp \
../src/elements/fuse.cpp \
../src/elements/fwrk.cpp \
../src/elements/gbmb.cpp \
../src/elements/gel.cpp \
../src/elements/glas.cpp \
../src/elements/glow.cpp \
../src/elements/goo.cpp \
../src/elements/gpmp.cpp \
../src/elements/graphics_default.cpp \
../src/elements/h2.cpp \
../src/elements/hswc.cpp \
../src/elements/ice.cpp \
../src/elements/ignt.cpp \
../src/elements/iron.cpp \
../src/elements/isz.cpp \
../src/elements/lava.cpp \
../src/elements/lcry.cpp \
../src/elements/legacy.cpp \
../src/elements/ligh.cpp \
../src/elements/merc.cpp \
../src/elements/mort.cpp \
../src/elements/nbhl.cpp \
../src/elements/nble.cpp \
../src/elements/neut.cpp \
../src/elements/newgraphics.cpp \
../src/elements/none.cpp \
../src/elements/nptct.cpp \
../src/elements/nwhl.cpp \
../src/elements/pbcn.cpp \
../src/elements/pcln.cpp \
../src/elements/phot.cpp \
../src/elements/pipe.cpp \
../src/elements/plnt.cpp \
../src/elements/plsm.cpp \
../src/elements/plut.cpp \
../src/elements/prti.cpp \
../src/elements/prto.cpp \
../src/elements/pump.cpp \
../src/elements/pvod.cpp \
../src/elements/pyro.cpp \
../src/elements/qrtz.cpp \
../src/elements/repl.cpp \
../src/elements/rime.cpp \
../src/elements/shld.cpp \
../src/elements/sing.cpp \
../src/elements/sltw.cpp \
../src/elements/smke.cpp \
../src/elements/soap.cpp \
../src/elements/spng.cpp \
../src/elements/sprk.cpp \
../src/elements/stkm.cpp \
../src/elements/stkm2.cpp \
../src/elements/stor.cpp \
../src/elements/swch.cpp \
../src/elements/thdr.cpp \
../src/elements/thrm.cpp \
../src/elements/tron.cpp \
../src/elements/uran.cpp \
../src/elements/vine.cpp \
../src/elements/warp.cpp \
../src/elements/watr.cpp \
../src/elements/wifi.cpp \
../src/elements/wire.cpp \
../src/elements/wtrv.cpp \
../src/elements/yest.cpp
OBJS += \
./src/elements/O2.o \
./src/elements/acel.o \
./src/elements/acid.o \
./src/elements/amtr.o \
./src/elements/anar.o \
./src/elements/aray.o \
./src/elements/bang.o \
./src/elements/bcln.o \
./src/elements/bcol.o \
./src/elements/bizr.o \
./src/elements/bmtl.o \
./src/elements/bomb.o \
./src/elements/boyl.o \
./src/elements/brmt.o \
./src/elements/btry.o \
./src/elements/c5.o \
./src/elements/caus.o \
./src/elements/cbnw.o \
./src/elements/clne.o \
./src/elements/clst.o \
./src/elements/co2.o \
./src/elements/coal.o \
./src/elements/conv.o \
./src/elements/dest.o \
./src/elements/deut.o \
./src/elements/dlay.o \
./src/elements/dstw.o \
./src/elements/elec.o \
./src/elements/elementmisc.o \
./src/elements/emp.o \
./src/elements/figh.o \
./src/elements/fire.o \
./src/elements/firw.o \
./src/elements/fog.o \
./src/elements/fray.o \
./src/elements/frzw.o \
./src/elements/frzz.o \
./src/elements/fsep.o \
./src/elements/fuse.o \
./src/elements/fwrk.o \
./src/elements/gbmb.o \
./src/elements/gel.o \
./src/elements/glas.o \
./src/elements/glow.o \
./src/elements/goo.o \
./src/elements/gpmp.o \
./src/elements/graphics_default.o \
./src/elements/h2.o \
./src/elements/hswc.o \
./src/elements/ice.o \
./src/elements/ignt.o \
./src/elements/iron.o \
./src/elements/isz.o \
./src/elements/lava.o \
./src/elements/lcry.o \
./src/elements/legacy.o \
./src/elements/ligh.o \
./src/elements/merc.o \
./src/elements/mort.o \
./src/elements/nbhl.o \
./src/elements/nble.o \
./src/elements/neut.o \
./src/elements/newgraphics.o \
./src/elements/none.o \
./src/elements/nptct.o \
./src/elements/nwhl.o \
./src/elements/pbcn.o \
./src/elements/pcln.o \
./src/elements/phot.o \
./src/elements/pipe.o \
./src/elements/plnt.o \
./src/elements/plsm.o \
./src/elements/plut.o \
./src/elements/prti.o \
./src/elements/prto.o \
./src/elements/pump.o \
./src/elements/pvod.o \
./src/elements/pyro.o \
./src/elements/qrtz.o \
./src/elements/repl.o \
./src/elements/rime.o \
./src/elements/shld.o \
./src/elements/sing.o \
./src/elements/sltw.o \
./src/elements/smke.o \
./src/elements/soap.o \
./src/elements/spng.o \
./src/elements/sprk.o \
./src/elements/stkm.o \
./src/elements/stkm2.o \
./src/elements/stor.o \
./src/elements/swch.o \
./src/elements/thdr.o \
./src/elements/thrm.o \
./src/elements/tron.o \
./src/elements/uran.o \
./src/elements/vine.o \
./src/elements/warp.o \
./src/elements/watr.o \
./src/elements/wifi.o \
./src/elements/wire.o \
./src/elements/wtrv.o \
./src/elements/yest.o
CPP_DEPS += \
./src/elements/O2.d \
./src/elements/acel.d \
./src/elements/acid.d \
./src/elements/amtr.d \
./src/elements/anar.d \
./src/elements/aray.d \
./src/elements/bang.d \
./src/elements/bcln.d \
./src/elements/bcol.d \
./src/elements/bizr.d \
./src/elements/bmtl.d \
./src/elements/bomb.d \
./src/elements/boyl.d \
./src/elements/brmt.d \
./src/elements/btry.d \
./src/elements/c5.d \
./src/elements/caus.d \
./src/elements/cbnw.d \
./src/elements/clne.d \
./src/elements/clst.d \
./src/elements/co2.d \
./src/elements/coal.d \
./src/elements/conv.d \
./src/elements/dest.d \
./src/elements/deut.d \
./src/elements/dlay.d \
./src/elements/dstw.d \
./src/elements/elec.d \
./src/elements/elementmisc.d \
./src/elements/emp.d \
./src/elements/figh.d \
./src/elements/fire.d \
./src/elements/firw.d \
./src/elements/fog.d \
./src/elements/fray.d \
./src/elements/frzw.d \
./src/elements/frzz.d \
./src/elements/fsep.d \
./src/elements/fuse.d \
./src/elements/fwrk.d \
./src/elements/gbmb.d \
./src/elements/gel.d \
./src/elements/glas.d \
./src/elements/glow.d \
./src/elements/goo.d \
./src/elements/gpmp.d \
./src/elements/graphics_default.d \
./src/elements/h2.d \
./src/elements/hswc.d \
./src/elements/ice.d \
./src/elements/ignt.d \
./src/elements/iron.d \
./src/elements/isz.d \
./src/elements/lava.d \
./src/elements/lcry.d \
./src/elements/legacy.d \
./src/elements/ligh.d \
./src/elements/merc.d \
./src/elements/mort.d \
./src/elements/nbhl.d \
./src/elements/nble.d \
./src/elements/neut.d \
./src/elements/newgraphics.d \
./src/elements/none.d \
./src/elements/nptct.d \
./src/elements/nwhl.d \
./src/elements/pbcn.d \
./src/elements/pcln.d \
./src/elements/phot.d \
./src/elements/pipe.d \
./src/elements/plnt.d \
./src/elements/plsm.d \
./src/elements/plut.d \
./src/elements/prti.d \
./src/elements/prto.d \
./src/elements/pump.d \
./src/elements/pvod.d \
./src/elements/pyro.d \
./src/elements/qrtz.d \
./src/elements/repl.d \
./src/elements/rime.d \
./src/elements/shld.d \
./src/elements/sing.d \
./src/elements/sltw.d \
./src/elements/smke.d \
./src/elements/soap.d \
./src/elements/spng.d \
./src/elements/sprk.d \
./src/elements/stkm.d \
./src/elements/stkm2.d \
./src/elements/stor.d \
./src/elements/swch.d \
./src/elements/thdr.d \
./src/elements/thrm.d \
./src/elements/tron.d \
./src/elements/uran.d \
./src/elements/vine.d \
./src/elements/warp.d \
./src/elements/watr.d \
./src/elements/wifi.d \
./src/elements/wire.d \
./src/elements/wtrv.d \
./src/elements/yest.d
# Each subdirectory must supply rules for building sources it contributes
src/elements/%.o: ../src/elements/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,33 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/game/GameController.cpp \
../src/game/GameModel.cpp \
../src/game/GameView.cpp \
../src/game/ToolButton.cpp
OBJS += \
./src/game/GameController.o \
./src/game/GameModel.o \
./src/game/GameView.o \
./src/game/ToolButton.o
CPP_DEPS += \
./src/game/GameController.d \
./src/game/GameModel.d \
./src/game/GameView.d \
./src/game/ToolButton.d
# Each subdirectory must supply rules for building sources it contributes
src/game/%.o: ../src/game/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,66 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/interface/Button.cpp \
../src/interface/Checkbox.cpp \
../src/interface/Component.cpp \
../src/interface/ControlFactory.cpp \
../src/interface/DropDown.cpp \
../src/interface/Engine.cpp \
../src/interface/Label.cpp \
../src/interface/Panel.cpp \
../src/interface/SaveButton.cpp \
../src/interface/Slider.cpp \
../src/interface/Spinner.cpp \
../src/interface/Textarea.cpp \
../src/interface/Textblock.cpp \
../src/interface/Textbox.cpp \
../src/interface/Window.cpp
OBJS += \
./src/interface/Button.o \
./src/interface/Checkbox.o \
./src/interface/Component.o \
./src/interface/ControlFactory.o \
./src/interface/DropDown.o \
./src/interface/Engine.o \
./src/interface/Label.o \
./src/interface/Panel.o \
./src/interface/SaveButton.o \
./src/interface/Slider.o \
./src/interface/Spinner.o \
./src/interface/Textarea.o \
./src/interface/Textblock.o \
./src/interface/Textbox.o \
./src/interface/Window.o
CPP_DEPS += \
./src/interface/Button.d \
./src/interface/Checkbox.d \
./src/interface/Component.d \
./src/interface/ControlFactory.d \
./src/interface/DropDown.d \
./src/interface/Engine.d \
./src/interface/Label.d \
./src/interface/Panel.d \
./src/interface/SaveButton.d \
./src/interface/Slider.d \
./src/interface/Spinner.d \
./src/interface/Textarea.d \
./src/interface/Textblock.d \
./src/interface/Textbox.d \
./src/interface/Window.d
# Each subdirectory must supply rules for building sources it contributes
src/interface/%.o: ../src/interface/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/login/LoginController.cpp \
../src/login/LoginModel.cpp \
../src/login/LoginView.cpp
OBJS += \
./src/login/LoginController.o \
./src/login/LoginModel.o \
./src/login/LoginView.o
CPP_DEPS += \
./src/login/LoginController.d \
./src/login/LoginModel.d \
./src/login/LoginView.d
# Each subdirectory must supply rules for building sources it contributes
src/login/%.o: ../src/login/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/options/OptionsController.cpp \
../src/options/OptionsModel.cpp \
../src/options/OptionsView.cpp
OBJS += \
./src/options/OptionsController.o \
./src/options/OptionsModel.o \
./src/options/OptionsView.o
CPP_DEPS += \
./src/options/OptionsController.d \
./src/options/OptionsModel.d \
./src/options/OptionsView.d
# Each subdirectory must supply rules for building sources it contributes
src/options/%.o: ../src/options/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/preview/PreviewController.cpp \
../src/preview/PreviewModel.cpp \
../src/preview/PreviewView.cpp
OBJS += \
./src/preview/PreviewController.o \
./src/preview/PreviewModel.o \
./src/preview/PreviewView.o
CPP_DEPS += \
./src/preview/PreviewController.d \
./src/preview/PreviewModel.d \
./src/preview/PreviewView.d
# Each subdirectory must supply rules for building sources it contributes
src/preview/%.o: ../src/preview/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/render/RenderController.cpp \
../src/render/RenderModel.cpp \
../src/render/RenderView.cpp
OBJS += \
./src/render/RenderController.o \
./src/render/RenderModel.o \
./src/render/RenderView.o
CPP_DEPS += \
./src/render/RenderController.d \
./src/render/RenderModel.d \
./src/render/RenderView.d
# Each subdirectory must supply rules for building sources it contributes
src/render/%.o: ../src/render/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,36 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/search/Save.cpp \
../src/search/SearchController.cpp \
../src/search/SearchModel.cpp \
../src/search/SearchView.cpp \
../src/search/Thumbnail.cpp
OBJS += \
./src/search/Save.o \
./src/search/SearchController.o \
./src/search/SearchModel.o \
./src/search/SearchView.o \
./src/search/Thumbnail.o
CPP_DEPS += \
./src/search/Save.d \
./src/search/SearchController.d \
./src/search/SearchModel.d \
./src/search/SearchView.d \
./src/search/Thumbnail.d
# Each subdirectory must supply rules for building sources it contributes
src/search/%.o: ../src/search/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,42 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/simulation/Air.cpp \
../src/simulation/Gravity.cpp \
../src/simulation/SaveLoader.cpp \
../src/simulation/SaveRenderer.cpp \
../src/simulation/Simulation.cpp \
../src/simulation/SimulationData.cpp \
../src/simulation/Solids.cpp
OBJS += \
./src/simulation/Air.o \
./src/simulation/Gravity.o \
./src/simulation/SaveLoader.o \
./src/simulation/SaveRenderer.o \
./src/simulation/Simulation.o \
./src/simulation/SimulationData.o \
./src/simulation/Solids.o
CPP_DEPS += \
./src/simulation/Air.d \
./src/simulation/Gravity.d \
./src/simulation/SaveLoader.d \
./src/simulation/SaveRenderer.d \
./src/simulation/Simulation.d \
./src/simulation/SimulationData.d \
./src/simulation/Solids.d
# Each subdirectory must supply rules for building sources it contributes
src/simulation/%.o: ../src/simulation/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/ssave/SSaveController.cpp \
../src/ssave/SSaveModel.cpp \
../src/ssave/SSaveView.cpp
OBJS += \
./src/ssave/SSaveController.o \
./src/ssave/SSaveModel.o \
./src/ssave/SSaveView.o
CPP_DEPS += \
./src/ssave/SSaveController.d \
./src/ssave/SSaveModel.d \
./src/ssave/SSaveView.d
# Each subdirectory must supply rules for building sources it contributes
src/ssave/%.o: ../src/ssave/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/stamps/StampsController.cpp \
../src/stamps/StampsModel.cpp \
../src/stamps/StampsView.cpp
OBJS += \
./src/stamps/StampsController.o \
./src/stamps/StampsModel.o \
./src/stamps/StampsView.o
CPP_DEPS += \
./src/stamps/StampsController.d \
./src/stamps/StampsModel.d \
./src/stamps/StampsView.d
# Each subdirectory must supply rules for building sources it contributes
src/stamps/%.o: ../src/stamps/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

36
Release/src/subdir.mk Normal file
View File

@ -0,0 +1,36 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/Console.cpp \
../src/Graphics.cpp \
../src/Misc.cpp \
../src/PowderToy.cpp \
../src/Renderer.cpp
OBJS += \
./src/Console.o \
./src/Graphics.o \
./src/Misc.o \
./src/PowderToy.o \
./src/Renderer.o
CPP_DEPS += \
./src/Console.d \
./src/Graphics.d \
./src/Misc.d \
./src/PowderToy.d \
./src/Renderer.d
# Each subdirectory must supply rules for building sources it contributes
src/%.o: ../src/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

View File

@ -0,0 +1,30 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/tags/TagsController.cpp \
../src/tags/TagsModel.cpp \
../src/tags/TagsView.cpp
OBJS += \
./src/tags/TagsController.o \
./src/tags/TagsModel.o \
./src/tags/TagsView.o
CPP_DEPS += \
./src/tags/TagsController.d \
./src/tags/TagsModel.d \
./src/tags/TagsView.d
# Each subdirectory must supply rules for building sources it contributes
src/tags/%.o: ../src/tags/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

6
Release/src/tasks/Task.d Normal file
View File

@ -0,0 +1,6 @@
src/tasks/Task.d: ../src/tasks/Task.cpp ../src/tasks/Task.h \
../src/tasks/TaskListener.h
../src/tasks/Task.h:
../src/tasks/TaskListener.h:

View File

@ -0,0 +1,27 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../src/tasks/Task.cpp \
../src/tasks/TaskWindow.cpp
OBJS += \
./src/tasks/Task.o \
./src/tasks/TaskWindow.o
CPP_DEPS += \
./src/tasks/Task.d \
./src/tasks/TaskWindow.d
# Each subdirectory must supply rules for building sources it contributes
src/tasks/%.o: ../src/tasks/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<'
@echo ' '

51807
output.txt Normal file

File diff suppressed because it is too large Load Diff

0
scons Normal file
View File

View File

@ -202,5 +202,4 @@ extern unsigned char ZSIZE;
#define DEBUG_PERFORMANCE_CALC 0x0008
#define DEBUG_PERFORMANCE_FRAME 0x0010
#include "interface/Keys.h"
//#endif /* CONFIG_H_ */

View File

@ -4,6 +4,7 @@
#include <vector>
class VideoBuffer;
namespace format
{
template <typename T> std::string NumberToString(T number)

View File

@ -28,6 +28,8 @@
#include "interface/Panel.h"
#include "interface/Point.h"
#include "interface/Label.h"
#include "interface/Keys.h"
#include "simulation/SaveRenderer.h"
#include "client/Client.h"
#include "Misc.h"

View File

@ -7,7 +7,9 @@
//
#include <iostream>
#include "Style.h"
#include "interface/Colour.h"
namespace style {
ui::Colour Colour::InformationTitle = ui::Colour(140, 140, 255);

View File

@ -7,7 +7,8 @@
#ifndef The_Powder_Toy_Style_h
#define The_Powder_Toy_Style_h
#include "interface/Colour.h"
namespace ui { class Colour; }
namespace style
{

View File

@ -7,6 +7,7 @@
#include <time.h>
#include <stdio.h>
#include <deque>
#include <fstream>
#ifdef MACOSX
#include <mach-o/dyld.h>
@ -29,14 +30,22 @@
#include "MD5.h"
#include "graphics/Graphics.h"
#include "Misc.h"
#include "Update.h"
#include "HTTP.h"
#include "simulation/SaveRenderer.h"
#include "interface/Point.h"
#include "client/SaveInfo.h"
#include "client/SaveFile.h"
#include "client/GameSave.h"
#include "search/Thumbnail.h"
#include "preview/Comment.h"
#include "ClientListener.h"
#include "Update.h"
#include "ThumbnailBroker.h"
#include "cajun/reader.h"
#include "cajun/writer.h"
extern "C"
{
#if defined(WIN) && !defined(__GNUC__)
@ -65,13 +74,13 @@ Client::Client():
//Read config
std::ifstream configFile;
configFile.open("powder.pref", ios::binary);
configFile.open("powder.pref", std::ios::binary);
if(configFile)
{
int fsize = configFile.tellg();
configFile.seekg(0, std::ios::end);
fsize = configFile.tellg() - (std::streampos)fsize;
configFile.seekg(0, ios::beg);
configFile.seekg(0, std::ios::beg);
if(fsize)
{
json::Reader::Read(configDocument, configFile);
@ -84,11 +93,11 @@ Client::Client():
std::string userElevation = ((json::String)(configDocument["User"]["Elevation"])).Value();
if(userElevation == "Admin")
authUser.UserElevation = ElevationAdmin;
authUser.UserElevation = User::ElevationAdmin;
else if(userElevation == "Mod")
authUser.UserElevation = ElevationModerator;
authUser.UserElevation = User::ElevationModerator;
else
authUser.UserElevation= ElevationNone;
authUser.UserElevation = User::ElevationNone;
}
catch (json::Exception &e)
{
@ -116,7 +125,7 @@ void Client::Initialise(std::string proxyString)
//Read stamps library
std::ifstream stampsLib;
stampsLib.open(STAMPS_DIR PATH_SEP "stamps.def", ios::binary);
stampsLib.open(STAMPS_DIR PATH_SEP "stamps.def", std::ios::binary);
while(true)
{
char data[11];
@ -404,7 +413,7 @@ void Client::WriteFile(std::vector<unsigned char> fileData, std::string filename
try
{
std::ofstream fileStream;
fileStream.open(string(filename).c_str(), ios::binary);
fileStream.open(std::string(filename).c_str(), std::ios::binary);
if(fileStream.is_open())
{
fileStream.write((char*)&fileData[0], fileData.size());
@ -424,7 +433,7 @@ bool Client::FileExists(std::string filename)
try
{
std::ifstream fileStream;
fileStream.open(string(filename).c_str(), ios::binary);
fileStream.open(std::string(filename).c_str(), std::ios::binary);
if(fileStream.is_open())
{
exists = true;
@ -443,7 +452,7 @@ void Client::WriteFile(std::vector<char> fileData, std::string filename)
try
{
std::ofstream fileStream;
fileStream.open(string(filename).c_str(), ios::binary);
fileStream.open(std::string(filename).c_str(), std::ios::binary);
if(fileStream.is_open())
{
fileStream.write(&fileData[0], fileData.size());
@ -462,10 +471,10 @@ std::vector<unsigned char> Client::ReadFile(std::string filename)
try
{
std::ifstream fileStream;
fileStream.open(string(filename).c_str(), ios::binary);
fileStream.open(std::string(filename).c_str(), std::ios::binary);
if(fileStream.is_open())
{
fileStream.seekg(0, ios::end);
fileStream.seekg(0, std::ios::end);
size_t fileSize = fileStream.tellg();
fileStream.seekg(0);
@ -652,7 +661,7 @@ void Client::Shutdown()
//Save config
std::ofstream configFile;
configFile.open("powder.pref", ios::trunc);
configFile.open("powder.pref", std::ios::trunc);
if(configFile)
{
if(authUser.ID)
@ -661,9 +670,9 @@ void Client::Shutdown()
configDocument["User"]["SessionID"] = json::String(authUser.SessionID);
configDocument["User"]["SessionKey"] = json::String(authUser.SessionKey);
configDocument["User"]["Username"] = json::String(authUser.Username);
if(authUser.UserElevation == ElevationAdmin)
if(authUser.UserElevation == User::ElevationAdmin)
configDocument["User"]["Elevation"] = json::String("Admin");
else if(authUser.UserElevation == ElevationModerator)
else if(authUser.UserElevation == User::ElevationModerator)
configDocument["User"]["Elevation"] = json::String("Mod");
else
configDocument["User"]["Elevation"] = json::String("None");
@ -767,13 +776,13 @@ RequestStatus Client::UploadSave(SaveInfo & save)
return RequestFailure;
}
SaveFile * Client::GetStamp(string stampID)
SaveFile * Client::GetStamp(std::string stampID)
{
std::ifstream stampFile;
stampFile.open(string(STAMPS_DIR PATH_SEP + stampID + ".stm").c_str(), ios::binary);
stampFile.open(std::string(STAMPS_DIR PATH_SEP + stampID + ".stm").c_str(), std::ios::binary);
if(stampFile.is_open())
{
stampFile.seekg(0, ios::end);
stampFile.seekg(0, std::ios::end);
size_t fileSize = stampFile.tellg();
stampFile.seekg(0);
@ -781,7 +790,7 @@ SaveFile * Client::GetStamp(string stampID)
stampFile.read((char *)tempData, fileSize);
stampFile.close();
SaveFile * file = new SaveFile(string(stampID).c_str());
SaveFile * file = new SaveFile(std::string(stampID).c_str());
GameSave * tempSave = new GameSave((char *)tempData, fileSize);
file->SetGameSave(tempSave);
return file;
@ -792,13 +801,13 @@ SaveFile * Client::GetStamp(string stampID)
}
}
void Client::DeleteStamp(string stampID)
void Client::DeleteStamp(std::string stampID)
{
for (std::list<string>::iterator iterator = stampIDs.begin(), end = stampIDs.end(); iterator != end; ++iterator)
for (std::list<std::string>::iterator iterator = stampIDs.begin(), end = stampIDs.end(); iterator != end; ++iterator)
{
if((*iterator) == stampID)
{
stringstream stampFilename;
std::stringstream stampFilename;
stampFilename << STAMPS_DIR;
stampFilename << PATH_SEP;
stampFilename << stampID;
@ -810,7 +819,7 @@ void Client::DeleteStamp(string stampID)
}
}
string Client::AddStamp(GameSave * saveData)
std::string Client::AddStamp(GameSave * saveData)
{
unsigned t=(unsigned)time(NULL);
if (lastStampTime!=t)
@ -836,7 +845,7 @@ string Client::AddStamp(GameSave * saveData)
char * gameData = saveData->Serialise(gameDataLength);
std::ofstream stampStream;
stampStream.open(string(STAMPS_DIR PATH_SEP + saveID.str()+".stm").c_str(), ios::binary);
stampStream.open(std::string(STAMPS_DIR PATH_SEP + saveID.str()+".stm").c_str(), std::ios::binary);
stampStream.write((const char *)gameData, gameDataLength);
stampStream.close();
@ -857,8 +866,8 @@ void Client::updateStamps()
#endif
std::ofstream stampsStream;
stampsStream.open(string(STAMPS_DIR PATH_SEP "stamps.def").c_str(), ios::binary);
for (std::list<string>::const_iterator iterator = stampIDs.begin(), end = stampIDs.end(); iterator != end; ++iterator)
stampsStream.open(std::string(STAMPS_DIR PATH_SEP "stamps.def").c_str(), std::ios::binary);
for (std::list<std::string>::const_iterator iterator = stampIDs.begin(), end = stampIDs.end(); iterator != end; ++iterator)
{
stampsStream.write((*iterator).c_str(), 10);
}
@ -872,17 +881,17 @@ int Client::GetStampsCount()
return stampIDs.size();
}
vector<string> Client::GetStamps(int start, int count)
std::vector<std::string> Client::GetStamps(int start, int count)
{
if(start+count > stampIDs.size()) {
if(start > stampIDs.size())
return vector<string>();
return std::vector<std::string>();
count = stampIDs.size()-start;
}
vector<string> stampRange;
std::vector<std::string> stampRange;
int index = 0;
for (std::list<string>::const_iterator iterator = stampIDs.begin(), end = stampIDs.end(); iterator != end; ++iterator, ++index) {
for (std::list<std::string>::const_iterator iterator = stampIDs.begin(), end = stampIDs.end(); iterator != end; ++iterator, ++index) {
if(index>=start && index < start+count)
stampRange.push_back(*iterator);
}
@ -979,7 +988,7 @@ std::vector<unsigned char> Client::GetSaveData(int saveID, int saveDate)
return saveData;
}
LoginStatus Client::Login(string username, string password, User & user)
LoginStatus Client::Login(std::string username, std::string password, User & user)
{
lastError = "";
std::stringstream urlStream;
@ -1028,11 +1037,11 @@ LoginStatus Client::Login(string username, string password, User & user)
user.SessionKey = sessionKeyTemp.Value();
std::string userElevation = userElevationTemp.Value();
if(userElevation == "Admin")
user.UserElevation = ElevationAdmin;
user.UserElevation = User::ElevationAdmin;
else if(userElevation == "Mod")
user.UserElevation = ElevationModerator;
user.UserElevation = User::ElevationModerator;
else
user.UserElevation= ElevationNone;
user.UserElevation= User::ElevationNone;
return LoginOkay;
}
else
@ -1062,7 +1071,7 @@ LoginStatus Client::Login(string username, string password, User & user)
RequestStatus Client::DeleteSave(int saveID)
{
lastError = "";
std::vector<string> * tags = NULL;
std::vector<std::string> * tags = NULL;
std::stringstream urlStream;
char * data = NULL;
int dataStatus, dataLength;
@ -1114,7 +1123,7 @@ failure:
RequestStatus Client::AddComment(int saveID, std::string comment)
{
lastError = "";
std::vector<string> * tags = NULL;
std::vector<std::string> * tags = NULL;
std::stringstream urlStream;
char * data = NULL;
int dataStatus, dataLength;
@ -1175,7 +1184,7 @@ failure:
RequestStatus Client::FavouriteSave(int saveID, bool favourite)
{
lastError = "";
std::vector<string> * tags = NULL;
std::vector<std::string> * tags = NULL;
std::stringstream urlStream;
char * data = NULL;
int dataStatus, dataLength;
@ -1232,7 +1241,7 @@ failure:
RequestStatus Client::ReportSave(int saveID, std::string message)
{
lastError = "";
std::vector<string> * tags = NULL;
std::vector<std::string> * tags = NULL;
std::stringstream urlStream;
char * data = NULL;
int dataStatus, dataLength;
@ -1291,7 +1300,7 @@ failure:
RequestStatus Client::UnpublishSave(int saveID)
{
lastError = "";
std::vector<string> * tags = NULL;
std::vector<std::string> * tags = NULL;
std::stringstream urlStream;
char * data = NULL;
int dataStatus, dataLength;
@ -1383,7 +1392,7 @@ SaveInfo * Client::GetSave(int saveID, int saveDate)
json::Number tempComments = objDocument["Comments"];
json::Array tagsArray = objDocument["Tags"];
vector<string> tempTags;
std::vector<std::string> tempTags;
for(int j = 0; j < tagsArray.Size(); j++)
{
@ -1508,7 +1517,7 @@ std::vector<SaveComment*> * Client::GetComments(int saveID, int start, int count
return commentArray;
}
std::vector<std::pair<std::string, int> > * Client::GetTags(int start, int count, string query, int & resultCount)
std::vector<std::pair<std::string, int> > * Client::GetTags(int start, int count, std::string query, int & resultCount)
{
lastError = "";
resultCount = 0;
@ -1557,7 +1566,7 @@ std::vector<std::pair<std::string, int> > * Client::GetTags(int start, int count
return tagArray;
}
std::vector<SaveInfo*> * Client::SearchSaves(int start, int count, string query, string sort, std::string category, int & resultCount)
std::vector<SaveInfo*> * Client::SearchSaves(int start, int count, std::string query, std::string sort, std::string category, int & resultCount)
{
lastError = "";
resultCount = 0;
@ -1765,10 +1774,10 @@ Thumbnail * Client::GetThumbnail(int saveID, int saveDate)
return NULL;
}
std::vector<string> * Client::RemoveTag(int saveID, string tag)
std::vector<std::string> * Client::RemoveTag(int saveID, std::string tag)
{
lastError = "";
std::vector<string> * tags = NULL;
std::vector<std::string> * tags = NULL;
std::stringstream urlStream;
char * data = NULL;
int dataStatus, dataLength;
@ -1792,7 +1801,7 @@ std::vector<string> * Client::RemoveTag(int saveID, string tag)
json::Array tagsArray;
json::Reader::Read(tagsArray, dataStream);
tags = new std::vector<string>();
tags = new std::vector<std::string>();
for(int j = 0; j < tagsArray.Size(); j++)
{
@ -1814,10 +1823,10 @@ std::vector<string> * Client::RemoveTag(int saveID, string tag)
return tags;
}
std::vector<string> * Client::AddTag(int saveID, string tag)
std::vector<std::string> * Client::AddTag(int saveID, std::string tag)
{
lastError = "";
std::vector<string> * tags = NULL;
std::vector<std::string> * tags = NULL;
std::stringstream urlStream;
char * data = NULL;
int dataStatus, dataLength;
@ -1841,7 +1850,7 @@ std::vector<string> * Client::AddTag(int saveID, string tag)
json::Array tagsArray;
json::Reader::Read(tagsArray, dataStream);
tags = new std::vector<string>();
tags = new std::vector<std::string>();
for(int j = 0; j < tagsArray.Size(); j++)
{
@ -1863,11 +1872,11 @@ std::vector<string> * Client::AddTag(int saveID, string tag)
return tags;
}
vector<std::string> Client::explodePropertyString(std::string property)
std::vector<std::string> Client::explodePropertyString(std::string property)
{
vector<string> stringArray;
string current = "";
for (string::iterator iter = property.begin(); iter != property.end(); ++iter) {
std::vector<std::string> stringArray;
std::string current = "";
for (std::string::iterator iter = property.begin(); iter != property.end(); ++iter) {
if (*iter == '.') {
if (current.length() > 0) {
stringArray.push_back(current);
@ -1931,7 +1940,7 @@ int Client::GetPrefInteger(std::string property, int defaultValue)
{
}
catch(exception & e)
catch(std::exception & e)
{
}
@ -1959,19 +1968,19 @@ unsigned int Client::GetPrefUInteger(std::string property, unsigned int defaultV
{
}
catch(exception & e)
catch(std::exception & e)
{
}
return defaultValue;
}
vector<string> Client::GetPrefStringArray(std::string property)
std::vector<std::string> Client::GetPrefStringArray(std::string property)
{
try
{
json::Array value = GetPref(property);
vector<string> strArray;
std::vector<std::string> strArray;
for(json::Array::iterator iter = value.Begin(); iter != value.End(); ++iter)
{
try
@ -1990,15 +1999,15 @@ vector<string> Client::GetPrefStringArray(std::string property)
{
}
return vector<string>();
return std::vector<std::string>();
}
vector<double> Client::GetPrefNumberArray(std::string property)
std::vector<double> Client::GetPrefNumberArray(std::string property)
{
try
{
json::Array value = GetPref(property);
vector<double> strArray;
std::vector<double> strArray;
for(json::Array::iterator iter = value.Begin(); iter != value.End(); ++iter)
{
try
@ -2017,15 +2026,15 @@ vector<double> Client::GetPrefNumberArray(std::string property)
{
}
return vector<double>();
return std::vector<double>();
}
vector<int> Client::GetPrefIntegerArray(std::string property)
std::vector<int> Client::GetPrefIntegerArray(std::string property)
{
try
{
json::Array value = GetPref(property);
vector<int> intArray;
std::vector<int> intArray;
for(json::Array::iterator iter = value.Begin(); iter != value.End(); ++iter)
{
try
@ -2051,15 +2060,15 @@ vector<int> Client::GetPrefIntegerArray(std::string property)
{
}
return vector<int>();
return std::vector<int>();
}
vector<unsigned int> Client::GetPrefUIntegerArray(std::string property)
std::vector<unsigned int> Client::GetPrefUIntegerArray(std::string property)
{
try
{
json::Array value = GetPref(property);
vector<unsigned int> intArray;
std::vector<unsigned int> intArray;
for(json::Array::iterator iter = value.Begin(); iter != value.End(); ++iter)
{
try
@ -2085,15 +2094,15 @@ vector<unsigned int> Client::GetPrefUIntegerArray(std::string property)
{
}
return vector<unsigned int>();
return std::vector<unsigned int>();
}
vector<bool> Client::GetPrefBoolArray(std::string property)
std::vector<bool> Client::GetPrefBoolArray(std::string property)
{
try
{
json::Array value = GetPref(property);
vector<bool> strArray;
std::vector<bool> strArray;
for(json::Array::iterator iter = value.Begin(); iter != value.End(); ++iter)
{
try
@ -2112,7 +2121,7 @@ vector<bool> Client::GetPrefBoolArray(std::string property)
{
}
return vector<bool>();
return std::vector<bool>();
}
bool Client::GetPrefBool(std::string property, bool defaultValue)
@ -2157,10 +2166,10 @@ void Client::SetPref(std::string property, unsigned int value)
SetPref(property, intValue);
}
void Client::SetPref(std::string property, vector<string> value)
void Client::SetPref(std::string property, std::vector<std::string> value)
{
json::Array newArray;
for(vector<string>::iterator iter = value.begin(); iter != value.end(); ++iter)
for(std::vector<std::string>::iterator iter = value.begin(); iter != value.end(); ++iter)
{
newArray.Insert(json::String(*iter));
}
@ -2168,10 +2177,10 @@ void Client::SetPref(std::string property, vector<string> value)
SetPref(property, newArrayValue);
}
void Client::SetPref(std::string property, vector<double> value)
void Client::SetPref(std::string property, std::vector<double> value)
{
json::Array newArray;
for(vector<double>::iterator iter = value.begin(); iter != value.end(); ++iter)
for(std::vector<double>::iterator iter = value.begin(); iter != value.end(); ++iter)
{
newArray.Insert(json::Number(*iter));
}
@ -2179,10 +2188,10 @@ void Client::SetPref(std::string property, vector<double> value)
SetPref(property, newArrayValue);
}
void Client::SetPref(std::string property, vector<bool> value)
void Client::SetPref(std::string property, std::vector<bool> value)
{
json::Array newArray;
for(vector<bool>::iterator iter = value.begin(); iter != value.end(); ++iter)
for(std::vector<bool>::iterator iter = value.begin(); iter != value.end(); ++iter)
{
newArray.Insert(json::Boolean(*iter));
}
@ -2190,10 +2199,10 @@ void Client::SetPref(std::string property, vector<bool> value)
SetPref(property, newArrayValue);
}
void Client::SetPref(std::string property, vector<int> value)
void Client::SetPref(std::string property, std::vector<int> value)
{
json::Array newArray;
for(vector<int>::iterator iter = value.begin(); iter != value.end(); ++iter)
for(std::vector<int>::iterator iter = value.begin(); iter != value.end(); ++iter)
{
std::stringstream hexInt;
hexInt << std::hex << *iter;
@ -2204,10 +2213,10 @@ void Client::SetPref(std::string property, vector<int> value)
SetPref(property, newArrayValue);
}
void Client::SetPref(std::string property, vector<unsigned int> value)
void Client::SetPref(std::string property, std::vector<unsigned int> value)
{
json::Array newArray;
for(vector<unsigned int>::iterator iter = value.begin(); iter != value.end(); ++iter)
for(std::vector<unsigned int>::iterator iter = value.begin(); iter != value.end(); ++iter)
{
std::stringstream hexInt;
hexInt << std::hex << *iter;
@ -2226,17 +2235,17 @@ void Client::SetPref(std::string property, bool value)
json::UnknownElement Client::GetPref(std::string property)
{
vector<string> pTokens = Client::explodePropertyString(property);
std::vector<std::string> pTokens = Client::explodePropertyString(property);
const json::UnknownElement & configDocumentCopy = configDocument;
json::UnknownElement currentRef = configDocumentCopy;
for(vector<string>::iterator iter = pTokens.begin(); iter != pTokens.end(); ++iter)
for(std::vector<std::string>::iterator iter = pTokens.begin(); iter != pTokens.end(); ++iter)
{
currentRef = ((const json::UnknownElement &)currentRef)[*iter];
}
return currentRef;
}
void Client::setPrefR(std::deque<string> tokens, json::UnknownElement & element, json::UnknownElement & value)
void Client::setPrefR(std::deque<std::string> tokens, json::UnknownElement & element, json::UnknownElement & value)
{
if(tokens.size())
{
@ -2250,9 +2259,9 @@ void Client::setPrefR(std::deque<string> tokens, json::UnknownElement & element,
void Client::SetPref(std::string property, json::UnknownElement & value)
{
vector<string> pTokens = Client::explodePropertyString(property);
deque<string> dTokens(pTokens.begin(), pTokens.end());
string token = dTokens.front();
std::vector<std::string> pTokens = Client::explodePropertyString(property);
std::deque<std::string> dTokens(pTokens.begin(), pTokens.end());
std::string token = dTokens.front();
dTokens.pop_front();
setPrefR(dTokens, configDocument[token], value);
}

View File

@ -4,21 +4,20 @@
#include <queue>
#include <vector>
#include <list>
#include <fstream>
#include "Config.h"
#include "HTTP.h"
#include "preview/Comment.h"
#include "search/Thumbnail.h"
#include "client/SaveInfo.h"
#include "client/SaveFile.h"
#include "Singleton.h"
#include "User.h"
#include "cajun/reader.h"
#include "cajun/writer.h"
#include "cajun/elements.h"
class Thumbnail;
class SaveInfo;
class SaveFile;
class SaveComment;
class GameSave;
enum LoginStatus {
LoginOkay, LoginError
};
@ -55,7 +54,7 @@ private:
std::string lastError;
list<string> stampIDs;
std::list<std::string> stampIDs;
int lastStampTime;
int lastStampName;
@ -70,7 +69,7 @@ private:
int activeThumbRequestCompleteTimes[IMGCONNS];
std::string activeThumbRequestIDs[IMGCONNS];
void updateStamps();
static vector<std::string> explodePropertyString(std::string property);
static std::vector<std::string> explodePropertyString(std::string property);
void notifyUpdateAvailable();
void notifyAuthUserChanged();
void notifyMessageOfTheDay();
@ -79,7 +78,7 @@ private:
json::Object configDocument;
public:
vector<ClientListener*> listeners;
std::vector<ClientListener*> listeners;
UpdateInfo GetUpdateInfo();
@ -109,10 +108,10 @@ public:
RequestStatus ExecVote(int saveID, int direction);
RequestStatus UploadSave(SaveInfo & save);
SaveFile * GetStamp(string stampID);
void DeleteStamp(string stampID);
string AddStamp(GameSave * saveData);
vector<string> GetStamps(int start, int count);
SaveFile * GetStamp(std::string stampID);
void DeleteStamp(std::string stampID);
std::string AddStamp(GameSave * saveData);
std::vector<std::string> GetStamps(int start, int count);
int GetStampsCount();
SaveFile * GetFirstStamp();
@ -120,10 +119,10 @@ public:
unsigned char * GetSaveData(int saveID, int saveDate, int & dataLength);
std::vector<unsigned char> GetSaveData(int saveID, int saveDate);
LoginStatus Login(string username, string password, User & user);
LoginStatus Login(std::string username, std::string password, User & user);
void ClearThumbnailRequests();
std::vector<SaveInfo*> * SearchSaves(int start, int count, string query, string sort, string category, int & resultCount);
std::vector<std::pair<std::string, int> > * GetTags(int start, int count, string query, int & resultCount);
std::vector<SaveInfo*> * SearchSaves(int start, int count, std::string query, std::string sort, std::string category, int & resultCount);
std::vector<std::pair<std::string, int> > * GetTags(int start, int count, std::string query, int & resultCount);
std::vector<SaveComment*> * GetComments(int saveID, int start, int count);
Thumbnail * GetPreview(int saveID, int saveDate);
Thumbnail * GetThumbnail(int saveID, int saveDate);
@ -134,8 +133,8 @@ public:
RequestStatus FavouriteSave(int saveID, bool favourite);
void SetAuthUser(User user);
User GetAuthUser();
std::vector<string> * RemoveTag(int saveID, string tag); //TODO RequestStatus
std::vector<string> * AddTag(int saveID, string tag);
std::vector<std::string> * RemoveTag(int saveID, std::string tag); //TODO RequestStatus
std::vector<std::string> * AddTag(int saveID, std::string tag);
std::string GetLastError() {
return lastError;
}
@ -146,26 +145,26 @@ public:
double GetPrefNumber(std::string property, double defaultValue);
int GetPrefInteger(std::string property, int defaultValue);
unsigned int GetPrefUInteger(std::string property, unsigned int defaultValue);
vector<string> GetPrefStringArray(std::string property);
vector<double> GetPrefNumberArray(std::string property);
vector<int> GetPrefIntegerArray(std::string property);
vector<unsigned int> GetPrefUIntegerArray(std::string property);
vector<bool> GetPrefBoolArray(std::string property);
std::vector<std::string> GetPrefStringArray(std::string property);
std::vector<double> GetPrefNumberArray(std::string property);
std::vector<int> GetPrefIntegerArray(std::string property);
std::vector<unsigned int> GetPrefUIntegerArray(std::string property);
std::vector<bool> GetPrefBoolArray(std::string property);
bool GetPrefBool(std::string property, bool defaultValue);
void SetPref(std::string property, std::string value);
void SetPref(std::string property, double value);
void SetPref(std::string property, int value);
void SetPref(std::string property, unsigned int value);
void SetPref(std::string property, vector<string> value);
void SetPref(std::string property, vector<double> value);
void SetPref(std::string property, vector<int> value);
void SetPref(std::string property, vector<unsigned int> value);
void SetPref(std::string property, vector<bool> value);
void SetPref(std::string property, std::vector<std::string> value);
void SetPref(std::string property, std::vector<double> value);
void SetPref(std::string property, std::vector<int> value);
void SetPref(std::string property, std::vector<unsigned int> value);
void SetPref(std::string property, std::vector<bool> value);
void SetPref(std::string property, bool value);
json::UnknownElement GetPref(std::string property);
void setPrefR(std::deque<string> tokens, json::UnknownElement & element, json::UnknownElement & value);
void setPrefR(std::deque<std::string> tokens, json::UnknownElement & element, json::UnknownElement & value);
void SetPref(std::string property, json::UnknownElement & value);
};

View File

@ -41,10 +41,10 @@ originalData(save.originalData)
{
setSize(save.blockWidth, save.blockHeight);
copy(save.particles, save.particles+NPART, particles);
copy(save.blockMapPtr, save.blockMapPtr+(blockHeight*blockWidth), blockMapPtr);
copy(save.fanVelXPtr, save.fanVelXPtr+(blockHeight*blockWidth), fanVelXPtr);
copy(save.fanVelYPtr, save.fanVelYPtr+(blockHeight*blockWidth), fanVelYPtr);
std::copy(save.particles, save.particles+NPART, particles);
std::copy(save.blockMapPtr, save.blockMapPtr+(blockHeight*blockWidth), blockMapPtr);
std::copy(save.fanVelXPtr, save.fanVelXPtr+(blockHeight*blockWidth), fanVelXPtr);
std::copy(save.fanVelYPtr, save.fanVelYPtr+(blockHeight*blockWidth), fanVelYPtr);
}
else
{
@ -261,11 +261,11 @@ void GameSave::setSize(int newWidth, int newHeight)
particles = new Particle[NPART];
blockMapPtr = new unsigned char[blockHeight*blockWidth];
fill(blockMapPtr, blockMapPtr+(blockHeight*blockWidth), 0);
std::fill(blockMapPtr, blockMapPtr+(blockHeight*blockWidth), 0);
fanVelXPtr = new float[(blockHeight)*(blockWidth)];
fill(fanVelXPtr, fanVelXPtr+((blockHeight)*(blockWidth)), 0);
std::fill(fanVelXPtr, fanVelXPtr+((blockHeight)*(blockWidth)), 0);
fanVelYPtr = new float[(blockHeight)*(blockWidth)];
fill(fanVelYPtr, fanVelYPtr+((blockHeight)*(blockWidth)), 0);
std::fill(fanVelYPtr, fanVelYPtr+((blockHeight)*(blockWidth)), 0);
blockMap = new unsigned char*[blockHeight];
for(int y = 0; y < blockHeight; y++)
@ -330,11 +330,11 @@ void GameSave::Transform(matrix2d transform, vector2d translate)
unsigned char * blockMapPtrNew;
blockMapPtrNew = new unsigned char[newBlockHeight*newBlockWidth];
fill(blockMapPtrNew, blockMapPtrNew+(newBlockHeight*newBlockWidth), 0);
std::fill(blockMapPtrNew, blockMapPtrNew+(newBlockHeight*newBlockWidth), 0);
fanVelXPtrNew = new float[newBlockHeight*newBlockWidth];
fill(fanVelXPtrNew, fanVelXPtrNew+(newBlockHeight*newBlockWidth), 0);
std::fill(fanVelXPtrNew, fanVelXPtrNew+(newBlockHeight*newBlockWidth), 0);
fanVelYPtrNew = new float[(newBlockHeight)*(newBlockWidth)];
fill(fanVelYPtrNew, fanVelYPtrNew+(newBlockHeight*newBlockWidth), 0);
std::fill(fanVelYPtrNew, fanVelYPtrNew+(newBlockHeight*newBlockWidth), 0);
blockMapNew = new unsigned char*[newBlockHeight];
for(int y = 0; y < newBlockHeight; y++)
@ -992,7 +992,7 @@ void GameSave::readPSv(char * data, int dataLength)
memcpy(goltype, golTypesT, sizeof(int) * (golTypesCount));
free(golTypesT);
vector<Element> elements = GetElements();
std::vector<Element> elements = GetElements();
try
{
@ -1609,7 +1609,7 @@ char * GameSave::serialiseOPS(int & dataLength)
int posCount, signsCount;
bson b;
fill(elementCount, elementCount+PT_NUM, 0);
std::fill(elementCount, elementCount+PT_NUM, 0);
//Get coords in blocks
blockX = 0;//orig_x0/CELL;

View File

@ -12,17 +12,18 @@
#include <string>
#include "Config.h"
#include "Misc.h"
#include "simulation/Sign.h"
#include "simulation/Particle.h"
using namespace std;
//using namespace std;
struct ParseException: public exception {
struct ParseException: public std::exception {
enum ParseResult { OK = 0, Corrupt, WrongVersion, InvalidDimensions, InternalError, MissingElement };
string message;
std::string message;
ParseResult result;
public:
ParseException(ParseResult result, string message_): message(message_), result(result) {}
ParseException(ParseResult result, std::string message_): message(message_), result(result) {}
const char * what() const throw()
{
return message.c_str();

View File

@ -6,8 +6,9 @@
*/
#include "SaveFile.h"
#include "GameSave.h"
#include "Client.h"
#include "search/Thumbnail.h"
#include "search/Thumbnail.h"
SaveFile::SaveFile(SaveFile & save):
gameSave(NULL),
@ -31,7 +32,7 @@ void SaveFile::SetThumbnail(Thumbnail * thumb)
thumbnail = thumb;
}
SaveFile::SaveFile(string filename):
SaveFile::SaveFile(std::string filename):
filename(filename),
displayName(filename),
gameSave(NULL),
@ -50,17 +51,17 @@ void SaveFile::SetGameSave(GameSave * save)
gameSave = save;
}
string SaveFile::GetName()
std::string SaveFile::GetName()
{
return filename;
}
string SaveFile::GetDisplayName()
std::string SaveFile::GetDisplayName()
{
return displayName;
}
void SaveFile::SetDisplayName(string displayName)
void SaveFile::SetDisplayName(std::string displayName)
{
this->displayName = displayName;
}

View File

@ -9,31 +9,29 @@
#define SAVEFILE_H_
#include <string>
#include "GameSave.h"
using namespace std;
class GameSave;
class Thumbnail;
class SaveFile {
public:
SaveFile(SaveFile & save);
SaveFile(string filename);
SaveFile(std::string filename);
Thumbnail * GetThumbnail();
GameSave * GetGameSave();
void SetThumbnail(Thumbnail * thumb);
void SetGameSave(GameSave * save);
string GetDisplayName();
void SetDisplayName(string displayName);
string GetName();
std::string GetDisplayName();
void SetDisplayName(std::string displayName);
std::string GetName();
virtual ~SaveFile();
private:
Thumbnail * thumbnail;
GameSave * gameSave;
string filename;
string displayName;
std::string filename;
std::string displayName;
};
#endif /* SAVEFILE_H_ */

View File

@ -5,8 +5,9 @@
* Author: Simon
*/
#include "client/SaveInfo.h"
#include "client/Client.h"
#include "SaveInfo.h"
#include "GameSave.h"
#include "Client.h"
SaveInfo::SaveInfo(SaveInfo & save) :
userName(save.userName), name(save.name), Description(save.Description), date(
@ -16,15 +17,15 @@ SaveInfo::SaveInfo(SaveInfo & save) :
gameSave = new GameSave(*save.gameSave);
}
SaveInfo::SaveInfo(int _id, int _date, int _votesUp, int _votesDown, string _userName,
string _name) :
SaveInfo::SaveInfo(int _id, int _date, int _votesUp, int _votesDown, std::string _userName,
std::string _name) :
id(_id), votesUp(_votesUp), votesDown(_votesDown), userName(_userName), name(
_name), Description("No description provided"), date(_date), Published(
true), gameSave(NULL), vote(0), tags(), Comments(0) {
}
SaveInfo::SaveInfo(int _id, int date_, int _votesUp, int _votesDown, int _vote, string _userName,
string _name, string description_, bool published_, vector<string> tags_) :
SaveInfo::SaveInfo(int _id, int date_, int _votesUp, int _votesDown, int _vote, std::string _userName,
std::string _name, std::string description_, bool published_, std::vector<std::string> tags_) :
id(_id), votesUp(_votesUp), votesDown(_votesDown), userName(_userName), name(
_name), Description(description_), date(date_), Published(
published_), gameSave(NULL), vote(_vote), tags(tags_), Comments(0) {
@ -38,17 +39,17 @@ SaveInfo::~SaveInfo()
}
}
void SaveInfo::SetName(string name) {
void SaveInfo::SetName(std::string name) {
this->name = name;
}
string SaveInfo::GetName() {
std::string SaveInfo::GetName() {
return name;
}
void SaveInfo::SetDescription(string description) {
void SaveInfo::SetDescription(std::string description) {
Description = description;
}
string SaveInfo::GetDescription() {
std::string SaveInfo::GetDescription() {
return Description;
}
@ -69,11 +70,11 @@ int SaveInfo::GetVote()
return vote;
}
void SaveInfo::SetUserName(string userName) {
void SaveInfo::SetUserName(std::string userName) {
this->userName = userName;
}
string SaveInfo::GetUserName() {
std::string SaveInfo::GetUserName() {
return userName;
}
@ -98,11 +99,11 @@ int SaveInfo::GetVotesDown() {
return votesDown;
}
void SaveInfo::SetTags(vector<string> tags)
void SaveInfo::SetTags(std::vector<std::string> tags)
{
this->tags = tags;
}
vector<string> SaveInfo::GetTags()
std::vector<std::string> SaveInfo::GetTags()
{
return tags;
}

View File

@ -5,10 +5,8 @@
#include <string>
#include <stdlib.h>
#include <iostream>
#include <string.h>
#include "GameSave.h"
using namespace std;
class GameSave;
class SaveInfo
{
@ -24,34 +22,34 @@ public:
SaveInfo(SaveInfo & save);
SaveInfo(int _id, int _date, int _votesUp, int _votesDown, string _userName, string _name);
SaveInfo(int _id, int _date, int _votesUp, int _votesDown, std::string _userName, std::string _name);
SaveInfo(int _id, int date_, int _votesUp, int _votesDown, int _vote, string _userName, string _name, string description_, bool published_, vector<string> tags);
SaveInfo(int _id, int date_, int _votesUp, int _votesDown, int _vote, std::string _userName, std::string _name, std::string description_, bool published_, std::vector<std::string> tags);
~SaveInfo();
string userName;
string name;
std::string userName;
std::string name;
string Description;
std::string Description;
vector<string> tags;
std::vector<std::string> tags;
int vote;
bool Published;
void SetName(string name);
string GetName();
void SetName(std::string name);
std::string GetName();
void SetDescription(string description);
string GetDescription();
void SetDescription(std::string description);
std::string GetDescription();
void SetPublished(bool published);
bool GetPublished();
void SetUserName(string userName);
string GetUserName();
void SetUserName(std::string userName);
std::string GetUserName();
void SetID(int id);
int GetID();
@ -65,8 +63,8 @@ public:
void SetVotesDown(int votesDown);
int GetVotesDown();
void SetTags(vector<string> tags);
vector<string> GetTags();
void SetTags(std::vector<std::string> tags);
std::vector<std::string> GetTags();
GameSave * GetGameSave();
void SetGameSave(GameSave * gameSave);

Some files were not shown because too many files have changed in this diff Show More