From: <rly...@us...> - 2010-07-13 19:33:34
|
Revision: 6037 http://planeshift.svn.sourceforge.net/planeshift/?rev=6037&view=rev Author: rlydontknow Date: 2010-07-13 19:33:28 +0000 (Tue, 13 Jul 2010) Log Message: ----------- fixed shadertype for early_z shading - really fixes PS#3439 this time Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-07-13 19:23:32 UTC (rev 6036) +++ trunk/src/client/pscelclient.cpp 2010-07-13 19:33:28 UTC (rev 6037) @@ -2179,7 +2179,7 @@ csRef<iStringArray> shaderName = psengine->GetLoader()->GetShaderName("instance_early_z"); shaderz = shman->GetShader(shaderName->Get(0)); } - shadertype = strings->Request("early_z"); + shadertype = strings->Request("depthwrite"); mat->SetShader(shadertype, shaderz); // Copy all shadervars over. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-07-13 19:55:18
|
Revision: 6038 http://planeshift.svn.sourceforge.net/planeshift/?rev=6038&view=rev Author: rlydontknow Date: 2010-07-13 19:55:12 +0000 (Tue, 13 Jul 2010) Log Message: ----------- disable depthwrite for items for now (fixes HoM, still not a good thing per se) Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-07-13 19:33:28 UTC (rev 6037) +++ trunk/src/client/pscelclient.cpp 2010-07-13 19:55:12 UTC (rev 6038) @@ -2176,8 +2176,8 @@ // Set the early_z shader on this material. iShader* shaderz = NULL; { - csRef<iStringArray> shaderName = psengine->GetLoader()->GetShaderName("instance_early_z"); - shaderz = shman->GetShader(shaderName->Get(0)); + //csRef<iStringArray> shaderName = psengine->GetLoader()->GetShaderName("instance_early_z"); + shaderz = shman->GetShader(/*shaderName->Get(0)*/"*null"); } shadertype = strings->Request("depthwrite"); mat->SetShader(shadertype, shaderz); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-07-15 18:58:35
|
Revision: 6042 http://planeshift.svn.sourceforge.net/planeshift/?rev=6042&view=rev Author: rlydontknow Date: 2010-07-15 18:58:29 +0000 (Thu, 15 Jul 2010) Log Message: ----------- added item name to error message on failure to load item Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-07-15 18:32:07 UTC (rev 6041) +++ trunk/src/client/pscelclient.cpp 2010-07-15 18:58:29 UTC (rev 6042) @@ -2209,7 +2209,7 @@ { if(failed) { - Error2("Unable to load item with factory %s!\n", factName.GetData()); + Error3("Unable to load item %s with factory %s!\n", name.GetData(), factName.GetData()); psengine->UnregisterDelayedLoader(this); delete post_load; post_load = NULL; @@ -2227,7 +2227,7 @@ { if(failed) { - Error3("Unable to load item with material %s (factory %s)!\n", matName.GetData(), factName.GetData()); + Error4("Unable to load item %s with material %s (factory %s)!\n", name.GetData(), matName.GetData(), factName.GetData()); psengine->UnregisterDelayedLoader(this); delete post_load; post_load = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-07-24 18:27:46
|
Revision: 6064 http://planeshift.svn.sourceforge.net/planeshift/?rev=6064&view=rev Author: rlydontknow Date: 2010-07-24 18:27:40 +0000 (Sat, 24 Jul 2010) Log Message: ----------- re-enabled z_only shading for items HoM around a few items is a lot better than *heavy* lags in certain areas (e.g. bdroad2) Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-07-23 19:40:45 UTC (rev 6063) +++ trunk/src/client/pscelclient.cpp 2010-07-24 18:27:40 UTC (rev 6064) @@ -2176,8 +2176,9 @@ // Set the early_z shader on this material. iShader* shaderz = NULL; { - //csRef<iStringArray> shaderName = psengine->GetLoader()->GetShaderName("instance_early_z"); - shaderz = shman->GetShader(/*shaderName->Get(0)*/"*null"); + csRef<iStringArray> shaderName = psengine->GetLoader()->GetShaderName("instance_early_z"); + //shaderz = shman->GetShader("*null"); + shaderz = shman->GetShader(shaderName->Get(0)); } shadertype = strings->Request("depthwrite"); mat->SetShader(shadertype, shaderz); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-09-06 17:30:44
|
Revision: 6181 http://planeshift.svn.sourceforge.net/planeshift/?rev=6181&view=rev Author: rlydontknow Date: 2010-09-06 17:30:38 +0000 (Mon, 06 Sep 2010) Log Message: ----------- fix for PS#4680 - emitters not functioning on initial login - by titus Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-09-05 08:11:22 UTC (rev 6180) +++ trunk/src/client/pscelclient.cpp 2010-09-06 17:30:38 UTC (rev 6181) @@ -224,7 +224,8 @@ void psCelClient::HandleWorld( MsgEntry* me ) { psPersistWorld mesg(me); - zonehandler->LoadZone(mesg.pos, mesg.sector); + psNewSectorMessage cross("", mesg.sector, mesg.pos); + msghandler->Publish(cross.msg); gameWorld = new psWorld(); gameWorld->Initialize(object_reg); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-09-24 17:22:29
|
Revision: 6213 http://planeshift.svn.sourceforge.net/planeshift/?rev=6213&view=rev Author: rlydontknow Date: 2010-09-24 17:22:22 +0000 (Fri, 24 Sep 2010) Log Message: ----------- fix for warning Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-09-23 17:56:38 UTC (rev 6212) +++ trunk/src/client/pscelclient.cpp 2010-09-24 17:22:22 UTC (rev 6213) @@ -1116,7 +1116,7 @@ } else { - if (instance->pcmesh->GetMovable()->GetSectors()->Find(sector) == csArrayItemNotFound) + if (instance->pcmesh->GetMovable()->GetSectors()->Find(sector) == (int)csArrayItemNotFound) { instance->pcmesh->GetMovable()->GetSectors()->Add(sector); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-11-22 16:43:06
|
Revision: 6424 http://planeshift.svn.sourceforge.net/planeshift/?rev=6424&view=rev Author: rlydontknow Date: 2010-11-22 16:43:00 +0000 (Mon, 22 Nov 2010) Log Message: ----------- fixed HoM for instanced alpha objects some still show HoM with instancing disabled, can we make sure the proper zbuf modes/depthwrite shaders are set, please? Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-11-22 16:37:53 UTC (rev 6423) +++ trunk/src/client/pscelclient.cpp 2010-11-22 16:43:00 UTC (rev 6424) @@ -2147,48 +2147,54 @@ } // Get the base shader. - csStringID shadertype = strings->Request("base"); - iShader* shader = material->GetShader(shadertype); + csStringID baseType = strings->Request("base"); + iShader* shader = material->GetShader(baseType); + // Get the depth shader. + csStringID depthType = strings->Request("depthwrite"); + iShader* shaderz = material->GetShader(depthType); + + // Get the diffuse shader type. + csStringID diffuseType = strings->Request("diffuse"); + // Find an instance shader matching this type. - csRef<iStringArray> shaders = psengine->GetLoader()->GetShaderName("default"); - csRef<iStringArray> shadersa = psengine->GetLoader()->GetShaderName("default_alpha"); + iBgLoader* loader = psengine->GetLoader(); + csRef<iStringArray> shaders = loader->GetShaderName("default"); + csRef<iStringArray> shadersa = loader->GetShaderName("default_alpha"); if(!shader || shaders->Contains(shader->QueryObject()->GetName()) != csArrayItemNotFound) { - csRef<iStringArray> shaderName = psengine->GetLoader()->GetShaderName("instance"); + csRef<iStringArray> shaderName = loader->GetShaderName("instance"); shader = shman->GetShader(shaderName->Get(0)); + + // set instanced depthwrite shader for non-alpha objects. + shaderName = loader->GetShaderName("instance_early_z"); + shaderz = shman->GetShader(shaderName->Get(0)); } else if(shadersa->Contains(shader->QueryObject()->GetName()) != csArrayItemNotFound) { - csRef<iStringArray> shaderName = psengine->GetLoader()->GetShaderName("instance_alpha"); + csRef<iStringArray> shaderName = loader->GetShaderName("instance_alpha"); shader = shman->GetShader(shaderName->Get(0)); + + // alpha objects don't use the depthwrite pass for now. + shaderz = shman->GetShader("*null"); } else { Error3("Unhandled shader %s for mesh %s!\n", shader->QueryObject()->GetName(), factName.GetData()); } - // Construct a new material using the selected shaders. csRef<iTextureWrapper> tex = psengine->GetEngine()->GetTextureList()->CreateTexture(material->GetTexture()); csRef<iMaterial> mat = psengine->GetEngine()->CreateBaseMaterial(tex); // Set the base shader on this material. - mat->SetShader(shadertype, shader); + mat->SetShader(baseType, shader); // Set the diffuse shader on this material. - shadertype = strings->Request("diffuse"); - mat->SetShader(shadertype, shader); + mat->SetShader(diffuseType, shader); // Set the early_z shader on this material. - iShader* shaderz = NULL; - { - csRef<iStringArray> shaderName = psengine->GetLoader()->GetShaderName("instance_early_z"); - //shaderz = shman->GetShader("*null"); - shaderz = shman->GetShader(shaderName->Get(0)); - } - shadertype = strings->Request("depthwrite"); - mat->SetShader(shadertype, shaderz); + mat->SetShader(depthType, shaderz); // Copy all shadervars over. for(size_t j=0; j<material->GetShaderVariables().GetSize(); ++j) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-11-22 16:45:05
|
Revision: 6425 http://planeshift.svn.sourceforge.net/planeshift/?rev=6425&view=rev Author: rlydontknow Date: 2010-11-22 16:44:59 +0000 (Mon, 22 Nov 2010) Log Message: ----------- removed bbox hack for instanced items in favour of CS_ENTITY_ALWAYSVISIBLE please revert this one if you're compiling with CS revisions prior to r35244 Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-11-22 16:43:00 UTC (rev 6424) +++ trunk/src/client/pscelclient.cpp 2010-11-22 16:44:59 UTC (rev 6425) @@ -2262,7 +2262,7 @@ { instance = csPtr<InstanceObject>(new InstanceObject()); instance->pcmesh = factory->CreateMeshWrapper(); - instance->pcmesh->GetFlags().Set(CS_ENTITY_NODECAL | CS_ENTITY_NOHITBEAM); + instance->pcmesh->GetFlags().Set(CS_ENTITY_NODECAL | CS_ENTITY_NOHITBEAM | CS_ENTITY_ALWAYSVISIBLE); psengine->GetEngine()->PrecacheMesh(instance->pcmesh); cel->AddInstanceObject(factName+matName, instance); @@ -2329,9 +2329,6 @@ // Set biggest bbox so that instances aren't wrongly culled. instance->bbox = factory->GetMeshObjectFactory()->GetObjectModel()->GetObjectBoundingBox(); - factory->GetMeshObjectFactory()->GetObjectModel()->SetObjectBoundingBox(csBox3(-CS_BOUNDINGBOX_MAXVALUE, - -CS_BOUNDINGBOX_MAXVALUE, -CS_BOUNDINGBOX_MAXVALUE, CS_BOUNDINGBOX_MAXVALUE, CS_BOUNDINGBOX_MAXVALUE, - CS_BOUNDINGBOX_MAXVALUE)); // create nullmesh factory instance->nullFactory = psengine->GetEngine()->CreateMeshFactory("crystalspace.mesh.object.null", factName + "_nullmesh", false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-11-22 20:39:46
|
Revision: 6426 http://planeshift.svn.sourceforge.net/planeshift/?rev=6426&view=rev Author: rlydontknow Date: 2010-11-22 20:39:39 +0000 (Mon, 22 Nov 2010) Log Message: ----------- reverted PS r6425 as it breaks dynavis Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-11-22 16:44:59 UTC (rev 6425) +++ trunk/src/client/pscelclient.cpp 2010-11-22 20:39:39 UTC (rev 6426) @@ -2262,7 +2262,7 @@ { instance = csPtr<InstanceObject>(new InstanceObject()); instance->pcmesh = factory->CreateMeshWrapper(); - instance->pcmesh->GetFlags().Set(CS_ENTITY_NODECAL | CS_ENTITY_NOHITBEAM | CS_ENTITY_ALWAYSVISIBLE); + instance->pcmesh->GetFlags().Set(CS_ENTITY_NODECAL | CS_ENTITY_NOHITBEAM); psengine->GetEngine()->PrecacheMesh(instance->pcmesh); cel->AddInstanceObject(factName+matName, instance); @@ -2329,6 +2329,9 @@ // Set biggest bbox so that instances aren't wrongly culled. instance->bbox = factory->GetMeshObjectFactory()->GetObjectModel()->GetObjectBoundingBox(); + factory->GetMeshObjectFactory()->GetObjectModel()->SetObjectBoundingBox(csBox3(-CS_BOUNDINGBOX_MAXVALUE, + -CS_BOUNDINGBOX_MAXVALUE, -CS_BOUNDINGBOX_MAXVALUE, CS_BOUNDINGBOX_MAXVALUE, CS_BOUNDINGBOX_MAXVALUE, + CS_BOUNDINGBOX_MAXVALUE)); // create nullmesh factory instance->nullFactory = psengine->GetEngine()->CreateMeshFactory("crystalspace.mesh.object.null", factName + "_nullmesh", false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-11-25 10:37:32
|
Revision: 6443 http://planeshift.svn.sourceforge.net/planeshift/?rev=6443&view=rev Author: weltall2 Date: 2010-11-25 10:37:26 +0000 (Thu, 25 Nov 2010) Log Message: ----------- set the depthtest shader to z_only_instanced for alpha instanced items. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-11-24 19:19:43 UTC (rev 6442) +++ trunk/src/client/pscelclient.cpp 2010-11-25 10:37:26 UTC (rev 6443) @@ -1854,9 +1854,9 @@ if(cal3dvel == 0.0) cal3dvel = velocity.y; cal3dstate->SetVelocity(-cal3dvel, &psengine->GetRandomGen()); - if((velocity.x != 0 || velocity.z != 0) && velocity.Norm() < 2) { + charApp->SetSneak(true); } else @@ -2150,6 +2150,10 @@ csStringID baseType = strings->Request("base"); iShader* shader = material->GetShader(baseType); + // Get the depthtest shader. + csStringID depthTestType = strings->Request("depthtest"); + iShader* shadert = material->GetShader(depthTestType); + // Get the depth shader. csStringID depthType = strings->Request("depthwrite"); iShader* shaderz = material->GetShader(depthType); @@ -2177,6 +2181,8 @@ // alpha objects don't use the depthwrite pass for now. shaderz = shman->GetShader("*null"); + // instanced alpha objects need to use z_only_instanced for depthtest + shadert = shman->GetShader("z_only_instanced"); } else { @@ -2193,6 +2199,9 @@ // Set the diffuse shader on this material. mat->SetShader(diffuseType, shader); + // Set the depthtest shader on this material + mat->SetShader(depthTestType, shadert); + // Set the early_z shader on this material. mat->SetShader(depthType, shaderz); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-11-25 20:10:15
|
Revision: 6446 http://planeshift.svn.sourceforge.net/planeshift/?rev=6446&view=rev Author: rlydontknow Date: 2010-11-25 20:10:09 +0000 (Thu, 25 Nov 2010) Log Message: ----------- reverted r6443 as occluvis isn't stable, yet Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-11-25 14:38:23 UTC (rev 6445) +++ trunk/src/client/pscelclient.cpp 2010-11-25 20:10:09 UTC (rev 6446) @@ -2150,10 +2150,6 @@ csStringID baseType = strings->Request("base"); iShader* shader = material->GetShader(baseType); - // Get the depthtest shader. - csStringID depthTestType = strings->Request("depthtest"); - iShader* shadert = material->GetShader(depthTestType); - // Get the depth shader. csStringID depthType = strings->Request("depthwrite"); iShader* shaderz = material->GetShader(depthType); @@ -2181,8 +2177,6 @@ // alpha objects don't use the depthwrite pass for now. shaderz = shman->GetShader("*null"); - // instanced alpha objects need to use z_only_instanced for depthtest - shadert = shman->GetShader("z_only_instanced"); } else { @@ -2199,9 +2193,6 @@ // Set the diffuse shader on this material. mat->SetShader(diffuseType, shader); - // Set the depthtest shader on this material - mat->SetShader(depthTestType, shadert); - // Set the early_z shader on this material. mat->SetShader(depthType, shaderz); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-12-25 18:26:58
|
Revision: 6589 http://planeshift.svn.sourceforge.net/planeshift/?rev=6589&view=rev Author: rlydontknow Date: 2010-12-25 18:26:52 +0000 (Sat, 25 Dec 2010) Log Message: ----------- removed unused variable Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-12-25 18:18:41 UTC (rev 6588) +++ trunk/src/client/pscelclient.cpp 2010-12-25 18:26:52 UTC (rev 6589) @@ -2045,7 +2045,6 @@ csReversibleTransform & trans = movable->GetTransform(); trans.SetO2T(trans.GetO2T() * scale); }*/ - csRef<iSpriteCal3DState> meshstate = scfQueryInterface<iSpriteCal3DState> (mesh->GetMeshObject()); if(scale >= 0) { csRef<iSpriteCal3DFactoryState> sprite = scfQueryInterface<iSpriteCal3DFactoryState> (mesh->GetFactory()->GetMeshObjectFactory()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-12-25 20:09:34
|
Revision: 6594 http://planeshift.svn.sourceforge.net/planeshift/?rev=6594&view=rev Author: rlydontknow Date: 2010-12-25 20:09:28 +0000 (Sat, 25 Dec 2010) Log Message: ----------- fixed possible memleak if load is aborted caused by post_load not being freed in the destructor Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2010-12-25 20:07:29 UTC (rev 6593) +++ trunk/src/client/pscelclient.cpp 2010-12-25 20:09:28 UTC (rev 6594) @@ -1435,6 +1435,8 @@ { delete vitalManager; delete linmove; + delete post_load; + cal3dstate.Invalidate(); if(pcmesh.IsValid()) { @@ -2090,10 +2092,8 @@ GEMClientItem::~GEMClientItem() { - if(solid) - { - delete solid; - } + delete solid; + delete post_load; if(instance.IsValid()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2011-01-01 00:46:36
|
Revision: 6681 http://planeshift.svn.sourceforge.net/planeshift/?rev=6681&view=rev Author: rlydontknow Date: 2011-01-01 00:46:30 +0000 (Sat, 01 Jan 2011) Log Message: ----------- if background world loading is disabled, call ContinueLoading so delayed loaders will be processed Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2011-01-01 00:20:44 UTC (rev 6680) +++ trunk/src/client/pscelclient.cpp 2011-01-01 00:46:30 UTC (rev 6681) @@ -688,6 +688,10 @@ // Update loader. psengine->GetLoader()->UpdatePosition(local_player->Pos(), sectorName, false); } + else + { + psengine->GetLoader()->ContinueLoading(false); + } //const char* sectorName = local_player->GetSector()->QueryObject()->GetName(); // Check if we're inside a water area. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2011-01-14 18:02:25
|
Revision: 6774 http://planeshift.svn.sourceforge.net/planeshift/?rev=6774&view=rev Author: rlydontknow Date: 2011-01-14 18:02:19 +0000 (Fri, 14 Jan 2011) Log Message: ----------- set the nullmesh as pcmesh while a character is loading fixes a memleak (the nullmesh never being freed) and a crash if an equip is received while the character is loading Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2011-01-14 14:54:38 UTC (rev 6773) +++ trunk/src/client/pscelclient.cpp 2011-01-14 18:02:19 UTC (rev 6774) @@ -1377,6 +1377,9 @@ pcmesh = nullmesh->CreateMeshWrapper(); pcmesh->QueryObject()->SetName(name); + // make sure char app won't crash + charApp->SetMesh(pcmesh); + linmove->InitCD(mesg.top, mesg.bottom, mesg.offset, pcmesh); linmove->SetDeltaLimit(0.2f); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2011-01-17 13:54:27
|
Revision: 6801 http://planeshift.svn.sourceforge.net/planeshift/?rev=6801&view=rev Author: rlydontknow Date: 2011-01-17 13:54:21 +0000 (Mon, 17 Jan 2011) Log Message: ----------- fixed return values Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2011-01-17 10:40:59 UTC (rev 6800) +++ trunk/src/client/pscelclient.cpp 2011-01-17 13:54:21 UTC (rev 6801) @@ -1979,7 +1979,7 @@ if (psengine->GetZoneHandler()->IsLoading() || !post_load->sector) { post_load->sector = psengine->GetEngine()->GetSectors()->FindByName(post_load->sector_name); - return true; + return false; } if(!factory.IsValid()) @@ -1996,7 +1996,7 @@ if(!factory->IsFinished()) { - return true; + return false; } else if(!factory->WasSuccessful()) { @@ -2021,7 +2021,7 @@ if(!mountFactory->IsFinished()) { - return true; + return false; } else if(!mountFactory->WasSuccessful()) { @@ -2229,7 +2229,7 @@ if(!factory->IsFinished()) { - return true; + return false; } else if(!factory->WasSuccessful()) { @@ -2255,7 +2255,7 @@ if(!material->IsFinished()) { - return true; + return false; } else if(!factory->WasSuccessful()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2011-01-17 18:00:02
|
Revision: 6807 http://planeshift.svn.sourceforge.net/planeshift/?rev=6807&view=rev Author: rlydontknow Date: 2011-01-17 17:59:56 +0000 (Mon, 17 Jan 2011) Log Message: ----------- don't instantiate items per default Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2011-01-17 14:59:21 UTC (rev 6806) +++ trunk/src/client/pscelclient.cpp 2011-01-17 17:59:56 UTC (rev 6807) @@ -173,7 +173,7 @@ unresSector = psengine->GetEngine()->CreateSector("SectorWhereWeKeepEntitiesResidingInUnloadedMaps"); - instantiateItems = psengine->GetConfig()->GetBool("PlaneShift.Items.Instantiate", true); + instantiateItems = psengine->GetConfig()->GetBool("PlaneShift.Items.Instantiate", false); LoadEffectItems(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-01-19 17:47:40
|
Revision: 6819 http://planeshift.svn.sourceforge.net/planeshift/?rev=6819&view=rev Author: weltall2 Date: 2011-01-19 17:47:33 +0000 (Wed, 19 Jan 2011) Log Message: ----------- avoid sit/stand when changing mode from overweight to overweight Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2011-01-19 11:43:01 UTC (rev 6818) +++ trunk/src/client/pscelclient.cpp 2011-01-19 17:47:33 UTC (rev 6819) @@ -1897,7 +1897,7 @@ case psModeMessage::SIT: case psModeMessage::OVERWEIGHT: case psModeMessage::DEFEATED: - if (!newactor) //we do this only if this isn't a new actor + if (!newactor && serverMode != mode) //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...> - 2011-05-18 20:33:38
|
Revision: 7297 http://planeshift.svn.sourceforge.net/planeshift/?rev=7297&view=rev Author: weltall2 Date: 2011-05-18 20:33:32 +0000 (Wed, 18 May 2011) Log Message: ----------- changed the function to use the cs animesh implementation of the function Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2011-05-18 20:27:56 UTC (rev 7296) +++ trunk/src/client/pscelclient.cpp 2011-05-18 20:33:32 UTC (rev 7297) @@ -1535,15 +1535,7 @@ idx = -1; //we initialize this at -1 in case we are unable to find our result if (packetFactory) { - for (size_t i = 0; i < packetFactory->GetAnimationCount (); i++) - { - if(animName == packetFactory->GetAnimation(i)->GetName()) - { - //we have found the name - idx = i; - break; - } - } + idx = packetFactory->FindAnimationIndex(animName); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-06-28 22:12:16
|
Revision: 7471 http://planeshift.svn.sourceforge.net/planeshift/?rev=7471&view=rev Author: weltall2 Date: 2011-06-28 22:12:10 +0000 (Tue, 28 Jun 2011) Log Message: ----------- additional expansion Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2011-06-28 22:08:02 UTC (rev 7470) +++ trunk/src/client/pscelclient.cpp 2011-06-28 22:12:10 UTC (rev 7471) @@ -1971,10 +1971,15 @@ void GEMClientActor::SetIdleAnimation(const char* anim) { - if(!cal3dstate) return; + if(!cal3dstate && !speedNode.IsValid()) return; cal3dstate->SetDefaultIdleAnim(anim); if (lastSentVelocity.IsZero()) - cal3dstate->SetVelocity(0); + { + if(cal3dstate) + cal3dstate->SetVelocity(0); + else + speedNode->SetSpeed(0); + } } void GEMClientActor::RefreshCal3d() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-06-28 22:13:23
|
Revision: 7472 http://planeshift.svn.sourceforge.net/planeshift/?rev=7472&view=rev Author: weltall2 Date: 2011-06-28 22:13:17 +0000 (Tue, 28 Jun 2011) Log Message: ----------- little error Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2011-06-28 22:12:10 UTC (rev 7471) +++ trunk/src/client/pscelclient.cpp 2011-06-28 22:13:17 UTC (rev 7472) @@ -1972,7 +1972,8 @@ void GEMClientActor::SetIdleAnimation(const char* anim) { if(!cal3dstate && !speedNode.IsValid()) return; - cal3dstate->SetDefaultIdleAnim(anim); + if(cal3dstate) + cal3dstate->SetDefaultIdleAnim(anim); if (lastSentVelocity.IsZero()) { if(cal3dstate) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-06-28 22:14:53
|
Revision: 7473 http://planeshift.svn.sourceforge.net/planeshift/?rev=7473&view=rev Author: weltall2 Date: 2011-06-28 22:14:47 +0000 (Tue, 28 Jun 2011) Log Message: ----------- fixed the assert triggering Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2011-06-28 22:13:17 UTC (rev 7472) +++ trunk/src/client/pscelclient.cpp 2011-06-28 22:14:47 UTC (rev 7473) @@ -1992,7 +1992,7 @@ CS::Animation::iSkeletonAnimNode* rootNode = animeshObject->GetSkeleton()->GetAnimationPacket()->GetAnimationRoot(); speedNode = scfQueryInterface<CS::Animation::iSkeletonSpeedNode> (rootNode->FindNode("speed")); } - CS_ASSERT(cal3dstate); + CS_ASSERT(cal3dstate || animeshObject); } void GEMClientActor::SetChatBubbleID(unsigned int chatBubbleID) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-12-15 18:41:15
|
Revision: 7819 http://planeshift.svn.sourceforge.net/planeshift/?rev=7819&view=rev Author: weltall2 Date: 2011-12-15 18:41:09 +0000 (Thu, 15 Dec 2011) Log Message: ----------- changed sneak speed Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2011-12-15 16:34:03 UTC (rev 7818) +++ trunk/src/client/pscelclient.cpp 2011-12-15 18:41:09 UTC (rev 7819) @@ -1876,7 +1876,7 @@ { speedNode->SetSpeed(-cal3dvel); } - if((velocity.x != 0 || velocity.z != 0) && velocity.Norm() < 2) + if((velocity.x != 0 || velocity.z != 0) && velocity.Norm() < 1.3) { charApp->SetSneak(true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Rly...@us...> - 2012-03-28 12:53:15
|
Revision: 8136 http://planeshift.svn.sourceforge.net/planeshift/?rev=8136&view=rev Author: RlyDontKnow Date: 2012-03-28 12:53:05 +0000 (Wed, 28 Mar 2012) Log Message: ----------- set cyclic blending factor on cal3d meshes Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2012-03-24 23:23:16 UTC (rev 8135) +++ trunk/src/client/pscelclient.cpp 2012-03-28 12:53:05 UTC (rev 8136) @@ -2020,6 +2020,10 @@ CS::Animation::iSkeletonAnimNode* rootNode = animeshObject->GetSkeleton()->GetAnimationPacket()->GetAnimationRoot(); speedNode = scfQueryInterface<CS::Animation::iSkeletonSpeedNode> (rootNode->FindNode("speed")); } + if(cal3dstate) + { + cal3dstate->SetCyclicBlendFactor(0.25); + } CS_ASSERT(cal3dstate || animeshObject); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2012-03-28 15:11:45
|
Revision: 8137 http://planeshift.svn.sourceforge.net/planeshift/?rev=8137&view=rev Author: lpancallo Date: 2012-03-28 15:11:35 +0000 (Wed, 28 Mar 2012) Log Message: ----------- changed value to 0.1 to avoid walk anim corruption Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2012-03-28 12:53:05 UTC (rev 8136) +++ trunk/src/client/pscelclient.cpp 2012-03-28 15:11:35 UTC (rev 8137) @@ -2022,7 +2022,7 @@ } if(cal3dstate) { - cal3dstate->SetCyclicBlendFactor(0.25); + cal3dstate->SetCyclicBlendFactor(0.1); } CS_ASSERT(cal3dstate || animeshObject); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |