From: <wel...@us...> - 2008-12-01 16:08:34
|
Revision: 2579 http://planeshift.svn.sourceforge.net/planeshift/?rev=2579&view=rev Author: weltall2 Date: 2008-12-01 16:08:32 +0000 (Mon, 01 Dec 2008) Log Message: ----------- replaced a previous change with an assert Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2008-12-01 13:58:08 UTC (rev 2578) +++ trunk/src/client/pscelclient.cpp 2008-12-01 16:08:32 UTC (rev 2579) @@ -1434,7 +1434,8 @@ // Not cached yet. csString animName = msgstrings->Request (animid); - idx = cal3dstate->FindAnim (animName.GetDataSafe()); + CS_ASSERT_MSG("Missing animName from common strings!", animName.GetData()); + idx = cal3dstate->FindAnim (animName.GetData()); if (idx >= 0) { // Cache it. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-12-14 11:47:38
|
Revision: 2684 http://planeshift.svn.sourceforge.net/planeshift/?rev=2684&view=rev Author: mgist Date: 2008-12-14 11:47:35 +0000 (Sun, 14 Dec 2008) Log Message: ----------- - Check for a loaded mesh immediately. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2008-12-14 10:26:20 UTC (rev 2683) +++ trunk/src/client/pscelclient.cpp 2008-12-14 11:47:35 UTC (rev 2684) @@ -1209,6 +1209,9 @@ // Set up callback. psengine->RegisterDelayedLoader(this); + // Check if the mesh is already loaded. + CheckMeshLoad(); + return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-03-17 05:40:59
|
Revision: 3227 http://planeshift.svn.sourceforge.net/planeshift/?rev=3227&view=rev Author: kougaro Date: 2009-03-17 05:40:57 +0000 (Tue, 17 Mar 2009) Log Message: ----------- tweaked the conditions to activate SetSneak() Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-03-17 04:15:40 UTC (rev 3226) +++ trunk/src/client/pscelclient.cpp 2009-03-17 05:40:57 UTC (rev 3227) @@ -1722,7 +1722,7 @@ float cal3dvel = useZ ? velocity.z : velocity.x; cal3dstate->SetVelocity(-cal3dvel, &psengine->GetRandomGen()); - if(abs(cal3dvel) <= 2 && abs(cal3dvel) >= 1) + if((velocity.x != 0 || velocity.z != 0) && velocity.Norm() < 2) { charApp->SetSneak(true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-05-24 08:09:00
|
Revision: 3769 http://planeshift.svn.sourceforge.net/planeshift/?rev=3769&view=rev Author: kougaro Date: 2009-05-24 08:08:56 +0000 (Sun, 24 May 2009) Log Message: ----------- UpdateMove needs to be called after any change to iMovable Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-05-24 04:49:22 UTC (rev 3768) +++ trunk/src/client/pscelclient.cpp 2009-05-24 08:08:56 UTC (rev 3769) @@ -1139,11 +1139,12 @@ pcmesh->GetMovable ()->SetSector (sector); pcmesh->GetMovable ()->SetPosition (pos); - pcmesh->GetMovable ()->UpdateMove (); // Rotation csMatrix3 matrix = (csMatrix3) csYRotMatrix3 (rot); pcmesh->GetMovable()->GetTransform().SetO2T (matrix); + + pcmesh->GetMovable ()->UpdateMove (); } return true; @@ -1160,7 +1161,9 @@ csMatrix3 zmatrix = (csMatrix3) csZRotMatrix3 (zRot); // multiply the matrices for the three axis together, then we apply it to the mesh - pcmesh->GetMovable()->GetTransform().SetO2T (xmatrix*ymatrix*zmatrix); + pcmesh->GetMovable ()->GetTransform().SetO2T (xmatrix*ymatrix*zmatrix); + + pcmesh->GetMovable ()->UpdateMove (); } csVector3 GEMClientObject::GetPosition() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-05-27 22:27:30
|
Revision: 3792 http://planeshift.svn.sourceforge.net/planeshift/?rev=3792&view=rev Author: mgist Date: 2009-05-27 22:27:28 +0000 (Wed, 27 May 2009) Log Message: ----------- - Crash fix. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-05-27 09:22:33 UTC (rev 3791) +++ trunk/src/client/pscelclient.cpp 2009-05-27 22:27:28 UTC (rev 3792) @@ -1931,7 +1931,10 @@ sector = mesg.sector; flags = mesg.flags; - PostLoad(false); + if(pcmesh.IsValid()) + { + PostLoad(false); + } } GEMClientActionLocation::GEMClientActionLocation( psCelClient* cel, psPersistActionLocation& mesg ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-06-25 06:17:18
|
Revision: 3869 http://planeshift.svn.sourceforge.net/planeshift/?rev=3869&view=rev Author: weltall2 Date: 2009-06-25 06:17:17 +0000 (Thu, 25 Jun 2009) Log Message: ----------- fixed items going between the legs on morph reset ... brrr Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-06-25 00:31:19 UTC (rev 3868) +++ trunk/src/client/pscelclient.cpp 2009-06-25 06:17:17 UTC (rev 3869) @@ -349,6 +349,7 @@ // Reset local_player->GetMesh()->SetMeshObject(local_player_defaultMesh); local_player->GetMesh()->SetFactory(local_player_defaultFact); + local_player->charApp->SetMesh(local_player->GetMesh()); } // Update factory This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-06-25 08:48:25
|
Revision: 3871 http://planeshift.svn.sourceforge.net/planeshift/?rev=3871&view=rev Author: weltall2 Date: 2009-06-25 08:48:23 +0000 (Thu, 25 Jun 2009) Log Message: ----------- fixed groups not being updated for the main actor Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-06-25 07:21:17 UTC (rev 3870) +++ trunk/src/client/pscelclient.cpp 2009-06-25 08:48:23 UTC (rev 3871) @@ -355,6 +355,16 @@ // Update factory local_player->factName = mesg.factname; + // Update Bracer/Helm Group + if ( mesg.helmGroup.Length() == 0 ) + local_player->helmGroup = local_player->GetMesh()->GetFactory()->QueryObject()->GetName(); + else + local_player->helmGroup = mesg.helmGroup; + + if ( mesg.BracerGroup.Length() == 0 ) + local_player->BracerGroup = local_player->GetMesh()->GetFactory()->QueryObject()->GetName(); + else + local_player->BracerGroup = mesg.BracerGroup; // Update cal3d local_player->RefreshCal3d(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-07-03 07:23:09
|
Revision: 3899 http://planeshift.svn.sourceforge.net/planeshift/?rev=3899&view=rev Author: weltall2 Date: 2009-07-03 07:23:09 +0000 (Fri, 03 Jul 2009) Log Message: ----------- fixed build in gcc Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-07-03 06:31:36 UTC (rev 3898) +++ trunk/src/client/pscelclient.cpp 2009-07-03 07:23:09 UTC (rev 3899) @@ -2082,9 +2082,11 @@ -CS_BOUNDINGBOX_MAXVALUE, -CS_BOUNDINGBOX_MAXVALUE, CS_BOUNDINGBOX_MAXVALUE, CS_BOUNDINGBOX_MAXVALUE, CS_BOUNDINGBOX_MAXVALUE)); } + + csVector3 Pos = csVector3(0.0f); + csMatrix3 Rot = csMatrix3(); + position = instance->pcmesh->AddInstance(Pos, Rot); - position = instance->pcmesh->AddInstance(csVector3(0.0f), csMatrix3()); - // Init nullmesh factory. factory = psengine->GetEngine()->CreateMeshFactory("crystalspace.mesh.object.null", factName + "_nullmesh"); csRef<iNullFactoryState> nullstate = scfQueryInterface<iNullFactoryState> (factory->GetMeshObjectFactory()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-04 03:31:12
|
Revision: 3909 http://planeshift.svn.sourceforge.net/planeshift/?rev=3909&view=rev Author: mgist Date: 2009-07-04 03:31:11 +0000 (Sat, 04 Jul 2009) Log Message: ----------- - Changed instanced items to use their own material with their required shaders. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-07-04 02:48:21 UTC (rev 3908) +++ trunk/src/client/pscelclient.cpp 2009-07-04 03:31:11 UTC (rev 3909) @@ -2076,6 +2076,7 @@ instance->pcmesh = factory->CreateMeshWrapper(); instance->pcmesh->GetFlags().Set(CS_ENTITY_NODECAL | CS_ENTITY_NOHITBEAM); psengine->GetEngine()->GetMeshes()->Add(instance->pcmesh); + psengine->GetEngine()->PrecacheMesh(instance->pcmesh); cel->AddInstanceObject(factName, instance); // Set appropriate shader. @@ -2096,10 +2097,17 @@ } //else // Handle this case if/when it happens... - material->SetShader(shadertype, shader); + // Construct a new material using the selected shaders. + csRef<iTextureWrapper> tex = psengine->GetEngine()->GetTextureList()->CreateTexture(material->GetTexture()); + csRef<iMaterial> mat = psengine->GetEngine()->CreateBaseMaterial(tex); + + mat->SetShader(shadertype, shader); shadertype = strings->Request("diffuse"); - material->SetShader(shadertype, shader); + mat->SetShader(shadertype, shader); + csRef<iMaterialWrapper> matwrap = psengine->GetEngine()->GetMaterialList()->CreateMaterial(mat, factName + "_instancemat"); + instance->pcmesh->GetMeshObject()->SetMaterialWrapper(matwrap); + // Set biggest bbox so that instances aren't wrongly culled. instance->bbox = factory->GetMeshObjectFactory()->GetObjectModel()->GetObjectBoundingBox(); factory->GetMeshObjectFactory()->GetObjectModel()->SetObjectBoundingBox(csBox3(-CS_BOUNDINGBOX_MAXVALUE, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-05 06:45:16
|
Revision: 3919 http://planeshift.svn.sourceforge.net/planeshift/?rev=3919&view=rev Author: mgist Date: 2009-07-05 06:45:09 +0000 (Sun, 05 Jul 2009) Log Message: ----------- - Warning fix. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-07-05 04:53:57 UTC (rev 3918) +++ trunk/src/client/pscelclient.cpp 2009-07-05 06:45:09 UTC (rev 3919) @@ -2106,7 +2106,7 @@ } else { - Error3("Unhandled shader %s for mesh %s!\n", shader->QueryObject()->GetName(), factName); + Error3("Unhandled shader %s for mesh %s!\n", shader->QueryObject()->GetName(), factName.GetData()); } // Construct a new material using the selected shaders. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-08 18:15:58
|
Revision: 3952 http://planeshift.svn.sourceforge.net/planeshift/?rev=3952&view=rev Author: mgist Date: 2009-07-08 18:15:54 +0000 (Wed, 08 Jul 2009) Log Message: ----------- - Added missing UpdateMove() Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-07-08 18:12:45 UTC (rev 3951) +++ trunk/src/client/pscelclient.cpp 2009-07-08 18:15:54 UTC (rev 3952) @@ -1219,8 +1219,9 @@ // Update the sector and position of real mesh. if (sector) { - instance->pcmesh->GetMovable ()->SetSector (sector); + instance->pcmesh->GetMovable()->SetSector (sector); instance->pcmesh->GetMovable()->SetPosition(0.0f); + instance->pcmesh->GetMovable()->UpdateMove(); } // Set instancing transform. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-15 09:48:01
|
Revision: 4016 http://planeshift.svn.sourceforge.net/planeshift/?rev=4016&view=rev Author: mgist Date: 2009-07-15 09:47:58 +0000 (Wed, 15 Jul 2009) Log Message: ----------- - Catch factory load failures when loading items. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-07-15 07:59:40 UTC (rev 4015) +++ trunk/src/client/pscelclient.cpp 2009-07-15 09:47:58 UTC (rev 4016) @@ -2070,9 +2070,16 @@ instance = cel->FindInstanceObject(factName); if(!instance.IsValid()) { - factory = psengine->GetLoader()->LoadFactory(factName); + bool failed = false; + factory = psengine->GetLoader()->LoadFactory(factName, &failed); if(!factory.IsValid()) { + if(failed) + { + Error2("Unable to load item with factory %s!\n", factName.GetData()); + psengine->UnregisterDelayedLoader(this); + } + return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-15 13:11:06
|
Revision: 4017 http://planeshift.svn.sourceforge.net/planeshift/?rev=4017&view=rev Author: mgist Date: 2009-07-15 13:10:59 +0000 (Wed, 15 Jul 2009) Log Message: ----------- - Small cleanups. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-07-15 09:47:58 UTC (rev 4016) +++ trunk/src/client/pscelclient.cpp 2009-07-15 13:10:59 UTC (rev 4017) @@ -1225,10 +1225,7 @@ } // Set instancing transform. - csReversibleTransform rt; - rt.SetO2T(matrix); - rt.SetO2TTranslation(pos); - position->SetValue(rt); + position->SetValue(pcmesh->GetMovable()->GetTransform()); } } @@ -1253,10 +1250,7 @@ // Set instancing transform. if(instance.IsValid()) { - csReversibleTransform rt; - rt.SetO2T(pcmesh->GetMovable ()->GetTransform().GetO2T()); - rt.SetO2TTranslation(pcmesh->GetMovable ()->GetPosition()); - position->SetValue(rt); + position->SetValue(pcmesh->GetMovable ()->GetTransform()); } } @@ -2038,12 +2032,15 @@ factName = mesg.factname; solid = 0; post_load->pos = mesg.pos; + if(mesg.xRot > 0.1) printf("xRotate for mesh %s (%u) is %f\n", factName.GetData(), mesg.eid.Unbox(), mesg.xRot); post_load->xRot = mesg.xRot; post_load->yRot = mesg.yRot; post_load->zRot = mesg.zRot; post_load->sector = mesg.sector; post_load->flags = mesg.flags; + printf("%f, %f, %f\n", mesg.xRot, mesg.yRot, mesg.zRot); + if (!InitMesh()) { Error3("Fatal Error: Could not create item %s(%s)", mesg.name.GetData(), ShowID(mesg.eid)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-15 13:19:57
|
Revision: 4018 http://planeshift.svn.sourceforge.net/planeshift/?rev=4018&view=rev Author: mgist Date: 2009-07-15 13:19:49 +0000 (Wed, 15 Jul 2009) Log Message: ----------- - Remove printfs. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-07-15 13:10:59 UTC (rev 4017) +++ trunk/src/client/pscelclient.cpp 2009-07-15 13:19:49 UTC (rev 4018) @@ -2032,15 +2032,12 @@ factName = mesg.factname; solid = 0; post_load->pos = mesg.pos; - if(mesg.xRot > 0.1) printf("xRotate for mesh %s (%u) is %f\n", factName.GetData(), mesg.eid.Unbox(), mesg.xRot); post_load->xRot = mesg.xRot; post_load->yRot = mesg.yRot; post_load->zRot = mesg.zRot; post_load->sector = mesg.sector; post_load->flags = mesg.flags; - printf("%f, %f, %f\n", mesg.xRot, mesg.yRot, mesg.zRot); - if (!InitMesh()) { Error3("Fatal Error: Could not create item %s(%s)", mesg.name.GetData(), ShowID(mesg.eid)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ken...@us...> - 2009-08-26 22:26:48
|
Revision: 4265 http://planeshift.svn.sourceforge.net/planeshift/?rev=4265&view=rev Author: kennygraunke Date: 2009-08-26 22:26:37 +0000 (Wed, 26 Aug 2009) Log Message: ----------- Fix regression introduced in r4257: after teleporting, /pos never updated. This restores the original code for the method; I'm not sure why it was split/moved. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-08-26 20:09:52 UTC (rev 4264) +++ trunk/src/client/pscelclient.cpp 2009-08-26 22:26:37 UTC (rev 4265) @@ -269,6 +269,21 @@ mesg.sector = psengine->GetEngine()->FindSector(mesg.sectorName); } + // We already have an entity with this id so we must have missed the remove object message + // so delete and remake it. + GEMClientObject* found = (GEMClientObject*) FindObject(mesg.entityid); + if (found) + { + if (found == local_player) + { + HandleMainActor( mesg ); + return; + } + + Debug3(LOG_CELPERSIST, 0, "Found existing object <%s> with %s, removing.\n", found->GetName(), ShowID(mesg.entityid)); + RemoveObject(found); + } + if (ignore_others) { if (local_player != 0) @@ -290,7 +305,6 @@ psengine->SetMainActor(actor); psengine->GetPSCamera()->SetCameraMode(currentMode); - // This triggers the server to update our proxlist local_player->SendDRUpdate(PRIORITY_LOW,GetClientDR()->GetMsgStrings()); @@ -298,15 +312,6 @@ psengine->UpdateWindowTitleInformations(); } - // We already have an entity with this id so we must have missed the remove object message, - // or an update has been sent. delete the now outdated object - GEMClientObject* found = FindObject(mesg.entityid); - if( found) - { - Debug3(LOG_CELPERSIST, 0, "Found existing object <%s> with %s, removing.\n", found->GetName(), ShowID(mesg.entityid)); - RemoveObject(found); - } - entities.Push(actor); entities_hash.Put(actor->GetEID(), actor); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-08-29 07:48:46
|
Revision: 4278 http://planeshift.svn.sourceforge.net/planeshift/?rev=4278&view=rev Author: weltall2 Date: 2009-08-29 07:48:35 +0000 (Sat, 29 Aug 2009) Log Message: ----------- We shouldn't play the sitting animation if the character is sitting already when we get to see it Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-08-28 20:22:24 UTC (rev 4277) +++ trunk/src/client/pscelclient.cpp 2009-08-29 07:48:35 UTC (rev 4278) @@ -1924,7 +1924,8 @@ case psModeMessage::SIT: case psModeMessage::OVERWEIGHT: case psModeMessage::DEFEATED: - cal3dstate->SetAnimAction("sit", 0.0f, 1.0f); + if (!newactor) //we do this only if this isn't a new actor + cal3dstate->SetAnimAction("sit", 0.0f, 1.0f); SetIdleAnimation("sit idle"); break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-08-31 20:00:40
|
Revision: 4292 http://planeshift.svn.sourceforge.net/planeshift/?rev=4292&view=rev Author: weltall2 Date: 2009-08-31 20:00:31 +0000 (Mon, 31 Aug 2009) Log Message: ----------- fixed PS#2204 - Characters levitate / float / fly when loading a map change patch by aiken Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-08-31 19:59:22 UTC (rev 4291) +++ trunk/src/client/pscelclient.cpp 2009-08-31 20:00:31 UTC (rev 4292) @@ -1048,6 +1048,9 @@ else ++posIter; } + GEMClientActor* actor = GetMainPlayer(); + if (actor) + actor->GetMovement()->SetOnGround(false); } void psCelClient::PruneEntities() @@ -2005,6 +2008,7 @@ csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(factName); if(!factory.IsValid()) { + printf("status\n"); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-08-31 20:06:38
|
Revision: 4294 http://planeshift.svn.sourceforge.net/planeshift/?rev=4294&view=rev Author: weltall2 Date: 2009-08-31 20:06:30 +0000 (Mon, 31 Aug 2009) Log Message: ----------- removed printf Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-08-31 20:01:21 UTC (rev 4293) +++ trunk/src/client/pscelclient.cpp 2009-08-31 20:06:30 UTC (rev 4294) @@ -2008,7 +2008,6 @@ csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(factName); if(!factory.IsValid()) { - printf("status\n"); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-09-10 21:21:42
|
Revision: 4344 http://planeshift.svn.sourceforge.net/planeshift/?rev=4344&view=rev Author: weltall2 Date: 2009-09-10 21:21:29 +0000 (Thu, 10 Sep 2009) Log Message: ----------- fixed anim application to the socketed mesh Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-09-10 15:26:10 UTC (rev 4343) +++ trunk/src/client/pscelclient.cpp 2009-09-10 21:21:29 UTC (rev 4344) @@ -2015,6 +2015,7 @@ charApp->ApplyRider(pcmesh); csRef<iSpriteCal3DState> riderstate = scfQueryInterface<iSpriteCal3DState> (mesh->GetMeshObject()); riderstate->SetDefaultIdleAnim("ride"); + riderstate->SetVelocity(0); } pcmesh->GetFlags().Set(CS_ENTITY_NODECAL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-09-10 23:37:53
|
Revision: 4345 http://planeshift.svn.sourceforge.net/planeshift/?rev=4345&view=rev Author: weltall2 Date: 2009-09-10 23:37:46 +0000 (Thu, 10 Sep 2009) Log Message: ----------- avoid running a sorta strange sitting anim Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-09-10 21:21:29 UTC (rev 4344) +++ trunk/src/client/pscelclient.cpp 2009-09-10 23:37:46 UTC (rev 4345) @@ -2014,8 +2014,7 @@ psengine->GetEngine()->GetMeshes()->Add(pcmesh); charApp->ApplyRider(pcmesh); csRef<iSpriteCal3DState> riderstate = scfQueryInterface<iSpriteCal3DState> (mesh->GetMeshObject()); - riderstate->SetDefaultIdleAnim("ride"); - riderstate->SetVelocity(0); + riderstate->SetAnimCycle("ride",100); } pcmesh->GetFlags().Set(CS_ENTITY_NODECAL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-18 08:12:22
|
Revision: 4420 http://planeshift.svn.sourceforge.net/planeshift/?rev=4420&view=rev Author: mgist Date: 2009-09-18 08:11:57 +0000 (Fri, 18 Sep 2009) Log Message: ----------- - Failure check. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-09-18 07:35:12 UTC (rev 4419) +++ trunk/src/client/pscelclient.cpp 2009-09-18 08:11:57 UTC (rev 4420) @@ -1875,9 +1875,16 @@ bool GEMClientActor::CheckLoadStatus() { - csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(factName); + bool failed = false; + csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(factName, &failed); if(!factory.IsValid()) { + if(failed) + { + printf("Failed to load factory: '%s'\n", factName.GetData()); + psengine->UnregisterDelayedLoader(this); + return false; + } return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-20 01:22:20
|
Revision: 4452 http://planeshift.svn.sourceforge.net/planeshift/?rev=4452&view=rev Author: mgist Date: 2009-09-20 00:22:17 +0000 (Sun, 20 Sep 2009) Log Message: ----------- - Fixed display of submeshed items (e.g. signpost) Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-09-20 00:12:34 UTC (rev 4451) +++ trunk/src/client/pscelclient.cpp 2009-09-20 00:22:17 UTC (rev 4452) @@ -2012,11 +2012,12 @@ csRef<iShaderManager> shman = csQueryRegistry<iShaderManager>(psengine->GetObjectRegistry()); csRef<iStringSet> strings = csQueryRegistryTagInterface<iStringSet>( psengine->GetObjectRegistry(), "crystalspace.shared.stringset"); - csStringID shadertype = strings->Request("base"); - + csRef<iGeneralFactoryState> gFact = scfQueryInterface<iGeneralFactoryState>(factory->GetMeshObjectFactory()); for(size_t i=0; (!gFact.IsValid() && i == 0) || (gFact.IsValid() && i<gFact->GetSubMeshCount()); ++i) { + csStringID shadertype = strings->Request("base"); + iGeneralMeshSubMesh* submesh = gFact.IsValid() ? gFact->GetSubMesh(i) : 0; iMaterial* material = submesh ? submesh->GetMaterial()->GetMaterial() : factory->GetMeshObjectFactory()->GetMaterialWrapper()->GetMaterial(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-26 12:01:33
|
Revision: 4544 http://planeshift.svn.sourceforge.net/planeshift/?rev=4544&view=rev Author: mgist Date: 2009-09-26 12:01:24 +0000 (Sat, 26 Sep 2009) Log Message: ----------- - Set collision data on nullmesh item objects. => REQUIRES CS UPDATE. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-09-25 11:25:21 UTC (rev 4543) +++ trunk/src/client/pscelclient.cpp 2009-09-26 12:01:24 UTC (rev 4544) @@ -2082,6 +2082,7 @@ factory = psengine->GetEngine()->CreateMeshFactory("crystalspace.mesh.object.null", factName + "_nullmesh"); csRef<iNullFactoryState> nullstate = scfQueryInterface<iNullFactoryState> (factory->GetMeshObjectFactory()); nullstate->SetBoundingBox(instance->bbox); + nullstate->SetCollisionMeshData(instance->pcmesh->GetFactory()->GetMeshObjectFactory()->GetObjectModel()); pcmesh = factory->CreateMeshWrapper(); pcmesh->GetFlags().Set(CS_ENTITY_NODECAL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-27 13:46:51
|
Revision: 4563 http://planeshift.svn.sourceforge.net/planeshift/?rev=4563&view=rev Author: mgist Date: 2009-09-27 13:46:45 +0000 (Sun, 27 Sep 2009) Log Message: ----------- - Fixed the error check for mount mesh. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-09-27 13:41:45 UTC (rev 4562) +++ trunk/src/client/pscelclient.cpp 2009-09-27 13:46:45 UTC (rev 4563) @@ -1900,12 +1900,18 @@ if(!mountFactname.Compare("null")) { - csRef<iMeshFactoryWrapper> mountFactory = psengine->GetLoader()->LoadFactory(mountFactname); + csRef<iMeshFactoryWrapper> mountFactory = psengine->GetLoader()->LoadFactory(mountFactname, &failed); if(!mountFactory.IsValid()) { - Error2("Couldn't find the mount's mesh factory, %s", mountFactname.GetData()); - return false; + if(failed) + { + Error2("Couldn't find the mesh factory: '%s' for mount.", mountFactname.GetData()); + psengine->UnregisterDelayedLoader(this); + return false; + } + return true; } + pcmesh = mountFactory->CreateMeshWrapper(); psengine->GetEngine()->GetMeshes()->Add(pcmesh); charApp->ApplyRider(pcmesh); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-27 13:49:07
|
Revision: 4564 http://planeshift.svn.sourceforge.net/planeshift/?rev=4564&view=rev Author: mgist Date: 2009-09-27 13:49:01 +0000 (Sun, 27 Sep 2009) Log Message: ----------- - Fixed another error check for mount mesh. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2009-09-27 13:46:45 UTC (rev 4563) +++ trunk/src/client/pscelclient.cpp 2009-09-27 13:49:01 UTC (rev 4564) @@ -1898,7 +1898,7 @@ charApp->ChangeMaterial(factName, matName); } - if(!mountFactname.Compare("null")) + if(!mountFactname.IsEmpty() && !mountFactname.Compare("null")) { csRef<iMeshFactoryWrapper> mountFactory = psengine->GetLoader()->LoadFactory(mountFactname, &failed); if(!mountFactory.IsValid()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |