From d6d139d7c4ed567e337a2c85ffcf18ca03dd3654 Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Fri, 14 Oct 2011 14:57:11 +0100 Subject: [PATCH] Time to get messy! Just a small commit before I break everything and wished I had it backed up. -- Change : README to correspond with the GPLv2 licence as the codebase is now public. -- Add : Static.h to enable me to stop classes from being copied. --- trunk/Bin/Debug.log | 34 ++++++++++++++++++++++++++++++++++ trunk/README | 29 ++++++++++++++++++++++++++++- trunk/Unuk-QT/Makefile | 12 +++++------- trunk/Unuk-QT/Unuk-QT.pro | 3 ++- trunk/Unuk-QT/Unuk-QT.pro.user | 6 +++--- trunk/src/libUnuk/Static.h | 22 ++++++++++++++++++++++ 6 files changed, 94 insertions(+), 12 deletions(-) create mode 100644 trunk/Bin/Debug.log create mode 100644 trunk/src/libUnuk/Static.h diff --git a/trunk/Bin/Debug.log b/trunk/Bin/Debug.log new file mode 100644 index 0000000..5c2b459 --- /dev/null +++ b/trunk/Bin/Debug.log @@ -0,0 +1,34 @@ +Log Started: Fri Oct 14 14:32:48 2011 + +-----Debug Initialized----- + +OpenGL 3.0 is not supported, falling back to 2.1. + + +-----Engine Initialization Complete----- + + +-----Logic----- +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key +Warning: Can not translate this key + + +-----Cleaning Up----- + +Player Deleted. + +Log Closed: Fri Oct 14 14:32:53 2011 + diff --git a/trunk/README b/trunk/README index 2c01732..7ec0afa 100644 --- a/trunk/README +++ b/trunk/README @@ -2,4 +2,31 @@ Readme plz! ___________ I have decided to use Git for SCM of this project. -Please see https://github.com/Allanis/Unuk \ No newline at end of file +Please see https://github.com/Allanis/Unuk + +################################################## + +I am currently working on a series of algorithms to show off +for a portfolio piece. I will place this under the GPL licence. + +################################################## + +Copyright (C) 2011 Allanis +allanis@saracraft.net + +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 2 +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +Here is a nice link to the licence: +http://www.gnu.org/licenses/gpl-2.0.html \ No newline at end of file diff --git a/trunk/Unuk-QT/Makefile b/trunk/Unuk-QT/Makefile index d112ba3..b6f3eed 100644 --- a/trunk/Unuk-QT/Makefile +++ b/trunk/Unuk-QT/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: Unuk-QT -# Generated by qmake (2.01a) (Qt 4.7.3) on: Sun Oct 9 18:24:18 2011 +# Generated by qmake (2.01a) (Qt 4.7.3) on: Fri Oct 14 14:55:11 2011 # Project: Unuk-QT.pro # Template: app # Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro @@ -16,7 +16,7 @@ CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. LINK = g++ LFLAGS = -LIBS = $(SUBLIBS) -L/usr/lib -lQtGui -lQtCore -lpthread -lSDL -lGL -lGLU +LIBS = $(SUBLIBS) -L/usr/lib -lQtGui -lQtCore -lpthread AR = ar cqs RANLIB = QMAKE = /usr/bin/qmake-qt4 @@ -158,7 +158,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Vec2.h ../src/libUnuk/ImageLoader.h ../src/libUnuk/GlxWindow.h ../src/libUnuk/Sprite.h ../src/libUnuk/Debug.h ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/Unuk/Game.h ../src/Unuk/Player.h ../src/libUnuk/KeyboardInterface.h ../src/libUnuk/XKeyboardInterface.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Vec2.cpp ../src/libUnuk/Sprite.cpp ../src/libUnuk/ImageLoader.cpp ../src/libUnuk/GlxWindow.cpp ../src/libUnuk/Debug.cpp ../src/Unuk/Player.cpp ../src/Unuk/main.cpp ../src/Unuk/Game.cpp .tmp/Unuk-QT1.0.0/ && (cd `dirname .tmp/Unuk-QT1.0.0` && $(TAR) Unuk-QT1.0.0.tar Unuk-QT1.0.0 && $(COMPRESS) Unuk-QT1.0.0.tar) && $(MOVE) `dirname .tmp/Unuk-QT1.0.0`/Unuk-QT1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Unuk-QT1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Vec2.h ../src/libUnuk/ImageLoader.h ../src/libUnuk/GlxWindow.h ../src/libUnuk/Sprite.h ../src/libUnuk/Debug.h ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/Unuk/Game.h ../src/Unuk/Player.h ../src/libUnuk/KeyboardInterface.h ../src/libUnuk/XKeyboardInterface.h ../src/libUnuk/Static.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Vec2.cpp ../src/libUnuk/Sprite.cpp ../src/libUnuk/ImageLoader.cpp ../src/libUnuk/GlxWindow.cpp ../src/libUnuk/Debug.cpp ../src/Unuk/Player.cpp ../src/Unuk/main.cpp ../src/Unuk/Game.cpp .tmp/Unuk-QT1.0.0/ && (cd `dirname .tmp/Unuk-QT1.0.0` && $(TAR) Unuk-QT1.0.0.tar Unuk-QT1.0.0 && $(COMPRESS) Unuk-QT1.0.0.tar) && $(MOVE) `dirname .tmp/Unuk-QT1.0.0`/Unuk-QT1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Unuk-QT1.0.0 clean:compiler_clean @@ -216,9 +216,10 @@ GlxWindow.o: ../src/libUnuk/GlxWindow.cpp ../src/Unuk/Game.h \ ../src/Unuk/Player.h \ ../src/libUnuk/Sprite.h \ ../src/libUnuk/ImageLoader.h \ - ../src/libUnuk/Vec2.h \ ../src/libUnuk/GlxWindow.h \ ../src/Libs/glxext.h \ + ../src/libUnuk/XKeyboardInterface.h \ + ../src/libUnuk/KeyboardInterface.h \ ../src/libUnuk/Debug.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o GlxWindow.o ../src/libUnuk/GlxWindow.cpp @@ -227,7 +228,6 @@ Debug.o: ../src/libUnuk/Debug.cpp ../src/libUnuk/Debug.h Player.o: ../src/Unuk/Player.cpp ../src/libUnuk/Sprite.h \ ../src/libUnuk/ImageLoader.h \ - ../src/libUnuk/Vec2.h \ ../src/libUnuk/Debug.h \ ../src/Unuk/Player.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Player.o ../src/Unuk/Player.cpp @@ -239,7 +239,6 @@ main.o: ../src/Unuk/main.cpp ../src/libUnuk/Win32Window.h \ ../src/Unuk/Player.h \ ../src/libUnuk/Sprite.h \ ../src/libUnuk/ImageLoader.h \ - ../src/libUnuk/Vec2.h \ ../src/libUnuk/Debug.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../src/Unuk/main.cpp @@ -247,7 +246,6 @@ Game.o: ../src/Unuk/Game.cpp ../src/Unuk/Game.h \ ../src/Unuk/Player.h \ ../src/libUnuk/Sprite.h \ ../src/libUnuk/ImageLoader.h \ - ../src/libUnuk/Vec2.h \ ../src/libUnuk/Debug.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Game.o ../src/Unuk/Game.cpp diff --git a/trunk/Unuk-QT/Unuk-QT.pro b/trunk/Unuk-QT/Unuk-QT.pro index 06ee1c4..9c4c0b7 100644 --- a/trunk/Unuk-QT/Unuk-QT.pro +++ b/trunk/Unuk-QT/Unuk-QT.pro @@ -14,7 +14,8 @@ HEADERS += ../src/libUnuk/Vec2.h \ ../src/Unuk/Game.h \ ../src/Unuk/Player.h \ ../src/libUnuk/KeyboardInterface.h \ - ../src/libUnuk/XKeyboardInterface.h + ../src/libUnuk/XKeyboardInterface.h \ + ../src/libUnuk/Static.h SOURCES += ../src/libUnuk/Vec2.cpp \ ../src/libUnuk/Sprite.cpp \ ../src/libUnuk/ImageLoader.cpp \ diff --git a/trunk/Unuk-QT/Unuk-QT.pro.user b/trunk/Unuk-QT/Unuk-QT.pro.user index 0d076ea..9cca2a7 100644 --- a/trunk/Unuk-QT/Unuk-QT.pro.user +++ b/trunk/Unuk-QT/Unuk-QT.pro.user @@ -100,7 +100,7 @@ _=/usr/bin/startx - /drv/storage/Projects/Portfolio/saracraft/trunk/Unuk/Unuk-QT/Unuk-QT.pro + /home/allanis/Unuk/trunk/Unuk-QT/Unuk-QT.pro -spec linux-g++ -r @@ -108,7 +108,7 @@ /usr/bin/qmake-qt4 false - /drv/storage/Projects/Portfolio/saracraft/trunk/Unuk/Unuk-QT + /home/allanis/Unuk/trunk/Unuk-QT @@ -145,7 +145,7 @@ /usr/bin/make true - /drv/storage/Projects/Portfolio/saracraft/trunk/Unuk/Unuk-QT + /home/allanis/Unuk/trunk/Unuk-QT diff --git a/trunk/src/libUnuk/Static.h b/trunk/src/libUnuk/Static.h new file mode 100644 index 0000000..5d157f3 --- /dev/null +++ b/trunk/src/libUnuk/Static.h @@ -0,0 +1,22 @@ +#ifndef _STATIC_H_ +#define _STATIC_H_ + +/* + * Inheriting from this class will make the class uncopyable. + * It is useful to do this because a lot of the time we won't + * want to be able to copy stuff, like the window or the game class. + * + * I probably chose a bad name for this. + * + */ + +class Static { +protected: + Static() {} + ~Static() {} +private: + Static(const Static&); + Static& operator=(const Static &); +}; + +#endif