From 33554a591c2639d20dc3ad94665ee09ae5d04a3d Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Fri, 20 Nov 2009 02:45:19 +0000 Subject: [PATCH] fixed multiple insertions of the same texture --- 3dengfx.conf | 2 +- Makefile | 18 +++++++++--------- src/parts/.dist.hpp.swp | Bin 12288 -> 0 bytes src/parts/.space.cpp.swp | Bin 20480 -> 0 bytes src/parts/pipes.cpp | 1 - src/parts/space.cpp | 1 - src/parts/temple.cpp | 1 - 7 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 src/parts/.dist.hpp.swp delete mode 100644 src/parts/.space.cpp.swp diff --git a/3dengfx.conf b/3dengfx.conf index 0af8e71..7b57a19 100644 --- a/3dengfx.conf +++ b/3dengfx.conf @@ -4,7 +4,7 @@ ; tool) so your best bet would be using that tool to configure the demo. ; If that does not work for some reason, modify this file with care... -fullscreen = true +fullscreen = false resolution = 1024x768 bpp = dontcare zbuffer = dontcare diff --git a/Makefile b/Makefile index 4292695..459126d 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,16 @@ -src := src/sumhack.cpp src/events.cpp -bin := sumhack-thelab +src = src/sumhack.cpp src/events.cpp +bin = sumhack-thelab include src/parts/Makefile-part include src/sdlvf/Makefile-part -obj := $(src:.cpp=.o) $(csrc:.c=.o) +obj = $(src:.cpp=.o) $(csrc:.c=.o) -opt := -O1 -opt := -g -CXXFLAGS := -ansi -pedantic -Wall $(opt) -Isrc/3dengfx/src `src/3dengfx/3dengfx-config --cflags` -CFLAGS := -std=c89 -pedantic -Wall $(opt) `src/3dengfx/3dengfx-config --cflags` -libs := src/3dengfx/lib3dengfx.a `src/3dengfx/3dengfx-config --libs-no-3dengfx` -lGL -lvorbisfile +opt = -O1 +opt = -g +CXXFLAGS = -ansi -pedantic -Wall $(opt) -Isrc/3dengfx/src `src/3dengfx/3dengfx-config --cflags` +CFLAGS = -std=c89 -pedantic -Wall $(opt) `src/3dengfx/3dengfx-config --cflags` +libs = src/3dengfx/lib3dengfx.a `src/3dengfx/3dengfx-config --libs-no-3dengfx` -lGL -lvorbisfile $(bin): $(obj) src/3dengfx/lib3dengfx.a data/tex_list $(CXX) -o $@ $(obj) $(libs) @@ -22,7 +22,7 @@ src/3dengfx/lib3dengfx.a: data/tex_list: $(src) tools/find_textures >$@ -include $(obj:.o=.d) +-include $(obj:.o=.d) %.d: %.cpp @set -e; rm -f $@; $(CXX) -MM $(CXXFLAGS) $< > $@.$$$$; \ diff --git a/src/parts/.dist.hpp.swp b/src/parts/.dist.hpp.swp deleted file mode 100644 index 8b934a2130f578a439966fdc4ffaca44fbce3408..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 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 I(3hzG1A`hu_W%F@ diff --git a/src/parts/pipes.cpp b/src/parts/pipes.cpp index ec45a28..c9e2b45 100644 --- a/src/parts/pipes.cpp +++ b/src/parts/pipes.cpp @@ -174,7 +174,6 @@ static void make_skycube(Scene *scene) { Material *mat = face[i]->get_material_ptr(); mat->emissive_color = 1.0; - add_texture(tex[i]); mat->set_texture(tex[i], TEXTYPE_DIFFUSE); face[i]->set_texture_addressing(TEXADDR_CLAMP); scene->add_object(face[i]); diff --git a/src/parts/space.cpp b/src/parts/space.cpp index 4bf9ba9..3339b5c 100644 --- a/src/parts/space.cpp +++ b/src/parts/space.cpp @@ -95,7 +95,6 @@ static void make_skycube(Scene *scene) { for(int i=0; i<6; i++) { Material *mat = face[i]->get_material_ptr(); mat->emissive_color = 1.0; - add_texture(tex[i]); mat->set_texture(tex[i], TEXTYPE_DIFFUSE); face[i]->set_texture_addressing(TEXADDR_CLAMP); scene->add_object(face[i]); diff --git a/src/parts/temple.cpp b/src/parts/temple.cpp index e2a58e1..5db2eca 100644 --- a/src/parts/temple.cpp +++ b/src/parts/temple.cpp @@ -139,7 +139,6 @@ static void make_skycube(Scene *scene) { for(int i=0; i<6; i++) { Material *mat = face[i]->get_material_ptr(); mat->emissive_color = 1.0; - add_texture(tex[i]); mat->set_texture(tex[i], TEXTYPE_DIFFUSE); face[i]->set_texture_addressing(TEXADDR_CLAMP); scene->add_object(face[i]); -- 1.7.10.4