OSDN > Pesquisar Software > gd10 > SCM > SVN > Commit

gd10

gd10: Commit

Entities change Environment Change Level Change Area 080819

--- Equity10/GD10_Objects_New.cpp (revision 116)

+++ Equity10/GD10_Objects_New.cpp (revision 117)

		@@ -784,14 +784,6 @@
784	784
785	785	GD10_Objects* Object = App->GDCL_Scene_Data->CL_Object[Index];
786	786
787		- // Create Teleport and use Player Start Position as Default
788		- App->GDCL_Scene_Data->CL_Object[Index]->S_Teleport[0] = new Teleport_type2;
789		-
790		- strcpy(App->GDCL_Scene_Data->CL_Object[Index]->S_Teleport[0]->Name, App->GDCL_Scene_Data->S_Player_Locations[0]->Name);
791		- App->GDCL_Scene_Data->CL_Object[Index]->S_Teleport[0]->Player_Position = App->GDCL_Scene_Data->S_Player_Locations[0]->Current_Position;
792		- App->GDCL_Scene_Data->CL_Object[Index]->S_Teleport[0]->Physics_Position = App->GDCL_Scene_Data->S_Player_Locations[0]->Physics_Position;
793		- App->GDCL_Scene_Data->CL_Object[Index]->S_Teleport[0]->Physics_Rotation = App->GDCL_Scene_Data->S_Player_Locations[0]->Physics_Rotation;
794		-
795	787	// Create Sound
796	788	App->GDCL_Scene_Data->CL_Object[Index]->HasSound = 1;
797	789	App->GDCL_Scene_Data->CL_Object[Index]->S_Sounds[0] = new Sound_Type2;

		@@ -802,7 +794,7 @@
802	794	App->GDCL_Scene_Data->CL_Object[Index]->Type = Enums::Bullet_Type_Static;
803	795	App->GDCL_Scene_Data->CL_Object[Index]->Shape = Enums::Shape_Box;
804	796
805		- strcpy(App->GDCL_Scene_Data->CL_Object[Index]->MeshName, "TeleportSend.mesh");
	797	+ strcpy(App->GDCL_Scene_Data->CL_Object[Index]->MeshName, "GD10Env.mesh");
806	798
807	799	char ConNum[256];
808	800	char ATest[256];

		@@ -817,10 +809,10 @@
817	809	strcat(ATest, ConNum);
818	810
819	811	strcpy(Object->Name, Name);
820		- strcpy(Object->MeshName, "TeleportSend.mesh"); // Needs Chaning to Environment
821		- strcpy(Object->MeshName_FullPath, "TeleportSend.mesh");
	812	+ strcpy(Object->MeshName, "GD10Env.mesh"); // Needs Chaning to Environment
	813	+ strcpy(Object->MeshName_FullPath, "GD10Env.mesh");
822	814
823		- Object->OgreEntity = App->Cl_Ogre->mSceneMgr->createEntity(ATest, "TeleportSend.mesh", App->Cl_Ogre->PermResourceGroup);
	815	+ Object->OgreEntity = App->Cl_Ogre->mSceneMgr->createEntity(ATest, "GD10Env.mesh", App->Cl_Ogre->PermResourceGroup);
824	816	Object->OgreNode = App->Cl_Ogre->mSceneMgr->getRootSceneNode()->createChildSceneNode();
825	817	Object->OgreNode->attachObject(Object->OgreEntity);
826	818	Object->OgreNode->scale(1, 1, 1);

		@@ -862,13 +854,13 @@
862	854
863	855	Object->bt_body->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT \| btCollisionObject::CF_NO_CONTACT_RESPONSE);
864	856
865		- Object->Usage = Enums::Usage_Teleport;
866		- Object->bt_body->setUserIndex(Enums::Usage_Teleport);
	857	+ Object->Usage = Enums::Usage_Environment;
	858	+ Object->bt_body->setUserIndex(Enums::Usage_Environment);
867	859	Object->bt_body->setUserIndex2(Index);
868	860
869	861	App->GDCL_Bullet->dynamicsWorld->addRigidBody(Object->bt_body);
870	862
871		- Object->Folder = Enums::Folder_Teleports;
	863	+ Object->Folder = Enums::Folder_Environment;
872	864	Object->Physics_Valid = 1;
873	865
874	866	HTREEITEM Temp = App->GDCL_FileView->Add_Environment(Object->Name, Index);

--- Equity10/VersionNo2.h (revision 116)

+++ Equity10/VersionNo2.h (revision 117)

--- Equity10/stdafx.h (revision 116)

+++ Equity10/stdafx.h (revision 117)