Merge branch 'master' of ssh://pgornicz@cpu22.student.cs.uwaterloo.ca/~/.git-repos...

diff --git a/.gitignore b/.gitignore
index 20d0e14..7a20e26 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 run_physics
 objs
 deps
+objs-mingw32
+bin-mingw32

diff --git a/src/Makefile.mingw32 b/src/Makefile.mingw32
new file mode 100644 (file)
index 0000000..ed5d00a
--- /dev/null
+++ b/src/Makefile.mingw32
@@ -0,0 +1,141 @@
+
+LIBGL  := -lopengl32 -lglu32
+LIBSDL := `/usr/mingw32/bin/sdl-config --libs`
+LIBS   := ${LIBSDL} ${LIBGL}
+
+OPTFLAGS := -O2
+DBGFLAGS := -ggdb
+PRFFLAGS := ${DBGFLAGS} -pg
+MYFLAGS  := -Wall -pedantic -ansi
+CXXFLAGS := ${OPTFLAGS}
+
+VALFLAGS := --leak-check=full
+
+CXX := mingw32-g++
+
+WORKINGDIR  := ../bin-mingw32
+TARGETNAME  := run_physics.exe
+TARGET      := ${WORKINGDIR}/${TARGETNAME}
+
+SRCS := # simply to keep every line below the same
+
+DIRS := # := start
+DIRS += .
+DIRS += Entities
+DIRS += GameStates
+DIRS += Effects
+DIRS += config
+DIRS += input
+DIRS += graphics
+
+include $(addsuffix /files.mk,${DIRS})
+
+OBJSDIR := ../objs-mingw32/
+OBJS    := ${SRCS:.cpp=.o}
+OBJS    := $(addprefix ${OBJSDIR},${OBJS})
+
+DEPSDIR := ../deps/
+DEPS    := ${SRCS:.cpp=.d}
+DEPS    := $(addprefix ${DEPSDIR},${DEPS})
+
+BLDDIRS := $(addprefix ${DEPSDIR},${DIRS}) $(addprefix ${OBJSDIR},${DIRS})
+BLDDIRS := $(addsuffix /,${BLDDIRS})
+
+
+VERBOSE := 0
+
+ifeq (${VERBOSE},0)
+    # quiet the echo command
+    Q1 := @
+    # quiet the command that is `replaced' by an echo
+    Q2 := @
+else
+    # EAT the echo command as if it was not there
+    Q1 := @true # NOTE: the space between @true and the # is VERY important!!
+    # do not quiet the command output
+    Q2 :=
+endif
+
+.PHONY: all
+all: ${TARGET}
+
+# how to link the main target
+${TARGET}: ${OBJS}
+       ${Q1}echo "${CXX}: $@"
+       ${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
+
+# how to make a directory
+${BLDDIRS}:
+       ${Q2}mkdir -p $@
+
+# rule to make a depend file from a .cpp
+${DEPSDIR}%.d: %.cpp | ${BLDDIRS}
+       ${Q1}echo "DEP: $@"
+       ${Q2}${CXX} -MM ${CXXFLAGS} $< | sed 's,\(^.*\):,${OBJSDIR}\1 $@:,' > $@
+
+# rule to make an object file from a .cpp
+${OBJSDIR}%.o: %.cpp | ${BLDDIRS}
+       ${Q1}echo "${CXX}: $@"
+       ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
+
+
+tags: ${SRCS}
+       ${Q1}echo "ctags: $@"
+       ${Q2}ctags $^
+
+
+.PHONY: clean
+clean:
+       ${Q1}echo "CLEAN: OBJS"
+       ${Q2}rm -f ${OBJS}
+       ${Q1}echo "CLEAN: TARGET"
+       ${Q2}rm -f ${TARGET}
+
+.PHONY: distclean
+distclean: clean
+       ${Q1}echo "CLEAN: DEPS"
+       ${Q2}rm -f ${DEPS}
+       ${Q1}echo "CLEAN: tags prof gmon.out"
+       ${Q2}rm -f tags prof gmon.out
+
+.PHONY: gitclean
+gitclean:
+       ${Q1}echo "git-clean: show, use gitcleanf to force"
+       ${Q2}cd ..; git clean -nxd
+
+.PHONY: gitcleanf
+gitcleanf:
+       ${Q1}echo "git-clean: forced"
+       ${Q2}cd ..; git clean -fxd
+
+.PHONY: tar
+tar: ../physics.tar.bz2
+
+.PHONY: ../physics.tar.bz2
+../physics.tar.bz2:
+       @echo "git-archive: Warning, archives HEAD not current"
+       ${Q1}echo "git-archive: ../physics.tar.bz2"
+       ${Q2}cd ..; git-archive --prefix=physics/ HEAD | bzip2 > physics.tar.bz2
+
+.PHONY: run
+run: all
+       cd ${WORKINGDIR}; wine ${TARGETNAME}
+
+.PHONY: gdb
+gdb: all
+       cd ${WORKINGDIR}; gdb ${TARGETNAME}
+
+.PHONY: cgdb
+cgdb: all
+       cd ${WORKINGDIR}; cgdb ${TARGETNAME}
+
+.PHONY: val
+val: all
+       cd ${WORKINGDIR}; valgrind ${VALFLAGS} ${TARGETNAME}
+
+.PHONY: prof
+prof: run
+       cd ${WORKINGDIR}; gprof -b ${TARGETNAME} > src/prof
+       kprof -f prof
+
+-include ${DEPS}

diff --git a/src/collisionManager.cpp b/src/collisionManager.cpp
index 3327ebb..39f6396 100644 (file)
--- a/src/collisionManager.cpp
+++ b/src/collisionManager.cpp
@@ -81,9 +81,7 @@ void applyCollisionAt(PhysicsEntity* p1, PhysicsEntity* p2)
         return;
     }
 
-#ifdef WARNINGS
-    cerr << "ENTITY TYPE NOT SUPPORTED BY applyCollisionAt()!!" << endl;
-#endif
+    DPF(0, "ENTITY TYPE NOT SUPPORTED BY applyCollisionAt()!!");
 }
 
 void applyCollisionAt(Ball* b1, Ball* b2)

diff --git a/src/config/reader.cpp b/src/config/reader.cpp
index d29f8b0..e8757dd 100644 (file)
--- a/src/config/reader.cpp
+++ b/src/config/reader.cpp
@@ -19,6 +19,10 @@
 #include "../debug.h"
 
 #include <iostream>
+using std::cerr;
+using std::cout;
+using std::endl;
+
 #include <fstream>
 #include <string>
 

diff --git a/src/debug.cpp b/src/debug.cpp
new file mode 100644 (file)
index 0000000..148db98
--- /dev/null
+++ b/src/debug.cpp
@@ -0,0 +1,32 @@
+/*
+ *  Copyright (C) 2008 Patrik Gornicz, Gornicz_P (at) hotmail (dot) com.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "debug.h"
+
+#include <iostream>
+using std::cerr;
+using std::cout;
+using std::endl;
+
+/// ***** Public Methods *****
+
+void DPF(int level, const char* pstr)
+{
+  //cout << pstr << endl;
+}
+
+/// ***** Private Methods *****

diff --git a/src/debug.h b/src/debug.h
index 9460055..1fb0131 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -18,20 +18,16 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#include <iostream>
-using std::cerr;
-using std::cout;
-using std::endl;
-
+void DPF(int level, const char* pstr);
 
 // comment out when not debugging
 #define DEBUGGING
 
-// comment out to supress warnings
+// comment out to suppress warnings
 #define WARNINGS
 
 // comment out to prevent FPS and UPS printing
-#define FPSUPS
+//#define FPSUPS
 
 
 #endif // DEBUG_H

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index 0707dfe..bae30ae 100644 (file)
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -77,9 +77,7 @@ void manager::add(Entity* e)
         }
     }
 
-#ifdef WARNINGS
-    cerr << "ENTITY TYPE NOT SUPPORTED BY addEntity()!!" << endl;
-#endif
+    DPF(0, "ENTITY TYPE NOT SUPPORTED BY addEntity()!!");
 }
 void manager::remove(Entity* e)
 {
@@ -101,9 +99,7 @@ void manager::remove(Entity* e)
         }
     }
 
-#ifdef WARNINGS
-    cerr << "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!" << endl;
-#endif
+    DPF(0, "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!");
 }
 
 void manager::handleInput()

diff --git a/src/files.mk b/src/files.mk
index 33564c6..6bd3855 100644 (file)
--- a/src/files.mk
+++ b/src/files.mk
@@ -14,6 +14,8 @@ FILES += effectManager.cpp
 FILES += collisionManager.cpp
 FILES += CollisionInfo.cpp
 
+FILES += debug.cpp
+
 FILES := $(addprefix ${CURDIR},${FILES})
 
 SRCS += ${FILES}

diff --git a/src/game.cpp b/src/game.cpp
index 929f6b5..08f9530 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -65,9 +65,7 @@ void game::init()
 
     effect::init();
 
-#ifdef DEBUGGING
-    cout << "World Created" << endl;
-#endif
+    DPF(0, "World Created");
 }
 
 void game::clean()

diff --git a/src/graphics/graphics.cpp b/src/graphics/graphics.cpp
index d5148c1..17c2e38 100644 (file)
--- a/src/graphics/graphics.cpp
+++ b/src/graphics/graphics.cpp
@@ -25,6 +25,11 @@
 
 #include "../mathw.h"
 
+#include <iostream>
+using std::cerr;
+using std::cout;
+using std::endl;
+
 
 /// ***** Private Method Headers *****
 

diff --git a/src/handleSignal.cpp b/src/handleSignal.cpp
index 9068827..ef9daa6 100644 (file)
--- a/src/handleSignal.cpp
+++ b/src/handleSignal.cpp
@@ -28,6 +28,7 @@ void sighandler( int sig );
 
 void installSignal()
 {
+#ifndef __WIN32__
     // register signal handler
     struct sigaction sa;
     sigemptyset( &sa.sa_mask );
@@ -38,6 +39,7 @@ void installSignal()
     {
         std::cerr << "could not install SIGINT handler" << std::endl;
     }
+#endif // __WIN32__
 }
 
 /// ***** Private Methods *****
@@ -45,6 +47,7 @@ void installSignal()
 // signal handler function
 void sighandler( int sig )
 {
+#ifndef __WIN32__
     switch(sig)
     {
         case SIGINT:
@@ -56,4 +59,5 @@ void sighandler( int sig )
 
     // normally an abort is better ... but this is just SIGINT
     exit(sig);
+#endif // __WIN32__
 }

diff --git a/src/main.cpp b/src/main.cpp
index 7576077..a9984f6 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -86,7 +86,7 @@ float num = 10;
 float total = 0;
 
 /// ***** MAIN Method *****
-int main()
+int main(int argc, char** args)
 {
     init();
     run();
@@ -101,23 +101,23 @@ void init()
     installSignal();
 
     graphics::init();
+    DPF(0, "Graphics initialized");
 
     game::init();
+    DPF(0, "Game initialized");
 
     input::init();
+    DPF(0, "Input initialized");
 
     cfg::init();
+    DPF(0, "Configs initialized");
 
-#ifdef DEBUGGING
-    cout << "Initialization Complete" << endl;
-#endif
+    DPF(0, "Initialization Complete");
 }
 
 void clean()
 {
-#ifdef DEBUGGING
-    cout << "Cleaning up" << endl;
-#endif
+    DPF(0, "Cleaning up");
 
     cfg::clean();