From ef9bbd3db313fcc3964ae76510d317f36f4ceb60 Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Wed, 1 Feb 2012 22:57:19 +0000 Subject: [PATCH] [Remove] Scrapped redundant files. Added UnukQT/Makefile to .gitignore for easier calibration. --- .gitignore | 1 + Unuk-QT/Makefile | 638 --------------------------------- Unuk-QT/Unuk-QT.pro | 3 - src/libUnuk/Engine/AStar.cpp | 92 ----- src/libUnuk/Engine/AStar.h | 30 -- src/libUnuk/Engine/AStarBase.h | 26 -- 6 files changed, 1 insertion(+), 789 deletions(-) delete mode 100644 Unuk-QT/Makefile delete mode 100644 src/libUnuk/Engine/AStar.cpp delete mode 100644 src/libUnuk/Engine/AStar.h delete mode 100644 src/libUnuk/Engine/AStarBase.h diff --git a/.gitignore b/.gitignore index b006c5b..fe5e9ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +UnukQT/Makefile Win32/Unuk/Debug Win32/Unuk/Release Win32/Unuk/LibUnuk/Debug diff --git a/Unuk-QT/Makefile b/Unuk-QT/Makefile deleted file mode 100644 index 35e7d3b..0000000 --- a/Unuk-QT/Makefile +++ /dev/null @@ -1,638 +0,0 @@ -############################################################################# -# Makefile for building: Unuk-QT -# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Feb 1 19:42:10 2012 -# 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 -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -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 -lGL -lSDL -lSDL_ttf -lSDL_image -lSDL_gfx -ltinyxml -lGLU -lQtGui -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/bin/qmake-qt4 -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = ../src/libUnuk/Engine/WorldManager.cpp \ - ../src/libUnuk/Engine/ParticleEmitter.cpp \ - ../src/libUnuk/Engine/NPC.cpp \ - ../src/libUnuk/Engine/MemManager.cpp \ - ../src/libUnuk/Engine/Collision.cpp \ - ../src/libUnuk/Engine/Character.cpp \ - ../src/libUnuk/Engine/AStar.cpp \ - ../src/libUnuk/Sprite/TextureManager.cpp \ - ../src/libUnuk/Sprite/Texture.cpp \ - ../src/libUnuk/Sprite/ImageLoader.cpp \ - ../src/libUnuk/Sprite/ApplySurface.cpp \ - ../src/libUnuk/System/Timer.cpp \ - ../src/libUnuk/System/Rect.cpp \ - ../src/libUnuk/System/Input.cpp \ - ../src/libUnuk/System/FPS.cpp \ - ../src/libUnuk/System/Debug.cpp \ - ../src/libUnuk/UI/Text.cpp \ - ../src/libUnuk/UI/MainMenu.cpp \ - ../src/libUnuk/UI/IngameMenu.cpp \ - ../src/libUnuk/UI/Font.cpp \ - ../src/libUnuk/UI/ButtonToggle.cpp \ - ../src/libUnuk/UI/ButtonGroup.cpp \ - ../src/libUnuk/UI/Button.cpp \ - ../src/Unuk/Player.cpp \ - ../src/Unuk/main.cpp \ - ../src/Unuk/Globals.cpp \ - ../src/Unuk/Game.cpp \ - ../src/libUnuk/LevelGen/LevelGen.cpp \ - ../src/libUnuk/LevelGen/MapEntities.cpp \ - ../src/libUnuk/LevelGen/MapElement.cpp \ - ../src/libUnuk/UI/EventHistory.cpp \ - ../src/libUnuk/UI/Bar.cpp \ - ../src/libUnuk/System/Vec2.cpp -OBJECTS = WorldManager.o \ - ParticleEmitter.o \ - NPC.o \ - MemManager.o \ - Collision.o \ - Character.o \ - AStar.o \ - TextureManager.o \ - Texture.o \ - ImageLoader.o \ - ApplySurface.o \ - Timer.o \ - Rect.o \ - Input.o \ - FPS.o \ - Debug.o \ - Text.o \ - MainMenu.o \ - IngameMenu.o \ - Font.o \ - ButtonToggle.o \ - ButtonGroup.o \ - Button.o \ - Player.o \ - main.o \ - Globals.o \ - Game.o \ - LevelGen.o \ - MapEntities.o \ - MapElement.o \ - EventHistory.o \ - Bar.o \ - Vec2.o -DIST = /usr/share/qt4/mkspecs/common/g++.conf \ - /usr/share/qt4/mkspecs/common/unix.conf \ - /usr/share/qt4/mkspecs/common/linux.conf \ - /usr/share/qt4/mkspecs/qconfig.pri \ - /usr/share/qt4/mkspecs/features/qt_functions.prf \ - /usr/share/qt4/mkspecs/features/qt_config.prf \ - /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/share/qt4/mkspecs/features/default_pre.prf \ - /usr/share/qt4/mkspecs/features/debug.prf \ - /usr/share/qt4/mkspecs/features/default_post.prf \ - /usr/share/qt4/mkspecs/features/warn_on.prf \ - /usr/share/qt4/mkspecs/features/qt.prf \ - /usr/share/qt4/mkspecs/features/unix/thread.prf \ - /usr/share/qt4/mkspecs/features/moc.prf \ - /usr/share/qt4/mkspecs/features/resources.prf \ - /usr/share/qt4/mkspecs/features/uic.prf \ - /usr/share/qt4/mkspecs/features/yacc.prf \ - /usr/share/qt4/mkspecs/features/lex.prf \ - /usr/share/qt4/mkspecs/features/include_source_dir.prf \ - Unuk-QT.pro -QMAKE_TARGET = Unuk-QT -DESTDIR = -TARGET = Unuk-QT - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile $(TARGET) - -$(TARGET): $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -Makefile: Unuk-QT.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \ - /usr/share/qt4/mkspecs/common/unix.conf \ - /usr/share/qt4/mkspecs/common/linux.conf \ - /usr/share/qt4/mkspecs/qconfig.pri \ - /usr/share/qt4/mkspecs/features/qt_functions.prf \ - /usr/share/qt4/mkspecs/features/qt_config.prf \ - /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/share/qt4/mkspecs/features/default_pre.prf \ - /usr/share/qt4/mkspecs/features/debug.prf \ - /usr/share/qt4/mkspecs/features/default_post.prf \ - /usr/share/qt4/mkspecs/features/warn_on.prf \ - /usr/share/qt4/mkspecs/features/qt.prf \ - /usr/share/qt4/mkspecs/features/unix/thread.prf \ - /usr/share/qt4/mkspecs/features/moc.prf \ - /usr/share/qt4/mkspecs/features/resources.prf \ - /usr/share/qt4/mkspecs/features/uic.prf \ - /usr/share/qt4/mkspecs/features/yacc.prf \ - /usr/share/qt4/mkspecs/features/lex.prf \ - /usr/share/qt4/mkspecs/features/include_source_dir.prf \ - /usr/lib/libQtGui.prl \ - /usr/lib/libQtCore.prl - $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro -/usr/share/qt4/mkspecs/common/g++.conf: -/usr/share/qt4/mkspecs/common/unix.conf: -/usr/share/qt4/mkspecs/common/linux.conf: -/usr/share/qt4/mkspecs/qconfig.pri: -/usr/share/qt4/mkspecs/features/qt_functions.prf: -/usr/share/qt4/mkspecs/features/qt_config.prf: -/usr/share/qt4/mkspecs/features/exclusive_builds.prf: -/usr/share/qt4/mkspecs/features/default_pre.prf: -/usr/share/qt4/mkspecs/features/debug.prf: -/usr/share/qt4/mkspecs/features/default_post.prf: -/usr/share/qt4/mkspecs/features/warn_on.prf: -/usr/share/qt4/mkspecs/features/qt.prf: -/usr/share/qt4/mkspecs/features/unix/thread.prf: -/usr/share/qt4/mkspecs/features/moc.prf: -/usr/share/qt4/mkspecs/features/resources.prf: -/usr/share/qt4/mkspecs/features/uic.prf: -/usr/share/qt4/mkspecs/features/yacc.prf: -/usr/share/qt4/mkspecs/features/lex.prf: -/usr/share/qt4/mkspecs/features/include_source_dir.prf: -/usr/lib/libQtGui.prl: -/usr/lib/libQtCore.prl: -qmake: FORCE - @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro - -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/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Engine/WorldManager.h ../src/libUnuk/Engine/ParticleEmitter.h ../src/libUnuk/Engine/NPC.h ../src/libUnuk/Engine/MemManager.h ../src/libUnuk/Engine/MemClass.h ../src/libUnuk/Engine/Collision.h ../src/libUnuk/Engine/Character.h ../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStar.h ../src/libUnuk/Sprite/TextureManager.h ../src/libUnuk/Sprite/Texture.h ../src/libUnuk/Sprite/ImageLoader.h ../src/libUnuk/Sprite/ApplySurface.h ../src/libUnuk/System/Rect.h ../src/libUnuk/System/Input.h ../src/libUnuk/System/FPS.h ../src/libUnuk/System/Debug.h ../src/libUnuk/System/Timer.h ../src/libUnuk/UI/MainMenu.h ../src/libUnuk/UI/IngameMenu.h ../src/libUnuk/UI/Font.h ../src/libUnuk/UI/ButtonToggle.h ../src/libUnuk/UI/ButtonGroup.h ../src/libUnuk/UI/Button.h ../src/libUnuk/UI/Text.h ../src/Unuk/Globals.h ../src/Unuk/Game.h ../src/Unuk/Constants.h ../src/Unuk/Player.h ../src/libUnuk/LevelGen/LevelGen.h ../src/libUnuk/LevelGen/MapEntities.h ../src/libUnuk/LevelGen/MapElement.h ../src/libUnuk/LevelGen/MapTile.h ../src/libUnuk/UI/EventHistory.h ../src/libUnuk/UI/Bar.h ../src/libUnuk/System/Vec2.h ../src/libUnuk/System/MathBox.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/ParticleEmitter.cpp ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/MemManager.cpp ../src/libUnuk/Engine/Collision.cpp ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Sprite/TextureManager.cpp ../src/libUnuk/Sprite/Texture.cpp ../src/libUnuk/Sprite/ImageLoader.cpp ../src/libUnuk/Sprite/ApplySurface.cpp ../src/libUnuk/System/Timer.cpp ../src/libUnuk/System/Rect.cpp ../src/libUnuk/System/Input.cpp ../src/libUnuk/System/FPS.cpp ../src/libUnuk/System/Debug.cpp ../src/libUnuk/UI/Text.cpp ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/IngameMenu.cpp ../src/libUnuk/UI/Font.cpp ../src/libUnuk/UI/ButtonToggle.cpp ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/Button.cpp ../src/Unuk/Player.cpp ../src/Unuk/main.cpp ../src/Unuk/Globals.cpp ../src/Unuk/Game.cpp ../src/libUnuk/LevelGen/LevelGen.cpp ../src/libUnuk/LevelGen/MapEntities.cpp ../src/libUnuk/LevelGen/MapElement.cpp ../src/libUnuk/UI/EventHistory.cpp ../src/libUnuk/UI/Bar.cpp ../src/libUnuk/System/Vec2.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 - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile - - -check: first - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: -compiler_moc_header_clean: -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: -compiler_uic_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: - -####### Compile - -WorldManager.o: ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/WorldManager.h \ - ../src/libUnuk/Engine/NPC.h \ - ../src/libUnuk/Engine/Character.h \ - ../src/Unuk/Globals.h \ - ../src/Unuk/Constants.h \ - ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/libUnuk/Engine/Collision.h \ - ../src/libUnuk/LevelGen/LevelGen.h \ - ../src/libUnuk/LevelGen/MapTile.h \ - ../src/libUnuk/LevelGen/MapElement.h \ - ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/LevelGen/MapEntities.h \ - ../src/libUnuk/System/Timer.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/UI/Bar.h \ - ../src/libUnuk/System/Rect.h \ - ../src/libUnuk/Engine/AStar.h \ - ../src/libUnuk/Engine/AStarBase.h \ - ../src/Unuk/Player.h \ - ../src/libUnuk/UI/EventHistory.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o WorldManager.o ../src/libUnuk/Engine/WorldManager.cpp - -ParticleEmitter.o: ../src/libUnuk/Engine/ParticleEmitter.cpp ../src/libUnuk/Engine/ParticleEmitter.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/Sprite/ApplySurface.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ParticleEmitter.o ../src/libUnuk/Engine/ParticleEmitter.cpp - -NPC.o: ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/NPC.h \ - ../src/libUnuk/Engine/Character.h \ - ../src/Unuk/Globals.h \ - ../src/Unuk/Constants.h \ - ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/libUnuk/Engine/Collision.h \ - ../src/libUnuk/LevelGen/LevelGen.h \ - ../src/libUnuk/LevelGen/MapTile.h \ - ../src/libUnuk/LevelGen/MapElement.h \ - ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/LevelGen/MapEntities.h \ - ../src/libUnuk/Engine/WorldManager.h \ - ../src/libUnuk/System/Timer.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/UI/Bar.h \ - ../src/libUnuk/System/Rect.h \ - ../src/libUnuk/Engine/AStar.h \ - ../src/libUnuk/Engine/AStarBase.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o NPC.o ../src/libUnuk/Engine/NPC.cpp - -MemManager.o: ../src/libUnuk/Engine/MemManager.cpp ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o MemManager.o ../src/libUnuk/Engine/MemManager.cpp - -Collision.o: ../src/libUnuk/Engine/Collision.cpp ../src/libUnuk/Engine/Collision.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Collision.o ../src/libUnuk/Engine/Collision.cpp - -Character.o: ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/Character.h \ - ../src/Unuk/Globals.h \ - ../src/Unuk/Constants.h \ - ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/libUnuk/Engine/Collision.h \ - ../src/libUnuk/LevelGen/LevelGen.h \ - ../src/libUnuk/LevelGen/MapTile.h \ - ../src/libUnuk/LevelGen/MapElement.h \ - ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/LevelGen/MapEntities.h \ - ../src/libUnuk/Engine/WorldManager.h \ - ../src/libUnuk/System/Timer.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/UI/Bar.h \ - ../src/libUnuk/System/Rect.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Character.o ../src/libUnuk/Engine/Character.cpp - -AStar.o: ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Engine/AStar.h \ - ../src/libUnuk/Engine/AStarBase.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o AStar.o ../src/libUnuk/Engine/AStar.cpp - -TextureManager.o: ../src/libUnuk/Sprite/TextureManager.cpp ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/System/Debug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o TextureManager.o ../src/libUnuk/Sprite/TextureManager.cpp - -Texture.o: ../src/libUnuk/Sprite/Texture.cpp ../src/libUnuk/Sprite/Texture.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/Sprite/ApplySurface.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Texture.o ../src/libUnuk/Sprite/Texture.cpp - -ImageLoader.o: ../src/libUnuk/Sprite/ImageLoader.cpp ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/System/Debug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ImageLoader.o ../src/libUnuk/Sprite/ImageLoader.cpp - -ApplySurface.o: ../src/libUnuk/Sprite/ApplySurface.cpp ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/Unuk/Globals.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ApplySurface.o ../src/libUnuk/Sprite/ApplySurface.cpp - -Timer.o: ../src/libUnuk/System/Timer.cpp ../src/libUnuk/System/Timer.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Timer.o ../src/libUnuk/System/Timer.cpp - -Rect.o: ../src/libUnuk/System/Rect.cpp ../src/libUnuk/System/Rect.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Rect.o ../src/libUnuk/System/Rect.cpp - -Input.o: ../src/libUnuk/System/Input.cpp ../src/libUnuk/System/Input.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Input.o ../src/libUnuk/System/Input.cpp - -FPS.o: ../src/libUnuk/System/FPS.cpp ../src/libUnuk/System/FPS.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/System/Timer.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o FPS.o ../src/libUnuk/System/FPS.cpp - -Debug.o: ../src/libUnuk/System/Debug.cpp ../src/libUnuk/System/Debug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Debug.o ../src/libUnuk/System/Debug.cpp - -Text.o: ../src/libUnuk/UI/Text.cpp ../src/libUnuk/UI/Text.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/UI/Font.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Text.o ../src/libUnuk/UI/Text.cpp - -MainMenu.o: ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/MainMenu.h \ - ../src/Unuk/Constants.h \ - ../src/libUnuk/System/FPS.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/System/Timer.h \ - ../src/libUnuk/UI/ButtonGroup.h \ - ../src/libUnuk/UI/Button.h \ - ../src/libUnuk/System/Input.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/System/Rect.h \ - ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h \ - ../src/libUnuk/LevelGen/LevelGen.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/libUnuk/LevelGen/MapTile.h \ - ../src/libUnuk/LevelGen/MapElement.h \ - ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/LevelGen/MapEntities.h \ - ../src/libUnuk/Engine/WorldManager.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o MainMenu.o ../src/libUnuk/UI/MainMenu.cpp - -IngameMenu.o: ../src/libUnuk/UI/IngameMenu.cpp ../src/libUnuk/UI/IngameMenu.h \ - ../src/Unuk/Globals.h \ - ../src/Unuk/Constants.h \ - ../src/libUnuk/UI/ButtonGroup.h \ - ../src/libUnuk/UI/Button.h \ - ../src/libUnuk/System/Input.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/System/Rect.h \ - ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h \ - ../src/libUnuk/UI/ButtonToggle.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o IngameMenu.o ../src/libUnuk/UI/IngameMenu.cpp - -Font.o: ../src/libUnuk/UI/Font.cpp ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/System/Debug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Font.o ../src/libUnuk/UI/Font.cpp - -ButtonToggle.o: ../src/libUnuk/UI/ButtonToggle.cpp ../src/libUnuk/UI/ButtonToggle.h \ - ../src/libUnuk/UI/Button.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/System/Input.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/System/Rect.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonToggle.o ../src/libUnuk/UI/ButtonToggle.cpp - -ButtonGroup.o: ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/ButtonGroup.h \ - ../src/libUnuk/UI/Button.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/System/Input.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/System/Rect.h \ - ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonGroup.o ../src/libUnuk/UI/ButtonGroup.cpp - -Button.o: ../src/libUnuk/UI/Button.cpp ../src/libUnuk/UI/Button.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/System/Input.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/System/Rect.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Button.o ../src/libUnuk/UI/Button.cpp - -Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \ - ../src/Unuk/Globals.h \ - ../src/Unuk/Constants.h \ - ../src/libUnuk/Engine/Character.h \ - ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/libUnuk/Engine/Collision.h \ - ../src/libUnuk/LevelGen/LevelGen.h \ - ../src/libUnuk/LevelGen/MapTile.h \ - ../src/libUnuk/LevelGen/MapElement.h \ - ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/LevelGen/MapEntities.h \ - ../src/libUnuk/Engine/WorldManager.h \ - ../src/libUnuk/System/Timer.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/UI/Bar.h \ - ../src/libUnuk/System/Rect.h \ - ../src/libUnuk/UI/EventHistory.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Player.o ../src/Unuk/Player.cpp - -main.o: ../src/Unuk/main.cpp ../src/libUnuk/UI/MainMenu.h \ - ../src/Unuk/Constants.h \ - ../src/libUnuk/System/FPS.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/System/Timer.h \ - ../src/libUnuk/UI/ButtonGroup.h \ - ../src/libUnuk/UI/Button.h \ - ../src/libUnuk/System/Input.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/System/Rect.h \ - ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h \ - ../src/libUnuk/LevelGen/LevelGen.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/libUnuk/LevelGen/MapTile.h \ - ../src/libUnuk/LevelGen/MapElement.h \ - ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/LevelGen/MapEntities.h \ - ../src/libUnuk/Engine/WorldManager.h \ - ../src/libUnuk/Engine/NPC.h \ - ../src/libUnuk/Engine/Character.h \ - ../src/libUnuk/Engine/Collision.h \ - ../src/libUnuk/UI/Bar.h \ - ../src/libUnuk/Engine/AStar.h \ - ../src/libUnuk/Engine/AStarBase.h \ - ../src/Unuk/Game.h \ - ../src/Unuk/Player.h \ - ../src/libUnuk/UI/IngameMenu.h \ - ../src/libUnuk/UI/ButtonToggle.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../src/Unuk/main.cpp - -Globals.o: ../src/Unuk/Globals.cpp ../src/Unuk/Globals.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Globals.o ../src/Unuk/Globals.cpp - -Game.o: ../src/Unuk/Game.cpp ../src/Unuk/Game.h \ - ../src/Unuk/Constants.h \ - ../src/Unuk/Globals.h \ - ../src/Unuk/Player.h \ - ../src/libUnuk/Engine/Character.h \ - ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/libUnuk/Engine/Collision.h \ - ../src/libUnuk/LevelGen/LevelGen.h \ - ../src/libUnuk/LevelGen/MapTile.h \ - ../src/libUnuk/LevelGen/MapElement.h \ - ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/LevelGen/MapEntities.h \ - ../src/libUnuk/Engine/WorldManager.h \ - ../src/libUnuk/System/Timer.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/UI/Bar.h \ - ../src/libUnuk/System/Rect.h \ - ../src/libUnuk/UI/IngameMenu.h \ - ../src/libUnuk/UI/ButtonGroup.h \ - ../src/libUnuk/UI/Button.h \ - ../src/libUnuk/System/Input.h \ - ../src/libUnuk/UI/ButtonToggle.h \ - ../src/libUnuk/Engine/NPC.h \ - ../src/libUnuk/Engine/AStar.h \ - ../src/libUnuk/Engine/AStarBase.h \ - ../src/libUnuk/UI/EventHistory.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Game.o ../src/Unuk/Game.cpp - -LevelGen.o: ../src/libUnuk/LevelGen/LevelGen.cpp ../src/libUnuk/LevelGen/LevelGen.h \ - ../src/Unuk/Globals.h \ - ../src/Unuk/Constants.h \ - ../src/libUnuk/Sprite/ImageLoader.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/LevelGen/MapTile.h \ - ../src/libUnuk/LevelGen/MapElement.h \ - ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/LevelGen/MapEntities.h \ - ../src/libUnuk/Engine/WorldManager.h \ - ../src/libUnuk/Engine/NPC.h \ - ../src/libUnuk/Engine/Character.h \ - ../src/libUnuk/Engine/MemClass.h \ - ../src/libUnuk/Engine/MemManager.h \ - ../src/libUnuk/Engine/Collision.h \ - ../src/libUnuk/System/Timer.h \ - ../src/libUnuk/UI/Text.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/UI/Bar.h \ - ../src/libUnuk/System/Rect.h \ - ../src/libUnuk/Engine/AStar.h \ - ../src/libUnuk/Engine/AStarBase.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o LevelGen.o ../src/libUnuk/LevelGen/LevelGen.cpp - -MapEntities.o: ../src/libUnuk/LevelGen/MapEntities.cpp ../src/libUnuk/LevelGen/MapEntities.h \ - ../src/libUnuk/LevelGen/MapElement.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/Sprite/ImageLoader.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o MapEntities.o ../src/libUnuk/LevelGen/MapEntities.cpp - -MapElement.o: ../src/libUnuk/LevelGen/MapElement.cpp ../src/libUnuk/LevelGen/MapElement.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/Sprite/TextureManager.h \ - ../src/libUnuk/Sprite/ImageLoader.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o MapElement.o ../src/libUnuk/LevelGen/MapElement.cpp - -EventHistory.o: ../src/libUnuk/UI/EventHistory.cpp ../src/libUnuk/UI/EventHistory.h \ - ../src/libUnuk/UI/Text.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h \ - ../src/libUnuk/UI/Font.h \ - ../src/libUnuk/System/Rect.h \ - ../src/libUnuk/System/Timer.h \ - ../src/Unuk/Constants.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o EventHistory.o ../src/libUnuk/UI/EventHistory.cpp - -Bar.o: ../src/libUnuk/UI/Bar.cpp ../src/libUnuk/UI/Bar.h \ - ../src/libUnuk/System/Rect.h \ - ../src/Unuk/Globals.h \ - ../src/libUnuk/Sprite/ApplySurface.h \ - ../src/libUnuk/System/Debug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Bar.o ../src/libUnuk/UI/Bar.cpp - -Vec2.o: ../src/libUnuk/System/Vec2.cpp ../src/libUnuk/System/Vec2.h \ - ../src/libUnuk/System/MathBox.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Vec2.o ../src/libUnuk/System/Vec2.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/Unuk-QT/Unuk-QT.pro b/Unuk-QT/Unuk-QT.pro index 06d01d7..9155776 100644 --- a/Unuk-QT/Unuk-QT.pro +++ b/Unuk-QT/Unuk-QT.pro @@ -14,8 +14,6 @@ HEADERS += ../src/Libs/wglext.h \ ../src/libUnuk/Engine/MemClass.h \ ../src/libUnuk/Engine/Collision.h \ ../src/libUnuk/Engine/Character.h \ - ../src/libUnuk/Engine/AStarBase.h \ - ../src/libUnuk/Engine/AStar.h \ ../src/libUnuk/Sprite/TextureManager.h \ ../src/libUnuk/Sprite/Texture.h \ ../src/libUnuk/Sprite/ImageLoader.h \ @@ -50,7 +48,6 @@ SOURCES += ../src/libUnuk/Engine/WorldManager.cpp \ ../src/libUnuk/Engine/MemManager.cpp \ ../src/libUnuk/Engine/Collision.cpp \ ../src/libUnuk/Engine/Character.cpp \ - ../src/libUnuk/Engine/AStar.cpp \ ../src/libUnuk/Sprite/TextureManager.cpp \ ../src/libUnuk/Sprite/Texture.cpp \ ../src/libUnuk/Sprite/ImageLoader.cpp \ diff --git a/src/libUnuk/Engine/AStar.cpp b/src/libUnuk/Engine/AStar.cpp deleted file mode 100644 index a04f9e3..0000000 --- a/src/libUnuk/Engine/AStar.cpp +++ /dev/null @@ -1,92 +0,0 @@ -#include "AStar.h" - -AStar::AStar(void) { - while(_openList.size() > 0) { - _openList.pop(); - } - _closedList.clear(); - _solution.clear(); -} - -AStar::~AStar(void) { - AStarBase* best = 0; - while(_openList.size() > 0) { - best = _openList.top(); - _openList.pop(); - delete best; - } - _closedList.clear(); -} - -/* - * Solved the situation given by the initial state with AStar, - * and returns a vector of AStarBase that solves the problem. - */ -std::vector AStar::Solve(AStarBase* initState) { - AStarBase* best = 0; - while(_openList.size() > 0) { - best = _openList.top(); - _openList.pop(); - delete best; - } - _closedList.clear(); - - _openList.push(initState); - return GetSolutionSequence(Search()); -} - -// Search for the best path. -AStarBase* AStar::Search(void) { - AStarBase* best = 0; - long key = 0; - std::vector child; - - while(_openList.size() > 0) { - while(_closedList.find(key) != _closedList.end()) { - // Take the best state, and check if it is on the closed list. - if(_openList.size() > 0) { - best = _openList.top(); - _openList.pop(); - } else - return 0; - - key = best->CalculateKey(); - } - - // Put best on the closed list. - _closedList[key] = best; - - // Check if best is our goal. - if(best->isGoal()) - return best; - - // Generate the children. - child = best->GenerateChildren(); - for(unsigned int i = 0; i < child.size(); i++) { - _openList.push(child[i]); - } - } - return 0; -} - -// Generate a solution sequence for a given state. -std::vector AStar::GetSolutionSequence(AStarBase* node) { - _solution.clear(); - AStarBase* state = node; - - while(state != 0) { - _closedList.erase(state->_key); - _solution.insert(_solution.begin(), state); - state = state->_parent; - } - - // Delete the states which are not part of the solution. - while(_closedList.size() > 0) { - state = _closedList.begin()->second; - _closedList.erase(state->_key); - delete state; - } - - return _solution; -} - diff --git a/src/libUnuk/Engine/AStar.h b/src/libUnuk/Engine/AStar.h deleted file mode 100644 index 4e9e7d3..0000000 --- a/src/libUnuk/Engine/AStar.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once -#include -#include -#include - -#include "AStarBase.h" - -class AStar { -public: - AStar(void); - ~AStar(void); - - std::vector Solve(AStarBase* initState); - -private: - // Comparison structure. - struct Cmp : public std::binary_function { - bool operator()(AStarBase* a1, AStarBase* a2) const { - return (a1->_totalEstimatedCost >= a2->_totalEstimatedCost); - } - }; - - std::priority_queue, Cmp > _openList; - std::map _closedList; - - AStarBase* Search(void); - - std::vector GetSolutionSequence(AStarBase* node); - std::vector _solution; -}; diff --git a/src/libUnuk/Engine/AStarBase.h b/src/libUnuk/Engine/AStarBase.h deleted file mode 100644 index 67f5c3c..0000000 --- a/src/libUnuk/Engine/AStarBase.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once -#include - -class AStarBase { -public: - AStarBase(void) { }; - virtual ~AStarBase(void) { }; - - // Generate a unique key. - virtual long CalculateKey(void) = 0; - - // Aproximate the heuristic cost to the goal. - virtual double Estimate(void) = 0; - - // Have we reached the goal? - virtual bool isGoal(void) = 0; - - virtual std::vector GenerateChildren(void) = 0; - - AStarBase* _parent; - - double _pastCost; - double _totalEstimatedCost; - - long _key; -};