removesome bugs in ADeditor and add interactive

2010-08-26 11:49:39 +04:00
parent 71a6a951e0
commit 47cf1e38ea
8 changed files with 529 additions and 153 deletions
--- a/ADeditor/Makefile
+++ b/ADeditor/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: ADeditor
-# Generated by qmake (2.01a) (Qt 4.6.2) on: ?? ???. 24 15:25:17 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: ?? ???. 25 23:57:34 2010
 # Project:  ADeditor.pro
 # Template: app
 # Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile ADeditor.pro
@@ -46,16 +46,24 @@ OBJECTS_DIR   = ./
 SOURCES       = main.cpp \
 		mainwindow.cpp \
 		../loader.cpp \
-		alienmodel.cpp moc_mainwindow.cpp \
+		alienmodel.cpp \
+		towermodel.cpp \
+		splashmodel.cpp moc_mainwindow.cpp \
 		moc_loader.cpp \
-		moc_alienmodel.cpp
+		moc_alienmodel.cpp \
+		moc_towermodel.cpp \
+		moc_splashmodel.cpp
 OBJECTS       = main.o \
 		mainwindow.o \
 		loader.o \
 		alienmodel.o \
+		towermodel.o \
+		splashmodel.o \
 		moc_mainwindow.o \
 		moc_loader.o \
-		moc_alienmodel.o
+		moc_alienmodel.o \
+		moc_towermodel.o \
+		moc_splashmodel.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/common/unix.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
@@ -159,7 +167,7 @@ qmake:  FORCE

 dist: 
 	@$(CHK_DIR_EXISTS) .tmp/ADeditor1.0.0 || $(MKDIR) .tmp/ADeditor1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents mainwindow.h ../loader.h alienmodel.h .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp ../loader.cpp alienmodel.cpp .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents mainwindow.ui .tmp/ADeditor1.0.0/ && (cd `dirname .tmp/ADeditor1.0.0` && $(TAR) ADeditor1.0.0.tar ADeditor1.0.0 && $(COMPRESS) ADeditor1.0.0.tar) && $(MOVE) `dirname .tmp/ADeditor1.0.0`/ADeditor1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/ADeditor1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents mainwindow.h ../loader.h alienmodel.h towermodel.h splashmodel.h .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp ../loader.cpp alienmodel.cpp towermodel.cpp splashmodel.cpp .tmp/ADeditor1.0.0/ && $(COPY_FILE) --parents mainwindow.ui .tmp/ADeditor1.0.0/ && (cd `dirname .tmp/ADeditor1.0.0` && $(TAR) ADeditor1.0.0.tar ADeditor1.0.0 && $(COMPRESS) ADeditor1.0.0.tar) && $(MOVE) `dirname .tmp/ADeditor1.0.0`/ADeditor1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/ADeditor1.0.0


 clean:compiler_clean 
@@ -178,14 +186,17 @@ 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: moc_mainwindow.cpp moc_loader.cpp moc_alienmodel.cpp
+compiler_moc_header_make_all: moc_mainwindow.cpp moc_loader.cpp moc_alienmodel.cpp moc_towermodel.cpp moc_splashmodel.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) moc_mainwindow.cpp moc_loader.cpp moc_alienmodel.cpp
-moc_mainwindow.cpp: ../loader.h \
+	-$(DEL_FILE) moc_mainwindow.cpp moc_loader.cpp moc_alienmodel.cpp moc_towermodel.cpp moc_splashmodel.cpp
+moc_mainwindow.cpp: alienmodel.h \
+		../loader.h \
 		../game_data.h \
 		../player.h \
 		../base_types.h \
 		../map.h \
+		towermodel.h \
+		splashmodel.h \
 		mainwindow.h
 	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp

@@ -204,6 +215,22 @@ moc_alienmodel.cpp: ../loader.h \
 		alienmodel.h
 	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) alienmodel.h -o moc_alienmodel.cpp

+moc_towermodel.cpp: ../loader.h \
+		../game_data.h \
+		../player.h \
+		../base_types.h \
+		../map.h \
+		towermodel.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) towermodel.h -o moc_towermodel.cpp
+
+moc_splashmodel.cpp: ../loader.h \
+		../game_data.h \
+		../player.h \
+		../base_types.h \
+		../map.h \
+		splashmodel.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) splashmodel.h -o moc_splashmodel.cpp
+
 compiler_rcc_make_all:
 compiler_rcc_clean:
 compiler_image_collection_make_all: qmake_image_collection.cpp
@@ -228,21 +255,26 @@ compiler_clean: compiler_moc_header_clean compiler_uic_clean
 ####### Compile

 main.o: main.cpp mainwindow.h \
-		../loader.h \
-		../game_data.h \
-		../player.h \
-		../base_types.h \
-		../map.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
-
-mainwindow.o: mainwindow.cpp mainwindow.h \
+		alienmodel.h \
 		../loader.h \
 		../game_data.h \
 		../player.h \
 		../base_types.h \
 		../map.h \
-		ui_mainwindow.h \
-		alienmodel.h
+		towermodel.h \
+		splashmodel.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+mainwindow.o: mainwindow.cpp mainwindow.h \
+		alienmodel.h \
+		../loader.h \
+		../game_data.h \
+		../player.h \
+		../base_types.h \
+		../map.h \
+		towermodel.h \
+		splashmodel.h \
+		ui_mainwindow.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp

 loader.o: ../loader.cpp ../loader.h \
@@ -260,6 +292,22 @@ alienmodel.o: alienmodel.cpp alienmodel.h \
 		../map.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o alienmodel.o alienmodel.cpp

+towermodel.o: towermodel.cpp towermodel.h \
+		../loader.h \
+		../game_data.h \
+		../player.h \
+		../base_types.h \
+		../map.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o towermodel.o towermodel.cpp
+
+splashmodel.o: splashmodel.cpp splashmodel.h \
+		../loader.h \
+		../game_data.h \
+		../player.h \
+		../base_types.h \
+		../map.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o splashmodel.o splashmodel.cpp
+
 moc_mainwindow.o: moc_mainwindow.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp

@@ -269,6 +317,12 @@ moc_loader.o: moc_loader.cpp
 moc_alienmodel.o: moc_alienmodel.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_alienmodel.o moc_alienmodel.cpp

+moc_towermodel.o: moc_towermodel.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_towermodel.o moc_towermodel.cpp
+
+moc_splashmodel.o: moc_splashmodel.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_splashmodel.o moc_splashmodel.cpp
+
 ####### Install

 install:   FORCE