Initial
This commit is contained in:
commit
b0ea52690b
19
Changelog.txt
Normal file
19
Changelog.txt
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
- Special brush types
|
||||||
|
- Special brush delete
|
||||||
|
- LOVE
|
||||||
|
- LOLZ
|
||||||
|
- Property edit
|
||||||
|
- Saving, loading, thumbnailing, etc
|
||||||
|
- HEAT/COOL
|
||||||
|
- Streamlines
|
||||||
|
- Grid
|
||||||
|
- Sign moving
|
||||||
|
- Electron fancyness with glass, fire_r-g-b now out of scope
|
||||||
|
- Grav fancyness, use current frame index to determine colour, not globals!
|
||||||
|
- Emp flash
|
||||||
|
- Stickman HP
|
||||||
|
|
||||||
|
To do:
|
||||||
|
See TODO's
|
||||||
|
Char * and string, hmm....
|
||||||
|
Vectors for things like signs, stamp list, etc where appropriate
|
42
Makefile
Normal file
42
Makefile
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
HEADERS := $(wildcard includes/*.h)
|
||||||
|
|
||||||
|
OLD_SOURCES := $(wildcard src/*.c)
|
||||||
|
OLD_OBJS := $(patsubst src/%.c,build/obj/%.o,$(OLD_SOURCES))
|
||||||
|
|
||||||
|
EL_SOURCES := $(wildcard elements/*.cpp)
|
||||||
|
EL_OBJS := $(patsubst elements/%.cpp,build/obj/elements/%.o,$(EL_SOURCES))
|
||||||
|
EL_PREREQ := $(patsubst build/obj/elements/%.o,build/obj/elements/%.powder.exe.o,$(EL_OBJS))
|
||||||
|
|
||||||
|
CORE_SOURCES := $(wildcard src/*.cpp)
|
||||||
|
CORE_OBJS := $(patsubst src/%.cpp,build/obj/core/%.o,$(CORE_SOURCES))
|
||||||
|
CORE_PREREQ := $(patsubst build/obj/core/%.o,build/obj/core/%.powder.exe.o,$(CORE_OBJS))
|
||||||
|
|
||||||
|
UI_SOURCES := $(wildcard src/interface/*.cpp)
|
||||||
|
UI_OBJS := $(patsubst src/interface/%.cpp,build/obj/ui/%.o,$(UI_SOURCES))
|
||||||
|
UI_PREREQ := $(patsubst build/obj/ui/%.o,build/obj/ui/%.powder.exe.o,$(UI_OBJS))
|
||||||
|
|
||||||
|
CFLAGS := -Iincludes/ -Idata/ -DWIN32
|
||||||
|
OFLAGS := -O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations -fkeep-inline-functions
|
||||||
|
LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 # -mwindows
|
||||||
|
|
||||||
|
CFLAGS += $(OFLAGS)
|
||||||
|
|
||||||
|
CPPC := g++
|
||||||
|
CPPC_WIN := i686-w64-mingw32-gcc
|
||||||
|
WIN_RES := i686-w64-mingw32-windres
|
||||||
|
|
||||||
|
build/powder.exe: $(EL_PREREQ) $(CORE_PREREQ) $(UI_PREREQ)
|
||||||
|
$(CPPC) $(CFLAGS) $(LDFLAGS) $(EXTRA_OBJS) $(EL_PREREQ) $(CORE_PREREQ) $(UI_PREREQ) $(LFLAGS) -o $@ -ggdb
|
||||||
|
build/obj/ui/%.powder.exe.o: src/interface/%.cpp $(HEADERS)
|
||||||
|
$(CPPC) -c $(CFLAGS) -o $@ $< -ggdb
|
||||||
|
build/obj/elements/%.powder.exe.o: elements/%.cpp $(HEADERS)
|
||||||
|
$(CPPC) -c $(CFLAGS) -o $@ $< -ggdb
|
||||||
|
build/obj/core/%.powder.exe.o: src/%.cpp $(HEADERS)
|
||||||
|
$(CPPC) -c $(CFLAGS) -o $@ $< -ggdb
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm build/obj/core/*.o
|
||||||
|
rm build/obj/ui/*.o
|
||||||
|
rm build/obj/elements/*.o
|
||||||
|
rm build/obj/*.o
|
||||||
|
rm build/*.exe
|
0
build/obj/core/.empty
Normal file
0
build/obj/core/.empty
Normal file
BIN
build/obj/core/Air.powder.exe.o
Normal file
BIN
build/obj/core/Air.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/core/Graphics.powder.exe.o
Normal file
BIN
build/obj/core/Graphics.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/core/Gravity.powder.exe.o
Normal file
BIN
build/obj/core/Gravity.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/core/Misc.powder.exe.o
Normal file
BIN
build/obj/core/Misc.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/core/PowderToy.powder.exe.o
Normal file
BIN
build/obj/core/PowderToy.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/core/Renderer.powder.exe.o
Normal file
BIN
build/obj/core/Renderer.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/core/Simulation.powder.exe.o
Normal file
BIN
build/obj/core/Simulation.powder.exe.o
Normal file
Binary file not shown.
0
build/obj/elements/.empty
Normal file
0
build/obj/elements/.empty
Normal file
BIN
build/obj/elements/O2.powder.exe.o
Normal file
BIN
build/obj/elements/O2.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/acel.powder.exe.o
Normal file
BIN
build/obj/elements/acel.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/acid.powder.exe.o
Normal file
BIN
build/obj/elements/acid.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/amtr.powder.exe.o
Normal file
BIN
build/obj/elements/amtr.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/anar.powder.exe.o
Normal file
BIN
build/obj/elements/anar.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/aray.powder.exe.o
Normal file
BIN
build/obj/elements/aray.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/bang.powder.exe.o
Normal file
BIN
build/obj/elements/bang.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/bcln.powder.exe.o
Normal file
BIN
build/obj/elements/bcln.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/bcol.powder.exe.o
Normal file
BIN
build/obj/elements/bcol.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/bizr.powder.exe.o
Normal file
BIN
build/obj/elements/bizr.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/bmtl.powder.exe.o
Normal file
BIN
build/obj/elements/bmtl.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/bomb.powder.exe.o
Normal file
BIN
build/obj/elements/bomb.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/boyl.powder.exe.o
Normal file
BIN
build/obj/elements/boyl.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/brmt.powder.exe.o
Normal file
BIN
build/obj/elements/brmt.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/btry.powder.exe.o
Normal file
BIN
build/obj/elements/btry.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/c5.powder.exe.o
Normal file
BIN
build/obj/elements/c5.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/caus.powder.exe.o
Normal file
BIN
build/obj/elements/caus.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/cbnw.powder.exe.o
Normal file
BIN
build/obj/elements/cbnw.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/clne.powder.exe.o
Normal file
BIN
build/obj/elements/clne.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/clst.powder.exe.o
Normal file
BIN
build/obj/elements/clst.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/co2.powder.exe.o
Normal file
BIN
build/obj/elements/co2.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/coal.powder.exe.o
Normal file
BIN
build/obj/elements/coal.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/conv.powder.exe.o
Normal file
BIN
build/obj/elements/conv.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/dest.powder.exe.o
Normal file
BIN
build/obj/elements/dest.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/deut.powder.exe.o
Normal file
BIN
build/obj/elements/deut.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/dlay.powder.exe.o
Normal file
BIN
build/obj/elements/dlay.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/dstw.powder.exe.o
Normal file
BIN
build/obj/elements/dstw.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/elec.powder.exe.o
Normal file
BIN
build/obj/elements/elec.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/elementmisc.powder.exe.o
Normal file
BIN
build/obj/elements/elementmisc.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/emp.powder.exe.o
Normal file
BIN
build/obj/elements/emp.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/figh.powder.exe.o
Normal file
BIN
build/obj/elements/figh.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/fire.powder.exe.o
Normal file
BIN
build/obj/elements/fire.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/firw.powder.exe.o
Normal file
BIN
build/obj/elements/firw.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/fog.powder.exe.o
Normal file
BIN
build/obj/elements/fog.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/frzw.powder.exe.o
Normal file
BIN
build/obj/elements/frzw.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/frzz.powder.exe.o
Normal file
BIN
build/obj/elements/frzz.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/fsep.powder.exe.o
Normal file
BIN
build/obj/elements/fsep.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/fuse.powder.exe.o
Normal file
BIN
build/obj/elements/fuse.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/fwrk.powder.exe.o
Normal file
BIN
build/obj/elements/fwrk.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/gbmb.powder.exe.o
Normal file
BIN
build/obj/elements/gbmb.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/glas.powder.exe.o
Normal file
BIN
build/obj/elements/glas.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/glow.powder.exe.o
Normal file
BIN
build/obj/elements/glow.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/goo.powder.exe.o
Normal file
BIN
build/obj/elements/goo.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/gpmp.powder.exe.o
Normal file
BIN
build/obj/elements/gpmp.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/graphics_default.powder.exe.o
Normal file
BIN
build/obj/elements/graphics_default.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/h2.powder.exe.o
Normal file
BIN
build/obj/elements/h2.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/hswc.powder.exe.o
Normal file
BIN
build/obj/elements/hswc.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/ice.powder.exe.o
Normal file
BIN
build/obj/elements/ice.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/ignt.powder.exe.o
Normal file
BIN
build/obj/elements/ignt.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/iron.powder.exe.o
Normal file
BIN
build/obj/elements/iron.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/isz.powder.exe.o
Normal file
BIN
build/obj/elements/isz.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/lava.powder.exe.o
Normal file
BIN
build/obj/elements/lava.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/lcry.powder.exe.o
Normal file
BIN
build/obj/elements/lcry.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/legacy.powder.exe.o
Normal file
BIN
build/obj/elements/legacy.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/ligh.powder.exe.o
Normal file
BIN
build/obj/elements/ligh.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/merc.powder.exe.o
Normal file
BIN
build/obj/elements/merc.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/mort.powder.exe.o
Normal file
BIN
build/obj/elements/mort.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/nbhl.powder.exe.o
Normal file
BIN
build/obj/elements/nbhl.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/neut.powder.exe.o
Normal file
BIN
build/obj/elements/neut.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/newgraphics.powder.exe.o
Normal file
BIN
build/obj/elements/newgraphics.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/none.powder.exe.o
Normal file
BIN
build/obj/elements/none.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/nptct.powder.exe.o
Normal file
BIN
build/obj/elements/nptct.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/nwhl.powder.exe.o
Normal file
BIN
build/obj/elements/nwhl.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/pbcn.powder.exe.o
Normal file
BIN
build/obj/elements/pbcn.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/pcln.powder.exe.o
Normal file
BIN
build/obj/elements/pcln.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/phot.powder.exe.o
Normal file
BIN
build/obj/elements/phot.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/pipe.powder.exe.o
Normal file
BIN
build/obj/elements/pipe.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/plnt.powder.exe.o
Normal file
BIN
build/obj/elements/plnt.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/plsm.powder.exe.o
Normal file
BIN
build/obj/elements/plsm.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/plut.powder.exe.o
Normal file
BIN
build/obj/elements/plut.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/prti.powder.exe.o
Normal file
BIN
build/obj/elements/prti.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/prto.powder.exe.o
Normal file
BIN
build/obj/elements/prto.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/pump.powder.exe.o
Normal file
BIN
build/obj/elements/pump.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/pvod.powder.exe.o
Normal file
BIN
build/obj/elements/pvod.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/pyro.powder.exe.o
Normal file
BIN
build/obj/elements/pyro.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/qrtz.powder.exe.o
Normal file
BIN
build/obj/elements/qrtz.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/rime.powder.exe.o
Normal file
BIN
build/obj/elements/rime.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/shld.powder.exe.o
Normal file
BIN
build/obj/elements/shld.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/sing.powder.exe.o
Normal file
BIN
build/obj/elements/sing.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/sltw.powder.exe.o
Normal file
BIN
build/obj/elements/sltw.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/smke.powder.exe.o
Normal file
BIN
build/obj/elements/smke.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/soap.powder.exe.o
Normal file
BIN
build/obj/elements/soap.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/spng.powder.exe.o
Normal file
BIN
build/obj/elements/spng.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/sprk.powder.exe.o
Normal file
BIN
build/obj/elements/sprk.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/stkm.powder.exe.o
Normal file
BIN
build/obj/elements/stkm.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/stkm2.powder.exe.o
Normal file
BIN
build/obj/elements/stkm2.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/stor.powder.exe.o
Normal file
BIN
build/obj/elements/stor.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/swch.powder.exe.o
Normal file
BIN
build/obj/elements/swch.powder.exe.o
Normal file
Binary file not shown.
BIN
build/obj/elements/thdr.powder.exe.o
Normal file
BIN
build/obj/elements/thdr.powder.exe.o
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user