From: <wel...@us...> - 2012-04-16 20:13:21
|
Revision: 8216 http://planeshift.svn.sourceforge.net/planeshift/?rev=8216&view=rev Author: weltall2 Date: 2012-04-16 20:13:15 +0000 (Mon, 16 Apr 2012) Log Message: ----------- reverted resizing Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2012-04-16 19:24:55 UTC (rev 8215) +++ trunk/src/client/pscelclient.cpp 2012-04-16 20:13:15 UTC (rev 8216) @@ -1400,7 +1400,7 @@ // This is needed when we have to scale. if(scale > 0.0f) { - /* bool failed = false; + bool failed = false; csString newFactName = factName; newFactName.AppendFmt("%f", scale); @@ -1414,7 +1414,7 @@ else { factName = newFactName; - }*/ + } } @@ -2129,7 +2129,7 @@ else { SwitchToRealMesh(mesh); - if(scale >= 0) + /*if(scale >= 0) { csRef<iMovable> movable = mesh->GetMovable(); csReversibleTransform & trans = movable->GetTransform(); @@ -2137,12 +2137,12 @@ //scale = scale/sprite->GetScaleFactor(); trans.SetO2T(trans.GetO2T() / scale); movable->UpdateMove(); - } - /*if(scale >= 0) + }*/ + if(scale >= 0) { csRef<iSpriteCal3DFactoryState> sprite = scfQueryInterface<iSpriteCal3DFactoryState> (mesh->GetFactory()->GetMeshObjectFactory()); sprite->AbsoluteRescaleFactory(1); - }*/ + } } 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...> - 2012-04-18 05:07:19
|
Revision: 8222 http://planeshift.svn.sourceforge.net/planeshift/?rev=8222&view=rev Author: weltall2 Date: 2012-04-18 05:07:13 +0000 (Wed, 18 Apr 2012) Log Message: ----------- missed one thing Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2012-04-17 23:46:48 UTC (rev 8221) +++ trunk/src/client/pscelclient.cpp 2012-04-18 05:07:13 UTC (rev 8222) @@ -2141,7 +2141,7 @@ if(scale >= 0) { csRef<iSpriteCal3DFactoryState> sprite = scfQueryInterface<iSpriteCal3DFactoryState> (mesh->GetFactory()->GetMeshObjectFactory()); - sprite->AbsoluteRescaleFactory(1); + sprite->AbsoluteRescaleFactory(scale); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2012-06-01 07:31:51
|
Revision: 8344 http://planeshift.svn.sourceforge.net/planeshift/?rev=8344&view=rev Author: weltall2 Date: 2012-06-01 07:31:42 +0000 (Fri, 01 Jun 2012) Log Message: ----------- fixed a certain crash even noticed by the compiler Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2012-06-01 07:20:08 UTC (rev 8343) +++ trunk/src/client/pscelclient.cpp 2012-06-01 07:31:42 UTC (rev 8344) @@ -2003,7 +2003,7 @@ if(newmode == movementMode) return; - Debug4(LOG_CELPERSIST, 0, "Setting New mode: %d for %s eid: %d", newmode, GetName(), this->GetEID()); + Debug4(LOG_CELPERSIST, 0, "Setting New mode: %d for %s eid: %d", newmode, GetName(), this->GetEID().Unbox()); movementMode = newmode; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2013-01-01 23:07:34
|
Revision: 8527 http://planeshift.svn.sourceforge.net/planeshift/?rev=8527&view=rev Author: weltall2 Date: 2013-01-01 23:07:27 +0000 (Tue, 01 Jan 2013) Log Message: ----------- handle also attached rider meshes for selection Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2013-01-01 15:32:16 UTC (rev 8526) +++ trunk/src/client/pscelclient.cpp 2013-01-01 23:07:27 UTC (rev 8527) @@ -1420,6 +1420,7 @@ if(rider.IsValid()) { psengine->GetEngine()->RemoveObject(rider); + cel->UnattachObject(rider->QueryObject(), this); } if(pcmesh.IsValid()) @@ -2137,6 +2138,12 @@ cel->AttachObject(pcmesh->QueryObject(), this); + // If this is a mounted object add also what is mounting it so it can be clicked. + if(rider.IsValid()) + { + cel->AttachObject(rider->QueryObject(), this); + } + psengine->UnregisterDelayedLoader(this); psengine->GetSoundManager()->AddObjectEntity(pcmesh, race); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2013-11-03 23:14:02
|
Revision: 8951 http://sourceforge.net/p/planeshift/code/8951 Author: lpancallo Date: 2013-11-03 23:13:58 +0000 (Sun, 03 Nov 2013) Log Message: ----------- sequence name much be unique. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2013-11-03 06:20:35 UTC (rev 8950) +++ trunk/src/client/pscelclient.cpp 2013-11-03 23:13:58 UTC (rev 8951) @@ -684,9 +684,11 @@ // object found if(objectWrapper) { + // name of the sequence needs to be unique + csString sequenceName = msg.meshName.Append(msg.move).Append(msg.rot); // creates a sequence to move/rotate the object csRef<iEngineSequenceManager> sequenceMngr = csQueryRegistryOrLoad<iEngineSequenceManager> (object_reg,"crystalspace.utilities.sequence.engine", false); - csRef<iSequenceWrapper> sequence = sequenceMngr->CreateSequence("mechanisms"); + csRef<iSequenceWrapper> sequence = sequenceMngr->CreateSequence(sequenceName); csRef<iParameterESM> meshParam = sequenceMngr->CreateParameterESM(objectWrapper); const int ANIM_DURATION = 5000; // move the object @@ -696,7 +698,7 @@ tokens.SplitString(msg.move, ","); csVector3 v(atof(tokens.Get(0)), atof(tokens.Get(1)), atof(tokens.Get(2))); sequence->AddOperationMoveDuration(0,meshParam,v,ANIM_DURATION); - sequenceMngr->RunSequenceByName("mechanisms",0); + sequenceMngr->RunSequenceByName(sequenceName,0); // rotates the object } else if (msg.rot && msg.rot!="") { Debug2(LOG_ACTIONLOCATION,0,"Found mesh rotate! %s", objectWrapper->QueryObject()->GetName()); @@ -704,7 +706,7 @@ tokens.SplitString(msg.rot, ","); sequence->AddOperationRotateDuration (0, meshParam, 0, atof(tokens.Get(0)), 1, atof(tokens.Get(1)), 2, atof(tokens.Get(2)), csVector3(0,0,0), ANIM_DURATION, true); - sequenceMngr->RunSequenceByName("mechanisms",0); + sequenceMngr->RunSequenceByName(sequenceName,0); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2013-11-15 21:14:29
|
Revision: 8987 http://sourceforge.net/p/planeshift/code/8987 Author: ralphcampbell Date: 2013-11-15 21:14:26 +0000 (Fri, 15 Nov 2013) Log Message: ----------- Fix compiler error when psPersistActor::BeltGroup was changed to beltGroup Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2013-11-15 20:20:54 UTC (rev 8986) +++ trunk/src/client/pscelclient.cpp 2013-11-15 21:14:26 UTC (rev 8987) @@ -1388,9 +1388,9 @@ mountFactname = mesg.mountFactname; MounterAnim = mesg.MounterAnim; helmGroup = mesg.helmGroup; - BracerGroup = mesg.BracerGroup; - BeltGroup = mesg.BeltGroup; - CloakGroup = mesg.CloakGroup; + BracerGroup = mesg.bracerGroup; + BeltGroup = mesg.beltGroup; + CloakGroup = mesg.cloakGroup; type = mesg.type; masqueradeType = mesg.masqueradeType; guildName = mesg.guild; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2013-12-08 13:05:51
|
Revision: 9065 http://sourceforge.net/p/planeshift/code/9065 Author: magodra Date: 2013-12-08 13:05:48 +0000 (Sun, 08 Dec 2013) Log Message: ----------- Code cleanup. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2013-12-08 11:39:47 UTC (rev 9064) +++ trunk/src/client/pscelclient.cpp 2013-12-08 13:05:48 UTC (rev 9065) @@ -686,28 +686,30 @@ { // name of the sequence needs to be unique csString sequenceName = msg.meshName.Append(msg.move).Append(msg.rot); - // creates a sequence to move/rotate the object - csRef<iEngineSequenceManager> sequenceMngr = csQueryRegistryOrLoad<iEngineSequenceManager> (object_reg,"crystalspace.utilities.sequence.engine", false); - csRef<iSequenceWrapper> sequence = sequenceMngr->CreateSequence(sequenceName); - csRef<iParameterESM> meshParam = sequenceMngr->CreateParameterESM(objectWrapper); - const int ANIM_DURATION = 5000; + // creates a sequence to move/rotate the object + csRef<iEngineSequenceManager> sequenceMngr = csQueryRegistryOrLoad<iEngineSequenceManager> (object_reg,"crystalspace.utilities.sequence.engine", false); + csRef<iSequenceWrapper> sequence = sequenceMngr->CreateSequence(sequenceName); + csRef<iParameterESM> meshParam = sequenceMngr->CreateParameterESM(objectWrapper); + const int ANIM_DURATION = 5000; // move the object - if (msg.move && msg.move!="") { + if (msg.move && msg.move!="") + { Debug2(LOG_ACTIONLOCATION,0,"Found mesh move! %s", objectWrapper->QueryObject()->GetName()); csStringArray tokens; tokens.SplitString(msg.move, ","); csVector3 v(atof(tokens.Get(0)), atof(tokens.Get(1)), atof(tokens.Get(2))); - sequence->AddOperationMoveDuration(0,meshParam,v,ANIM_DURATION); - sequenceMngr->RunSequenceByName(sequenceName,0); - // rotates the object - } else if (msg.rot && msg.rot!="") { + sequence->AddOperationMoveDuration(0,meshParam,v,ANIM_DURATION); + sequenceMngr->RunSequenceByName(sequenceName,0); + } + // rotates the object + else if (msg.rot && msg.rot!="") + { Debug2(LOG_ACTIONLOCATION,0,"Found mesh rotate! %s", objectWrapper->QueryObject()->GetName()); csStringArray tokens; tokens.SplitString(msg.rot, ","); - sequence->AddOperationRotateDuration (0, meshParam, 0, atof(tokens.Get(0)), 1, atof(tokens.Get(1)), 2, atof(tokens.Get(2)), csVector3(0,0,0), ANIM_DURATION, true); - sequenceMngr->RunSequenceByName(sequenceName,0); - + sequence->AddOperationRotateDuration (0, meshParam, 0, atof(tokens.Get(0)), 1, atof(tokens.Get(1)), 2, atof(tokens.Get(2)), csVector3(0,0,0), ANIM_DURATION, true); + sequenceMngr->RunSequenceByName(sequenceName,0); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2013-12-31 14:50:46
|
Revision: 9137 http://sourceforge.net/p/planeshift/code/9137 Author: magodra Date: 2013-12-31 14:50:43 +0000 (Tue, 31 Dec 2013) Log Message: ----------- Fixed a few uninitalized scalars in pscelclient. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2013-12-31 02:52:10 UTC (rev 9136) +++ trunk/src/client/pscelclient.cpp 2013-12-31 14:50:43 UTC (rev 9137) @@ -99,6 +99,8 @@ psCelClient::psCelClient() { + instantiateItems = false; + requeststatus = 0; clientdr = NULL; @@ -913,12 +915,13 @@ } } - if(unresolved) + if(unresolved && sectorToBeDeleted) { // All the sectors the mesh is in are going to be unloaded Warning1(LOG_ANY,"Moving entity to temporary sector"); // put the mesh to the sector that server uses for keeping meshes located in unload maps - HandleUnresolvedPos(entities[entNum], entities[entNum]->GetPosition(), csVector3(0), sectorToBeDeleted->QueryObject()->GetName()); + HandleUnresolvedPos(entities[entNum], entities[entNum]->GetPosition(), csVector3(0), + sectorToBeDeleted->QueryObject()->GetName()); } } } @@ -1136,6 +1139,7 @@ shadow = 0; hasLabel = false; hasShadow = false; + type = 0; flags = 0; } @@ -1149,6 +1153,8 @@ shadow = 0; hasLabel = false; hasShadow = false; + type = 0; + flags = 0; } GEMClientObject::~GEMClientObject() @@ -1411,6 +1417,7 @@ ownerEID = mesg.ownerEID; lastSentVelocity = lastSentRotation = 0.0f; stationary = true; + path_sent = false; movementMode = mesg.mode; serverMode = mesg.serverMode; alive = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-03-27 22:58:28
|
Revision: 9357 http://sourceforge.net/p/planeshift/code/9357 Author: ralphcampbell Date: 2014-03-27 22:58:25 +0000 (Thu, 27 Mar 2014) Log Message: ----------- Fix PS#6273 - Mobs running in place Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2014-03-26 16:41:10 UTC (rev 9356) +++ trunk/src/client/pscelclient.cpp 2014-03-27 22:58:25 UTC (rev 9357) @@ -1778,8 +1778,8 @@ if(DoLogDebug(LOG_DRDATA)) { - Debug(LOG_DRDATA, GetEID().Unbox(), "DRDATA: %s, %s, %s, %s, pos(%f,%f,%f), rot(%f), %s, %f, %f, %f, %f, %f, %f, %f", - "PSCLIENT", "OLD", ShowID(GetEID()),"?", cur_pos.x, cur_pos.y, cur_pos.z, cur_yrot, + Debug(LOG_DRDATA, GetEID().Unbox(), "DRDATA: %s, %s, %s, %s, pos(%f, %f, %f), rot(%f), %s, %f, %f, %f, %f, %f, %f, %f", + "PSCLIENT", "OLD", ShowID(GetEID()),GetName(), cur_pos.x, cur_pos.y, cur_pos.z, cur_yrot, cur_sector->QueryObject()->GetName(), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); Debug(LOG_DRDATA, GetEID().Unbox(), "DRDATA: %s, %s, %s, %s, pos(%f, %f, %f), rot(%f), %s, %f, %f, %f, %f, %f, %f, %f", @@ -1795,21 +1795,16 @@ } else { - float scaleValue = scale / baseScale; - - csVector3 vel = drmsg.vel/scaleValue; - csVector3 worldVel = drmsg.worldVel/scaleValue; - // Force hard DR update on sector change, low speed, or large delta pos if(drmsg.sector != cur_sector || (drmsg.vel < 0.1f) || (csSquaredDist::PointPoint(cur_pos,drmsg.pos) > 25.0f)) { // Do hard DR when it would make you slide - linmove->SetDRData(drmsg.on_ground,drmsg.pos,drmsg.yrot,drmsg.sector,vel,worldVel,drmsg.ang_vel); + linmove->SetDRData(drmsg.on_ground,drmsg.pos,drmsg.yrot,drmsg.sector,drmsg.vel,drmsg.worldVel,drmsg.ang_vel); } else { // Do soft DR when moving - linmove->SetSoftDRData(drmsg.on_ground,drmsg.pos,drmsg.yrot,drmsg.sector,vel,worldVel,drmsg.ang_vel); + linmove->SetSoftDRData(drmsg.on_ground,drmsg.pos,drmsg.yrot,drmsg.sector,drmsg.vel,drmsg.worldVel,drmsg.ang_vel); } DRcounter = drmsg.counter; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2015-01-14 18:18:24
|
Revision: 9698 http://sourceforge.net/p/planeshift/code/9698 Author: joelyon Date: 2015-01-14 18:18:21 +0000 (Wed, 14 Jan 2015) Log Message: ----------- Enio's fix for PS#6619 - Animation When Casting Magic Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2015-01-12 08:05:44 UTC (rev 9697) +++ trunk/src/client/pscelclient.cpp 2015-01-14 18:18:21 UTC (rev 9698) @@ -2039,6 +2039,8 @@ SetIdleAnimation(psengine->GetCharControl()->GetMovementManager()->GetModeIdleAnim(movementMode)); break; case psModeMessage::SPELL_CASTING: + cal3dstate->SetAnimAction("cast", 0.0f, 1.0f); + break; case psModeMessage::PLAY: case psModeMessage::WALK: case psModeMessage::RUN: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rav...@us...> - 2016-05-29 22:51:08
|
Revision: 9942 http://sourceforge.net/p/planeshift/code/9942 Author: ravna-ps Date: 2016-05-29 22:51:06 +0000 (Sun, 29 May 2016) Log Message: ----------- Fixed a bug where action locations triggering a world object to move did not move the object anymore after leaving and rejoining the sector after using them. Modified Paths: -------------- trunk/src/client/pscelclient.cpp Modified: trunk/src/client/pscelclient.cpp =================================================================== --- trunk/src/client/pscelclient.cpp 2016-05-27 23:05:31 UTC (rev 9941) +++ trunk/src/client/pscelclient.cpp 2016-05-29 22:51:06 UTC (rev 9942) @@ -690,9 +690,19 @@ { // name of the sequence needs to be unique csString sequenceName = msg.meshName.Append(msg.move).Append(msg.rot); + + csRef<iEngineSequenceManager> sequenceMngr = csQueryRegistryOrLoad<iEngineSequenceManager> (object_reg,"crystalspace.utilities.sequence.engine", false); + + // check if this sequence was previously executed, if it is, remove it, since it can point to objects that now have a different ID (rejoining a map does that). + csRef<iSequenceWrapper> sequence = sequenceMngr->FindSequenceByName(sequenceName); + if (sequence.IsValid()) + { + sequenceMngr->RemoveSequence(sequence); + sequence.Invalidate(); + } + // creates a sequence to move/rotate the object - csRef<iEngineSequenceManager> sequenceMngr = csQueryRegistryOrLoad<iEngineSequenceManager> (object_reg,"crystalspace.utilities.sequence.engine", false); - csRef<iSequenceWrapper> sequence = sequenceMngr->CreateSequence(sequenceName); + sequence = sequenceMngr->CreateSequence(sequenceName); csRef<iParameterESM> meshParam = sequenceMngr->CreateParameterESM(objectWrapper); const int ANIM_DURATION = 5000; // move the object This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |