Merge pull request #23 from lr8soft/dev-y

v0.30p3

Author: lr8soft

.idea/workspace.xml

@@ -0,0 +1,49 @@
+#include "LaunchHelper.h"
+#include "XCInterpreter/XCInterpreter.h"
+#include "XCCore/Menu/GameMenu.h"
+#include "XCCore/Task/TaskManager.h"
+#include "XCCore/UserInterface/GameInfoInterface.h"
+#include "XCCore/XCRender/RenderManager.h"
+#include "XCFrame.h"
+void LaunchHelper::StartGame()
+{
+
+	/*task manager init*/
+	XCInterpreter interperter;
+	interperter.getInitInfo();
+	interperter.loadTaskManagerInfo();
+
+	auto group = Player::getPlayerGroup();
+	if (!group->empty()) {
+		RenderManager::getInstance()->setPlayer(group->begin()->second);
+	}
+
+	/*render manager init*/
+	auto infoInterface = GameInfoInterface::getInstance();
+	RenderManager::getInstance()->AddUserInterface("gameInfo", infoInterface);
+
+}
+
+void LaunchHelper::StartConfigHelper()
+{
+}
+
+void LaunchHelper::LoadGameMenu()
+{
+	TaskManager::getInstance()->CleanAllStage();
+	RenderManager::getInstance()->CleanAllRenderObject();
+	RenderManager::getInstance()->CleanUserInterface("gameInfo");
+	if (RenderManager::getInstance()->getPlayer()!=nullptr) {
+		RenderManager::getInstance()->getPlayer()->PlayerRelease();
+		RenderManager::getInstance()->setPlayer(nullptr);
+	}
+
+	auto menu = new GameMenu;
+	RenderManager::getInstance()->AddRenderObject(MenuUniformUUID, menu, true);
+}
+
+
+void LaunchHelper::ExitGame()
+{
+	glfwSetWindowShouldClose(XCFrame::getInstance()->getScreen(), true);
+}

Python2D/LaunchHelper.cpp

@@ -0,0 +1,11 @@
+#pragma once
+#ifndef _LAUNCH_HELPER_H_
+#define _LAUNCH_HELPER_H_
+class LaunchHelper {
+public:
+	static void StartGame();
+	static void StartConfigHelper();
+	static void LoadGameMenu();
+	static void ExitGame();
+};
+#endif

Python2D/LaunchHelper.h

@@ -78,6 +78,8 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>C:\Program Files (x86)\Microsoft Visual Studio\Shared\Python36_64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <UseUnicodeForAssemblerListing>
+      </UseUnicodeForAssemblerListing>
     </ClCompile>
     <Link>
       <AdditionalDependencies>glfw3.lib;freetype.lib;..\libs\x86\OpenAL32.lib;..\libs\x86\python36.lib;..\libs\x86\python36_d.lib;..\libs\x86\python3.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -129,6 +131,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="LaunchHelper.cpp" />
     <ClCompile Include="util\ConfigManager.cpp" />
     <ClCompile Include="util\GameTimer.cpp" />
     <ClCompile Include="util\gl3w.c" />
@@ -143,7 +146,9 @@
     <ClCompile Include="XCCore\Bullet\CircleTypeBullet.cpp" />
     <ClCompile Include="XCCore\Bullet\RectangleTypeBullet.cpp" />
     <ClCompile Include="XCCore\Enemy\EnemyObject.cpp" />
+    <ClCompile Include="XCCore\Menu\GameMenu.cpp" />
     <ClCompile Include="XCCore\Task\Task.cpp" />
+    <ClCompile Include="XCCore\Task\TaskBoss.cpp" />
     <ClCompile Include="XCCore\Task\TaskDispatcher.cpp" />
     <ClCompile Include="XCCore\Task\TaskHelper.cpp" />
     <ClCompile Include="XCCore\Task\TaskEnemy.cpp" />
@@ -173,6 +178,7 @@
     <ClCompile Include="python2d.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="LaunchHelper.h" />
     <ClInclude Include="util\ConfigManager.h" />
     <ClInclude Include="util\GameTimer.h" />
     <ClInclude Include="util\ImageLoader.h" />
@@ -190,7 +196,10 @@
     <ClInclude Include="XCCore\Bullet\CircleTypeBullet.h" />
     <ClInclude Include="XCCore\Bullet\RectangleTypeBullet.h" />
     <ClInclude Include="XCCore\Enemy\EnemyObject.h" />
+    <ClInclude Include="XCCore\Menu\GameMenu.h" />
+    <ClInclude Include="XCCore\Menu\IMenu.h" />
     <ClInclude Include="XCCore\Task\Task.h" />
+    <ClInclude Include="XCCore\Task\TaskBoss.h" />
     <ClInclude Include="XCCore\Task\TaskDispatcher.h" />
     <ClInclude Include="XCCore\Task\TaskHelper.h" />
     <ClInclude Include="XCCore\Task\TaskEnemy.h" />

Python2D/Python2D.vcxproj

@@ -46,6 +46,9 @@
     <Filter Include="XCCore\Enemy">
       <UniqueIdentifier>{2e419218-6347-4310-bc9f-14bf80549af2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="XCCore\Menu">
+      <UniqueIdentifier>{0b1f0165-e716-497e-a0ae-d9e4b7595711}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="util\ConfigManager.cpp">
@@ -168,6 +171,13 @@
     <ClCompile Include="XCCore\XCRender\ParticleHelper.cpp">
       <Filter>XCCore\XCRender</Filter>
     </ClCompile>
+    <ClCompile Include="XCCore\Task\TaskBoss.cpp">
+      <Filter>XCCore\Task</Filter>
+    </ClCompile>
+    <ClCompile Include="XCCore\Menu\GameMenu.cpp">
+      <Filter>XCCore\Menu</Filter>
+    </ClCompile>
+    <ClCompile Include="LaunchHelper.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="util\ConfigManager.h">
@@ -310,5 +320,15 @@
     <ClInclude Include="XCCore\XCRender\ParticleHelper.h">
       <Filter>XCCore\XCRender</Filter>
     </ClInclude>
+    <ClInclude Include="XCCore\Task\TaskBoss.h">
+      <Filter>XCCore\Task</Filter>
+    </ClInclude>
+    <ClInclude Include="XCCore\Menu\IMenu.h">
+      <Filter>XCCore\Menu</Filter>
+    </ClInclude>
+    <ClInclude Include="XCCore\Menu\GameMenu.h">
+      <Filter>XCCore\Menu</Filter>
+    </ClInclude>
+    <ClInclude Include="LaunchHelper.h" />
   </ItemGroup>
 </Project>

Python2D/Python2D.vcxproj.filters

@@ -23,8 +23,7 @@ void NormalStrike::Init()
 			isResInit = true;
 		}
 
-		std::thread effectThread(&NormalStrike::threadStrikeHitWork, this);
-		effectThread.detach();
+		AudioHelper::playFromBuffer(strikeEffect.wavBuffer);
 
 		renderHelper = new XCImageHelper("assets/Item/attack.png", true);	
 
@@ -86,7 +85,7 @@ void NormalStrike::checkCollisonWithEnemy(EnemyObject * pEnemy)
 		if (enemyPosition[0] <= NowPosition[0] + halfWidth && enemyPosition[0] >= NowPosition[0] - halfWidth){
 			if (enemyPosition[1] <= NowPosition[1] + halfHeight && enemyPosition[1] >= lastY - halfHeight) {
 				ParticleHelper* particleGroup = new ParticleHelper;
-				particleGroup->addNewParticle(6, 20.0f, 0.6f, 0.4f, glm::vec4(1.0f), enemyPosition);
+				particleGroup->addNewParticle(6, 15.0f, 0.6f, 0.4f, glm::vec4(1.0f), enemyPosition);
 				RenderManager::getInstance()->AddRenderObject(ParticleGroupUuid, particleGroup);
 
 				pEnemy->hurtEnemy(0.2f);

Python2D/XCCore/Attack/NormalStrike.cpp

@@ -1,7 +1,6 @@
 #pragma once
 #ifndef _NORMAL_STRIKE_H_
 #define _NORMAL_STRIKE_H_
-#include <thread>
 #include "IAttack.h"
 #include "../../util/GameTimer.h"
 #include "../XCRender/XCImageHelper.h"

Python2D/XCCore/Attack/NormalStrike.h

@@ -45,7 +45,7 @@ void LakeBackground::BackgroundRender()
 
 void LakeBackground::renderLakeImage()
 {
-	glm::vec3 reshape = glm::vec3(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop,1.0f);
+	static glm::vec3 reshape = glm::vec3(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop,1.0f);
 	{
 		glm::mat4 model;
 		model = glm::translate(model, glm::vec3(0.5f, 0.5f, 0.0f)*reshape);
@@ -82,10 +82,8 @@ void LakeBackground::renderLakeImage()
 
 void LakeBackground::renderWaterImage()
 {
-	glm::vec3 reshape = glm::vec3(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 1.0f);
+	static glm::vec3 reshape = glm::vec3(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 1.0f);
 	BlendAlphaOneStart
-	//GL_ONE_MINUS_SRC_ALPHA
-	//glBlendFunc(GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR);
 	{
 		glm::mat4 model;
 		model = glm::translate(model, glm::vec3(0.0f, 0.5f, 0.0f));
@@ -107,7 +105,7 @@ void LakeBackground::renderWaterImage()
 
 void LakeBackground::renderLeafImage()
 {
-	glm::vec3 reshape = glm::vec3(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 1.0f);	
+	static glm::vec3 reshape = glm::vec3(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 1.0f);
 	BlendOneMinusAlphaColorStart
 	{
 		glm::mat4 model;

Python2D/XCCore/Background/Lake.cpp

@@ -10,6 +10,7 @@ class Bullet:public RenderObject {
 	float NowPosition[3] = { 0.0f,  0.0f, 0.0f };
 	/*
 	bool isWorkFinish = false
+	std::atomic_bool isInit = false;
 	*/
 
 	bool checkReboundOrOverflow(int *reBoundTimePointer, float *angle, float scaleX, float scaleY)

Python2D/XCCore/Bullet/Bullet.h

@@ -49,7 +49,7 @@ void CircleTypeBullet::Render()
 {
 	if (isInit) {
 		timer.Tick();
-		auto pPlayerHelper1 = CollideInfo::getCollideHelperP1();
+		auto pPlayerHelper1 = CollideInfo::getCollideHelper();
 		float* playerPos = (pPlayerHelper1 == nullptr ? nullptr : pPlayerHelper1->getPlayerPosition());
 		Bullet::solveBulletMovement(aimToPlayer, playerPos, velocity, angle, acceleration, increaseAngle, timer.getDeltaFrame());