Merge pull request #28 from lr8soft/dev-y

lr8soft · web-flow · commit b917944a579d · 2019-10-28T21:54:22.000+08:00
v0.32-release
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/PythonSTG/XCCore/Boss/Boss.cpp b/PythonSTG/XCCore/Boss/Boss.cpp
@@ -70,8 +70,6 @@ void Boss::taskSubWork()
 				if (bossFinishMovement) {
 					(*spellCardBegin)->SpellCardWork();
 				}
-				
-			
 			}
 			if ((*spellCardBegin)->getIsFinish() || bossRenderObject->getSpellCardHitPointClear()) {
 				(*spellCardBegin)->SpellCardRelease();
diff --git a/PythonSTG/XCCore/Boss/SpellCard.cpp b/PythonSTG/XCCore/Boss/SpellCard.cpp
@@ -69,23 +69,13 @@ void SpellCard::SpellCardRelease()
 			std::vector<Task*>::iterator taskEnd = taskGroup.end();
 			for (auto task = taskBegin; task != taskEnd; task++) {
 				(*task)->TaskRelease();
-				delete *task;
-				if (std::next(task) == taskGroup.end()) {
-					taskGroup.erase(task);
-					break;
-				}
-				else {
-					task = taskGroup.erase(task);
-					taskEnd = taskGroup.end();
-				}
 			}
+			taskGroup.clear();		
 		}
-		if (!taskUUIDGroup.empty()) {
-			auto uuidEnd = taskUUIDGroup.end();
-			for (auto uuiditer = taskUUIDGroup.begin(); uuiditer != uuidEnd; uuiditer++) {
-				TaskManager::getInstance()->CleanTaskAsync(*uuiditer);
-			}
+		for (auto uuid : taskUUIDGroup) {
+			TaskManager::getInstance()->CleanTaskAsync(uuid);
 		}
+		taskUUIDGroup.clear();
 		isInit = false;
 	}
 }
diff --git a/PythonSTG/XCCore/Bullet/CircleTypeBullet.cpp b/PythonSTG/XCCore/Bullet/CircleTypeBullet.cpp
@@ -89,7 +89,7 @@ void CircleTypeBullet::Release()
 bool CircleTypeBullet::BulletCollideWithPoint(float x, float y,bool &haveGraze)
 {
 	bool value = false;
-	if (isInit && timer.getAccumlateTime() >=0.4f) {
+	if (isInit && timer.getAccumlateTime() >=0.1f) {
 		float distance = (x - NowPosition[0])*(x - NowPosition[0]) + (y - NowPosition[1])*(y - NowPosition[1]);
 		float parameter = collideSize[0] * collideSize[0];
 
diff --git a/PythonSTG/XCCore/Bullet/OvalTypeBullet.cpp b/PythonSTG/XCCore/Bullet/OvalTypeBullet.cpp
@@ -92,7 +92,7 @@ void OvalTypeBullet::Release()
 bool OvalTypeBullet::BulletCollideWithPoint(float x, float y, bool &haveGraze)
 {
 	bool value = false;
-	if (isInit && timer.getAccumlateTime() >= 0.4f) {
+	if (isInit && timer.getAccumlateTime() >= 0.1f) {
 		x -= NowPosition[0];
 		y -= NowPosition[1];
 
diff --git a/PythonSTG/XCCore/Stage/Stage.cpp b/PythonSTG/XCCore/Stage/Stage.cpp
@@ -7,6 +7,8 @@
 #include "../Bullet/BulletHelper.h"
 #include "../Boss/BossHelper.h"
 #include <GL3/gl3w.h>
+
+#include "../UserInterface/GameInfoInterface.h"
 Stage::Stage(std::string uuid, PyObject* item)
 {
 	itemStage = item;
@@ -42,10 +44,13 @@ void Stage::stageInit()
 		MultiThreadDefine
 		PyObject* taskSizeObj = PyObject_CallMethod(itemStage, "_cpp_getTaskSize", NULL);
 		PyObject* bossSizeObj = PyObject_CallMethod(itemStage, "_cpp_getBossSize", NULL);
-		PyObject* backgroundIdObj = PyObject_CallMethod(itemStage, "_cpp_getBackground", NULL);
+		PyObject* stageInfoObj = PyObject_CallMethod(itemStage, "_cpp_getStageInfo", NULL);
 		int taskSize = ScriptLoader::getSingleArg<int>(taskSizeObj);
 		int bossSize = ScriptLoader::getSingleArg<int>(bossSizeObj);
-		stageBackgroundID = ScriptLoader::getSingleArg<int>(backgroundIdObj);
+
+		const char* stageName;
+		PyArg_ParseTuple(stageInfoObj, "sii", &stageName, &stageRank, &stageBackgroundID);
+
 		if (taskSize > 0) {
 
 			for (int i = 0; i < taskSize; i++) {
@@ -82,6 +87,7 @@ void Stage::stageWork()
 	if (isStageInit) {
 		timer.Tick();
 		bool allTaskWaitTarget = true;
+		GameInfoInterface::getInstance()->setRank(stageRank);
 		for (auto task = stageTaskGroup.begin(); task != stageTaskGroup.end(); task++) {
 			if (!task->second->getTaskInit())
 				task->second->TaskInit();
diff --git a/PythonSTG/XCCore/Stage/Stage.h b/PythonSTG/XCCore/Stage/Stage.h
@@ -12,7 +12,7 @@
 #include "../Background/BackgroundHelper.h"
 class Stage {
 private:
-	int stageBackgroundID = 0;
+	int stageBackgroundID = 0, stageRank = 2;
 	Background* stageBackground;
 
 	std::string stageUuid;
diff --git a/PythonSTG/XCCore/Task/Task.cpp b/PythonSTG/XCCore/Task/Task.cpp
@@ -109,8 +109,10 @@ void Task::TaskRelease()
 		(*unit)->UnitRelease();
 		delete (*unit);
 	}
-	RenderManager::getInstance()->CleanRenderObject(taskUUID);
 	subUnitGroup.clear();
+	RenderManager::getInstance()->CleanRenderObject(taskUUID);
+	
+	haveInitCoord = false;
 	taskIsInit = false;
 }
 
diff --git a/PythonSTG/XCCore/Task/TaskInsideUnit.cpp b/PythonSTG/XCCore/Task/TaskInsideUnit.cpp
@@ -7,42 +7,47 @@ TaskInsideUnit::TaskInsideUnit(std::string uuid, int wFrame, int rTime): parentU
 
 void TaskInsideUnit::UnitInit()
 {
+	if (!isInit) {
+		isInit = true;
+	}
 }
 
 void TaskInsideUnit::UnitWork()
 {
-	if (nowFrame > 0) {
-		nowFrame--;
-	}
-	else {
-		if (repeatTime > 0) {
-			if (!haveAddToQueue) {
-				auto iterBegin = renderObjectGroup.begin();
-				auto iterEnd = renderObjectGroup.end();
-				for (auto object = iterBegin; object != iterEnd; object++) {
-					RenderManager::getInstance()->AddRenderObject(parentUuid, *object);
-				}
-				renderObjectGroup.clear();
+	if (isInit) {
+		if (nowFrame > 0) {
+			nowFrame--;
+		}
+		else {
+			if (repeatTime > 0) {
+				if (!haveAddToQueue) {
+					auto iterBegin = renderObjectGroup.begin();
+					auto iterEnd = renderObjectGroup.end();
+					for (auto object = iterBegin; object != iterEnd; object++) {
+						RenderManager::getInstance()->AddRenderObject(parentUuid, *object);
+					}
+					renderObjectGroup.clear();
 
-				/*Refill render object*/
-				auto groupBegin = renderGroupManager.begin();
-				if (groupBegin != renderGroupManager.end()) {
-					std::list<RenderObject*> list = *groupBegin;
-					renderObjectGroup.assign(list.begin(), list.end());
-					renderGroupManager.erase(groupBegin);
-				}
-				else {
-					haveAddToQueue = true;
-				}
+					/*Refill render object*/
+					auto groupBegin = renderGroupManager.begin();
+					if (groupBegin != renderGroupManager.end()) {
+						std::list<RenderObject*> list = *groupBegin;
+						renderObjectGroup.assign(list.begin(), list.end());
+						renderGroupManager.erase(groupBegin);
+					}
+					else {
+						haveAddToQueue = true;
+					}
 
-				repeatTime--;
-				nowFrame = waitFrame;
+					repeatTime--;
+					nowFrame = waitFrame;
+				}
+			}
+			else {
+				haveAddToQueue = true;
 			}
-		}
-		else {
-			haveAddToQueue = true;
-		}
 
+		}
 	}
 }
 
@@ -68,6 +73,7 @@ void TaskInsideUnit::UnitRelease()
 		}
 		renderGroupManager.clear();
 	}
+	isInit = false;
 }
 
 void TaskInsideUnit::addRenderObject(RenderObject * pObject)
diff --git a/PythonSTG/XCCore/Task/TaskInsideUnit.h b/PythonSTG/XCCore/Task/TaskInsideUnit.h
@@ -9,7 +9,7 @@
 class TaskInsideUnit {
 protected:
 	int waitFrame, repeatTime = 0, nowFrame = 0;
-	bool haveAddToQueue = false, isFinish = false;
+	bool haveAddToQueue = false, isFinish = false, isInit =false;
 	std::list<RenderObject*> renderObjectGroup;
 	std::list<std::list<RenderObject*>> renderGroupManager;
 
diff --git a/PythonSTG/XCCore/Task/TaskManager.cpp b/PythonSTG/XCCore/Task/TaskManager.cpp
@@ -30,7 +30,7 @@ void TaskManager::AddStageItem(Stage * stage)
 	stageQueue.push_back(stage);
 }
 
-void TaskManager::CleanTaskAsync(std::string & uuid)
+void TaskManager::CleanTaskAsync(std::string  uuid)
 {
 	asyncCleanGroup.push_back(uuid);
 }
@@ -78,17 +78,16 @@ void TaskManager::TaskWork()
 			return;
 		}
 	}
+	std::vector<Stage*>::iterator currentStage = stageQueue.begin();
 	if (!asyncTaskGroup.empty()) {
-		std::vector<Stage*>::iterator currentStage = stageQueue.begin();
 		auto asyncTaskEnd = asyncTaskGroup.end();
 		for (auto task = asyncTaskGroup.begin(); task != asyncTaskEnd; task++) {
 			(*currentStage)->addTask(*task);
 		}
 		asyncTaskGroup.clear();
 	}
 	if (!asyncCleanGroup.empty()) {
-		std::vector<Stage*>::iterator currentStage = stageQueue.begin();
-		std::vector<std::string>::iterator uuidEnd = asyncCleanGroup.begin();
+		std::vector<std::string>::iterator uuidEnd = asyncCleanGroup.end();
 		for (auto uuid = asyncCleanGroup.begin(); uuid != uuidEnd; uuid++) {
 			(*currentStage)->removeTask(*uuid);
 		}
diff --git a/PythonSTG/XCCore/Task/TaskManager.h b/PythonSTG/XCCore/Task/TaskManager.h
@@ -18,7 +18,7 @@ class TaskManager {
 
 	void AddTaskAsync(Task* pTask);
 	void AddStageItem(Stage* stage);
-	void CleanTaskAsync(std::string &uuid);
+	void CleanTaskAsync(std::string uuid);
 	void SetTaskInitCoord(std::string &uuid, float x, float y);
 
 	void CleanAllStage();
diff --git a/PythonSTG/XCCore/XCRender/RenderManager.cpp b/PythonSTG/XCCore/XCRender/RenderManager.cpp
@@ -153,6 +153,7 @@ void RenderManager::RenderWork()
 	}
 	solveAsyncCommand();
 	solveAsyncObject();
+	
 }
 
 
@@ -253,6 +254,13 @@ void RenderManager::solveAsyncObject()
 void RenderManager::CleanRenderObject(const std::string& uuid)
 {
 	externCommandList.insert(std::make_pair(RenderManager::cRenderObject, uuid));
+
+	auto item = asyncRenderObjectList.find(uuid);
+	if (item != asyncRenderObjectList.end()) {
+		item->second->Release();
+		delete item->second;
+		asyncRenderObjectList.erase(item);
+	}
 }
 
 void RenderManager::CleanAllRenderObject()
diff --git a/PythonSTG/XCFrame.cpp b/PythonSTG/XCFrame.cpp
@@ -134,6 +134,7 @@ bool XCFrame::getFrameTerminate()
 }
 XCFrame::XCFrame() {
 	xcstd::ConfigManager cfg("pystg.cfg");
+	std::cout << "[INFO]Internal version:"<< PythonSTGVersion << std::endl;
 	if (cfg.IsFirstRun()) {
 		cfg.AddNewInfo("up", std::to_string(GLFW_KEY_UP));
 		cfg.AddNewInfo("down", std::to_string(GLFW_KEY_DOWN));
diff --git a/PythonSTG/XCFrame.h b/PythonSTG/XCFrame.h
@@ -7,6 +7,7 @@
 #include "util/GameTimer.h"
 class XCFrame {
 private:
+	const char* PythonSTGVersion = "v0.31x_update2";
 	std::atomic_bool isFrameTerminate = false;
 	GLFWwindow* pscreen = nullptr, *tscreen = nullptr;
 	static XCFrame* pInstance;
diff --git a/PythonSTG/assets/Boss/testboss.png b/PythonSTG/assets/Boss/testboss.png
diff --git a/PythonSTG/assets/Item/player.png b/PythonSTG/assets/Item/player.png
diff --git a/PythonSTG/script/Object/Player.py b/PythonSTG/script/Object/Player.py
@@ -1,6 +1,6 @@
 from .XCItem import XCItem
 class Player(XCItem):
-    def __init__(self, frameName = "Satsuki Rin"):
+    def __init__(self, frameName = "Hakurei Reimu"):
         super().__init__()
         self._divideInfo = [8, 3]
         self._isFlexible = True
@@ -10,7 +10,7 @@ def __init__(self, frameName = "Satsuki Rin"):
         self._playerTurnRightRow = 2
 
         self._moveSpeed = 1.45
-        self._imageSwapInterval = 0.08
+        self._imageSwapInterval = 0.1
         self._basePower = 1.0
 
         self._scaleSize = [0.06,0.08, 1.0] #3:4 img
diff --git a/PythonSTG/script/Stage/Boss.py b/PythonSTG/script/Stage/Boss.py
@@ -66,6 +66,9 @@ def AddSpellCard(self, spellcard):
         else:
             raise Exception("Insert invalid spellcard.")
 
+    def SetBossName(self, name):
+        self.bossName = name
+
     def AddTargetUuid(self, uuid):
         self.targetUuid.put(uuid)
 
diff --git a/PythonSTG/script/Stage/XCStage.py b/PythonSTG/script/Stage/XCStage.py
@@ -10,13 +10,22 @@ class StageBackGround(Enum):
     magic_forest = 1
 
 
+class StageRank(Enum):
+    Easy = 1
+    Normal = 2
+    Hard = 3
+    Lunatic = 4
+    Extra = 5
+
+
 class XCStage:
     def __init__(self, stageName="Stage 0 No name"):
         self.__stageName = stageName
         self.__stageTask = Queue()
         self.__stageBoss = Queue()
         self.__uuid = str(uuid.uuid1())
         self.__background = StageBackGround.lake
+        self.__rank = StageRank.Normal
 
     def addTask(self, task):
         if isinstance(task, Task):
@@ -33,11 +42,11 @@ def addBoss(self, boss):
     def setBackGround(self, background):
         self.__background = background
 
-    def _cpp_getStageName(self):
-        return self.__stageName
+    def setStageRank(self, rank = StageRank.Normal):
+        self.__rank = rank
 
-    def _cpp_getBackground(self):
-        return self.__background.value
+    def _cpp_getStageInfo(self):
+        return self.__stageName, self.__rank.value, self.__background.value
 
     def _cpp_getTaskSize(self):
         return self.__stageTask.qsize()
diff --git a/PythonSTG/script/TestStage.py b/PythonSTG/script/TestStage.py
diff --git a/PythonSTG/script/XCCore.py b/PythonSTG/script/XCCore.py

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,6 @@ void Boss::taskSubWork()`
`70`	`70`	`if (bossFinishMovement) {`
`71`	`71`	`(*spellCardBegin)->SpellCardWork();`
`72`	`72`	`}`
`73`		`-`
`74`		`-`
`75`	`73`	`}`
`76`	`74`	`if ((*spellCardBegin)->getIsFinish() \|\| bossRenderObject->getSpellCardHitPointClear()) {`
`77`	`75`	`(*spellCardBegin)->SpellCardRelease();`
Original file line number	Diff line number	Diff line change
`@@ -69,23 +69,13 @@ void SpellCard::SpellCardRelease()`
`69`	`69`	`std::vector<Task*>::iterator taskEnd = taskGroup.end();`
`70`	`70`	`for (auto task = taskBegin; task != taskEnd; task++) {`
`71`	`71`	`(*task)->TaskRelease();`
`72`		`- delete *task;`
`73`		`- if (std::next(task) == taskGroup.end()) {`
`74`		`- taskGroup.erase(task);`
`75`		`- break;`
`76`		`- }`
`77`		`- else {`
`78`		`- task = taskGroup.erase(task);`
`79`		`- taskEnd = taskGroup.end();`
`80`		`- }`
`81`	`72`	`}`
	`73`	`+ taskGroup.clear();`
`82`	`74`	`}`
`83`		`- if (!taskUUIDGroup.empty()) {`
`84`		`- auto uuidEnd = taskUUIDGroup.end();`
`85`		`- for (auto uuiditer = taskUUIDGroup.begin(); uuiditer != uuidEnd; uuiditer++) {`
`86`		`- TaskManager::getInstance()->CleanTaskAsync(*uuiditer);`
`87`		`- }`
	`75`	`+ for (auto uuid : taskUUIDGroup) {`
	`76`	`+ TaskManager::getInstance()->CleanTaskAsync(uuid);`
`88`	`77`	`}`
	`78`	`+ taskUUIDGroup.clear();`
`89`	`79`	`isInit = false;`
`90`	`80`	`}`
`91`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ void CircleTypeBullet::Release()`
`89`	`89`	`bool CircleTypeBullet::BulletCollideWithPoint(float x, float y,bool &haveGraze)`
`90`	`90`	`{`
`91`	`91`	`bool value = false;`
`92`		`- if (isInit && timer.getAccumlateTime() >=0.4f) {`
	`92`	`+ if (isInit && timer.getAccumlateTime() >=0.1f) {`
`93`	`93`	`float distance = (x - NowPosition[0])(x - NowPosition[0]) + (y - NowPosition[1])(y - NowPosition[1]);`
`94`	`94`	`float parameter = collideSize[0] * collideSize[0];`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ void OvalTypeBullet::Release()`
`92`	`92`	`bool OvalTypeBullet::BulletCollideWithPoint(float x, float y, bool &haveGraze)`
`93`	`93`	`{`
`94`	`94`	`bool value = false;`
`95`		`- if (isInit && timer.getAccumlateTime() >= 0.4f) {`
	`95`	`+ if (isInit && timer.getAccumlateTime() >= 0.1f) {`
`96`	`96`	`x -= NowPosition[0];`
`97`	`97`	`y -= NowPosition[1];`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,10 @@ void Task::TaskRelease()`
`109`	`109`	`(*unit)->UnitRelease();`
`110`	`110`	`delete (*unit);`
`111`	`111`	`}`
`112`		`- RenderManager::getInstance()->CleanRenderObject(taskUUID);`
`113`	`112`	`subUnitGroup.clear();`
	`113`	`+ RenderManager::getInstance()->CleanRenderObject(taskUUID);`
	`114`	`+`
	`115`	`+ haveInitCoord = false;`
`114`	`116`	`taskIsInit = false;`
`115`	`117`	`}`
`116`	`118`