From: <the...@us...> - 2006-09-09 12:24:23
|
Revision: 25317 http://svn.sourceforge.net/crystal/?rev=25317&view=rev Author: thebolt00 Date: 2006-09-09 05:23:22 -0700 (Sat, 09 Sep 2006) Log Message: ----------- - Marten changed particles to have a transform-mode instead of just a boolean localmode. This makes it possible to have world-space particles with local space emitter. Modified Paths: -------------- CS/trunk/configure.ac CS/trunk/data/flarge/world CS/trunk/docs/history.txt CS/trunk/docs/texinfo/usingcs/meshobj/particles.txi CS/trunk/include/imesh/particles.h CS/trunk/plugins/mesh/particles/object/builtinemitters.cpp CS/trunk/plugins/mesh/particles/object/builtinemitters.h CS/trunk/plugins/mesh/particles/object/particles.cpp CS/trunk/plugins/mesh/particles/object/particles.h CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.cpp CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.h CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.tok Modified: CS/trunk/configure.ac =================================================================== --- CS/trunk/configure.ac 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/configure.ac 2006-09-09 12:23:22 UTC (rev 25317) @@ -22,7 +22,7 @@ AC_INIT([crystalspace], [cs_version_number], [cry...@li...]) CS_PACKAGEINFO([Crystal Space], - [Copyright (C)1998-2005 Jorrit Tyberghein and others], + [Copyright (C)1998-2006 Jorrit Tyberghein and others], [http://www.crystalspace3d.org/]) AC_CONFIG_SRCDIR([libs/Jamfile]) AC_CONFIG_AUX_DIR([mk/autoconf]) Modified: CS/trunk/data/flarge/world =================================================================== --- CS/trunk/data/flarge/world 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/data/flarge/world 2006-09-09 12:23:22 UTC (rev 25317) @@ -15836,7 +15836,7 @@ <factory>particlesFactory</factory> <material>spark</material> <particlesize x="0.025" y="0.025" /> - <localmode/> + <transformmode>local</transformmode> <mixmode> <add /> </mixmode> @@ -16100,7 +16100,7 @@ <factory>particlesFactory</factory> <material>spark</material> <particlesize x="0.05" y="0.05" /> - <localmode /> + <transformmode>local</transformmode> <mixmode> <add /> </mixmode> @@ -16188,7 +16188,7 @@ <params> <factory>particlesFactory</factory> <material>raindrop</material> - <localmode /> + <transformmode>local</transformmode> <particlesize x="0.02" y="0.04" /> <commondirection x="0" y="1" z="0" /> <!-- <renderorientation>common approx</renderorientation> --> Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/docs/history.txt 2006-09-09 12:23:22 UTC (rev 25317) @@ -6,6 +6,10 @@ individual changes for each given day, however, are in normal (ascending) chronological order. +9-Sep-2006 + - Marten changed particles to have a transform-mode instead of just + a boolean localmode. This makes it possible to have world-space + particles with local space emitter. 8-Sep-2006 - res added tests for some more GL types. - caedes updated cspace.i for the new particles. Modified: CS/trunk/docs/texinfo/usingcs/meshobj/particles.txi =================================================================== --- CS/trunk/docs/texinfo/usingcs/meshobj/particles.txi 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/docs/texinfo/usingcs/meshobj/particles.txi 2006-09-09 12:23:22 UTC (rev 25317) @@ -106,10 +106,9 @@ @item <commondirection x="" y="" z="" /> Set common direction. Common direction is used as a reference direction for billboard setup for a few particle billboard orientations. -@item <localmode>yes/no</localmode> -Set if particle system should be in local or global mode. In local mode the -positions of emitters and particles are relative to the particles mesh, while -in global mode they are world space. +@item <transformmode>tmode</transformmode> +Set the transform mode of the particle system and thereby the coordinate systems +used. Valid values are @samp{local}, @samp{localemitter}, @samp{world}. @item <individualsize>yes/no</individualsize> Determin if particle rendering should use the individual size associated with each particle, or if the global <particlesize> property should be used. Modified: CS/trunk/include/imesh/particles.h =================================================================== --- CS/trunk/include/imesh/particles.h 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/include/imesh/particles.h 2006-09-09 12:23:22 UTC (rev 25317) @@ -137,6 +137,33 @@ }; /** + * Particle transformation mode. + * Controls how and when particles are transformed, and thereby also controls + * the coordinate system for particles, emitters and effectors. + */ +enum csParticleTransformMode +{ + /** + * Fully local mode. + * All positions and coordinates are relative to particle system. + */ + CS_PARTICLE_LOCAL_MODE, + /** + * Mixed coordinate mode. + * Particle position and effectors are specified in world space, while + * emitters operate in local mode. + * \warning Do note that this mode will introduce extra overhead compared + * to the other two modes and use only when neccesary. + */ + CS_PARTICLE_LOCAL_EMITTER, + /** + * Fully global mode. + * All coordinates are in world space (absolute space). + */ + CS_PARTICLE_WORLD_MODE +}; + +/** * Data representation of a single particle. */ struct csParticle @@ -310,7 +337,8 @@ * Spawn new particles. */ virtual void EmitParticles (iParticleSystemBase* system, - const csParticleBuffer& particleBuffer, float dt, float totalTime) = 0; + const csParticleBuffer& particleBuffer, float dt, float totalTime, + const csReversibleTransform* const emitterToParticle = 0) = 0; }; @@ -376,21 +404,11 @@ /// Get the common direction virtual const csVector3& GetCommonDirection () const = 0; - /** - * Set if particle system should be in local transform mode. - * - * When a particle system is in local transform mode all positions and - * orientations, including emitters, effectors and common directory, - * will be relative to the particle system. This is useful for particle - * effects that should follow another entity around. - * - * The opposite to local mode is global mode, where all coordinates will be - * in world coordinates. - */ - virtual void SetLocalMode (bool local) = 0; + /// Set transform mode + virtual void SetTransformMode (csParticleTransformMode mode) = 0; - /// Get local mode - virtual bool GetLocalMode () const = 0; + /// Get transform mode + virtual csParticleTransformMode GetTransformMode () const = 0; /// Set if particles should use specified or their own size virtual void SetUseIndividualSize (bool individual) = 0; Modified: CS/trunk/plugins/mesh/particles/object/builtinemitters.cpp =================================================================== --- CS/trunk/plugins/mesh/particles/object/builtinemitters.cpp 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/plugins/mesh/particles/object/builtinemitters.cpp 2006-09-09 12:23:22 UTC (rev 25317) @@ -18,6 +18,7 @@ #include "cssysdef.h" +#include "csgeom/transfrm.h" #include "csutil/scf.h" #include "csutil/floatrand.h" #include "csutil/randomgen.h" @@ -29,7 +30,6 @@ // General random number generators CS_IMPLEMENT_STATIC_VAR(GetVGen, csRandomVectorGen,); CS_IMPLEMENT_STATIC_VAR(GetFGen, csRandomFloatGen,); - //CS_IMPLEMENT_STATIC_VAR(GetIGen, csRandomGen,); /** * Small helper-function to calculate x^(1/3) using Newton iteration. @@ -87,16 +87,20 @@ void ParticleEmitterSphere::EmitParticles (iParticleSystemBase* system, - const csParticleBuffer& particleBuffer, float dt, float totalTime) + const csParticleBuffer& particleBuffer, float dt, float totalTime, + const csReversibleTransform* const emitterToParticle) { const csVector2& size = system->GetParticleSize (); + const csVector3 center = (emitterToParticle ? emitterToParticle->GetOrigin() : + csVector3 (0.0f)) + position; + for (size_t idx = 0; idx < particleBuffer.particleCount; ++idx) { csParticle& particle = particleBuffer.particleData[idx]; csParticleAux& particleAux = particleBuffer.particleAuxData[idx]; - particle.position = position; + particle.position = center; particle.orientation.SetIdentity (); csVector3 posOffset = GetVGen()->Get (); @@ -143,13 +147,23 @@ void ParticleEmitterBox::EmitParticles (iParticleSystemBase* system, - const csParticleBuffer& particleBuffer, float dt, float totalTime) + const csParticleBuffer& particleBuffer, float dt, float totalTime, + const csReversibleTransform* const emitterToParticle) { const csVector2& size = system->GetParticleSize (); const csVector3& boxSize = genBox.GetSize (); csVector3 globalPos = position + genBox.GetCenter (); + csMatrix3 mat = genBox.GetMatrix (); + const csReversibleTransform& e2p = emitterToParticle ? *emitterToParticle : + csReversibleTransform (); + if (emitterToParticle) + { + globalPos = emitterToParticle->This2Other (globalPos); + mat = emitterToParticle->GetT2O () * mat; + } + for (size_t idx = 0; idx < particleBuffer.particleCount; ++idx) { csParticle& particle = particleBuffer.particleData[idx]; @@ -161,8 +175,6 @@ csVector3 posOffset (0.0f); csVector3 velVector; - const csMatrix3& mat = genBox.GetMatrix (); - if (placement == CS_PARTICLE_BUILTIN_VOLUME) { posOffset.x = (GetFGen ()->Get (-1, 1) * boxSize.x); @@ -189,14 +201,14 @@ if (uniformVelocity) { - particle.linearVelocity = initialLinearVelocity; + particle.linearVelocity = e2p.This2OtherRelative (initialLinearVelocity); } else { particle.linearVelocity = mat * (posOffset.UnitAxisClamped () * initialVelocityMag); } - particle.angularVelocity = initialAngularVelocity; + particle.angularVelocity = e2p.This2OtherRelative (initialAngularVelocity); particle.timeToLive = GetFGen ()->Get (initialTTLMin, initialTTLMax); particle.mass = GetFGen ()->Get (initialMassMin, initialMassMax); @@ -231,10 +243,28 @@ } void ParticleEmitterCylinder::EmitParticles (iParticleSystemBase* system, - const csParticleBuffer& particleBuffer, float dt, float totalTime) + const csParticleBuffer& particleBuffer, float dt, float totalTime, + const csReversibleTransform* const emitterToParticle) { const csVector2& size = system->GetParticleSize (); + const csReversibleTransform& e2p = emitterToParticle ? *emitterToParticle : + csReversibleTransform (); + csVector3 ext, n0, n1, center (0); + if (emitterToParticle) + { + ext = emitterToParticle->This2OtherRelative (extent); + n0 = emitterToParticle->This2OtherRelative (normal0); + n1 = emitterToParticle->This2OtherRelative (normal1); + center = emitterToParticle->GetOrigin (); + } + else + { + ext = extent; + n0 = normal0; + n1 = normal1; + } + for (size_t idx = 0; idx < particleBuffer.particleCount; ++idx) { csParticle& particle = particleBuffer.particleData[idx]; @@ -244,13 +274,13 @@ particle.orientation.SetIdentity (); //Offset along axis - csVector3 posOffset = GetFGen ()->Get (-1, 1) * extent; + csVector3 posOffset = GetFGen ()->Get (-1, 1) * ext + center; //Point along circle float phi = GetFGen ()->GetAngle (); csVector2 circlePoint (cosf (phi), sinf (phi)); - csVector3 radialVec = normal0 * circlePoint.x + normal1 * circlePoint.y; + csVector3 radialVec = n0 * circlePoint.x + n1 * circlePoint.y; if (placement == CS_PARTICLE_BUILTIN_VOLUME) { @@ -265,14 +295,14 @@ if (uniformVelocity) { - particle.linearVelocity = initialLinearVelocity; + particle.linearVelocity = e2p.This2OtherRelative (initialLinearVelocity); } else { particle.linearVelocity = radialVec * initialVelocityMag; } - particle.angularVelocity = initialAngularVelocity; + particle.angularVelocity = e2p.This2OtherRelative (initialAngularVelocity); particle.timeToLive = GetFGen ()->Get (initialTTLMin, initialTTLMax); particle.mass = GetFGen ()->Get (initialMassMin, initialMassMax); @@ -307,10 +337,14 @@ } void ParticleEmitterCone::EmitParticles (iParticleSystemBase* system, - const csParticleBuffer& particleBuffer, float dt, float totalTime) + const csParticleBuffer& particleBuffer, float dt, float totalTime, + const csReversibleTransform* const emitterToParticle) { const csVector2& size = system->GetParticleSize (); + const csReversibleTransform& e2p = emitterToParticle ? *emitterToParticle : + csReversibleTransform (); + const float tanConeAngTimeExt = tanf (coneAngle) * extent.Norm (); for (size_t idx = 0; idx < particleBuffer.particleCount; ++idx) @@ -358,6 +392,11 @@ particleAux.color = csColor4 (1.0f, 1.0f, 1.0f); particleAux.particleSize = size; + + // Transform + particle.position = e2p.This2Other (particle.position); + particle.linearVelocity = e2p.This2OtherRelative (particle.linearVelocity); + particle.angularVelocity = e2p.This2OtherRelative (particle.angularVelocity); } } Modified: CS/trunk/plugins/mesh/particles/object/builtinemitters.h =================================================================== --- CS/trunk/plugins/mesh/particles/object/builtinemitters.h 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/plugins/mesh/particles/object/builtinemitters.h 2006-09-09 12:23:22 UTC (rev 25317) @@ -256,7 +256,8 @@ virtual csPtr<iParticleEmitter> Clone () const; virtual void EmitParticles (iParticleSystemBase* system, - const csParticleBuffer& particleBuffer, float dt, float totalTime); + const csParticleBuffer& particleBuffer, float dt, float totalTime, + const csReversibleTransform* const emitterToParticle); //-- iParticleBuiltinEmitterSphere virtual void SetRadius (float radius) @@ -284,7 +285,8 @@ virtual csPtr<iParticleEmitter> Clone () const; virtual void EmitParticles (iParticleSystemBase* system, - const csParticleBuffer& particleBuffer, float dt, float totalTime); + const csParticleBuffer& particleBuffer, float dt, float totalTime, + const csReversibleTransform* const emitterToParticle); //-- iParticleBuiltinEmitterBox @@ -313,7 +315,8 @@ virtual csPtr<iParticleEmitter> Clone () const; virtual void EmitParticles (iParticleSystemBase* system, - const csParticleBuffer& particleBuffer, float dt, float totalTime); + const csParticleBuffer& particleBuffer, float dt, float totalTime, + const csReversibleTransform* const emitterToParticle); //-- iParticleBuiltinEmitterCylinder virtual void SetRadius (float radius) @@ -350,7 +353,8 @@ virtual csPtr<iParticleEmitter> Clone () const; virtual void EmitParticles (iParticleSystemBase* system, - const csParticleBuffer& particleBuffer, float dt, float totalTime); + const csParticleBuffer& particleBuffer, float dt, float totalTime, + const csReversibleTransform* const emitterToParticle); //-- iParticleBuiltinEmitterCone virtual void SetExtent (const csVector3& extent); Modified: CS/trunk/plugins/mesh/particles/object/particles.cpp =================================================================== --- CS/trunk/plugins/mesh/particles/object/particles.cpp 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/plugins/mesh/particles/object/particles.cpp 2006-09-09 12:23:22 UTC (rev 25317) @@ -31,6 +31,7 @@ #include "iengine/material.h" #include "iengine/camera.h" #include "iengine/rview.h" +#include "iengine/mesh.h" #include "iengine/movable.h" #include "ivideo/graph3d.h" #include "ivideo/rendermesh.h" @@ -71,9 +72,9 @@ materialWrapper (0), mixMode (0), deepCreation (false), particleOrientation (CS_PARTICLE_CAMERAFACE_APPROX), rotationMode (CS_PARTICLE_ROTATE_NONE), sortMode (CS_PARTICLE_SORT_NONE), - integrationMode (CS_PARTICLE_INTEGRATE_LINEAR), - commonDirection (1.0f,0,0), - localMode (true), individualSize (false), particleSize (1.0f) + integrationMode (CS_PARTICLE_INTEGRATE_LINEAR), + transformMode (CS_PARTICLE_LOCAL_MODE), + commonDirection (1.0f,0,0), individualSize (false), particleSize (1.0f) { } @@ -93,8 +94,8 @@ mesh->rotationMode = rotationMode; mesh->sortMode = sortMode; mesh->integrationMode = integrationMode; + mesh->transformMode = transformMode; mesh->commonDirection = commonDirection; - mesh->localMode = localMode; mesh->individualSize = individualSize; mesh->particleSize = particleSize; mesh->minBB = minBB; @@ -137,7 +138,7 @@ newFact->sortMode = sortMode; newFact->integrationMode = integrationMode; newFact->commonDirection = commonDirection; - newFact->localMode = localMode; + newFact->transformMode = transformMode; newFact->individualSize = individualSize; newFact->particleSize = particleSize; newFact->minBB = minBB; @@ -177,8 +178,8 @@ externalControl (false), particleOrientation (CS_PARTICLE_CAMERAFACE_APPROX), rotationMode (CS_PARTICLE_ROTATE_NONE), integrationMode (CS_PARTICLE_INTEGRATE_LINEAR), - sortMode (CS_PARTICLE_SORT_NONE), commonDirection (1.0f,0,0), localMode (true), - individualSize (false), particleSize (1.0f) + sortMode (CS_PARTICLE_SORT_NONE), transformMode (CS_PARTICLE_LOCAL_MODE), + commonDirection (1.0f,0,0), individualSize (false), particleSize (1.0f) { particleBuffer.particleCount = 0; } @@ -488,7 +489,7 @@ iCamera* camera = rview->GetCamera (); csReversibleTransform obj2world; - if(localMode) + if (transformMode == CS_PARTICLE_LOCAL_MODE) obj2world = movable->GetFullTransform (); csReversibleTransform obj2cam = camera->GetTransform () / obj2world; @@ -537,7 +538,7 @@ return; if (lastFrameNumber == 0 || - lastFrameNumber + 1 < currentFrame) + lastUpdateTime == current_time) { lastFrameNumber = currentFrame; lastUpdateTime = current_time; @@ -548,6 +549,9 @@ currentDt = current_time - lastUpdateTime; lastUpdateTime = current_time; + // Some artificial limiting of dt + if (currentDt > 500) currentDt = 500; + float dt = currentDt/1000.0f; totalParticleTime += dt; @@ -578,6 +582,9 @@ } // Apply emitters + csReversibleTransform t = meshWrapper->GetMovable ()->GetFullTransform (); + csReversibleTransform* tptr = transformMode == CS_PARTICLE_LOCAL_EMITTER ? + &t : 0; for (size_t idx = 0; idx < emitters.GetSize (); ++idx) { iParticleEmitter* emitter = emitters[idx]; @@ -592,7 +599,7 @@ tmpBuf.particleData = particleBuffer.particleData + particleBuffer.particleCount; tmpBuf.particleAuxData = particleBuffer.particleAuxData + particleBuffer.particleCount; - emitter->EmitParticles (this, tmpBuf, dt, totalParticleTime); + emitter->EmitParticles (this, tmpBuf, dt, totalParticleTime, tptr); particleBuffer.particleCount += numParticles; } Modified: CS/trunk/plugins/mesh/particles/object/particles.h =================================================================== --- CS/trunk/plugins/mesh/particles/object/particles.h 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/plugins/mesh/particles/object/particles.h 2006-09-09 12:23:22 UTC (rev 25317) @@ -197,14 +197,14 @@ return commonDirection; } - virtual void SetLocalMode (bool local) + virtual void SetTransformMode (csParticleTransformMode mode) { - localMode = local; + transformMode = mode; } - virtual bool GetLocalMode () const + virtual csParticleTransformMode GetTransformMode () const { - return localMode; + return transformMode; } virtual void SetUseIndividualSize (bool individual) @@ -294,8 +294,8 @@ csParticleRotationMode rotationMode; csParticleSortMode sortMode; csParticleIntegrationMode integrationMode; + csParticleTransformMode transformMode; csVector3 commonDirection; - bool localMode; bool individualSize; csVector2 particleSize; csBox3 minBB; @@ -479,6 +479,7 @@ virtual void SetParticleRenderOrientation (csParticleRenderOrientation o) { particleOrientation = o; + InvalidateVertexSetup (); } virtual csParticleRenderOrientation GetParticleRenderOrientation () const @@ -489,6 +490,7 @@ virtual void SetRotationMode (csParticleRotationMode mode) { rotationMode = mode; + InvalidateVertexSetup (); } virtual csParticleRotationMode GetRotationMode () const @@ -499,6 +501,7 @@ virtual void SetSortMode (csParticleSortMode mode) { sortMode = mode; + InvalidateVertexSetup (); } virtual csParticleSortMode GetSortMode () const @@ -519,6 +522,7 @@ virtual void SetCommonDirection (const csVector3& direction) { commonDirection = direction; + InvalidateVertexSetup (); } virtual const csVector3& GetCommonDirection () const @@ -526,15 +530,14 @@ return commonDirection; } - - virtual void SetLocalMode (bool local) + virtual void SetTransformMode (csParticleTransformMode mode) { - localMode = local; + transformMode = mode; } - virtual bool GetLocalMode () const + virtual csParticleTransformMode GetTransformMode () const { - return localMode; + return transformMode; } virtual void SetUseIndividualSize (bool individual) @@ -551,6 +554,7 @@ virtual void SetParticleSize (const csVector2& size) { particleSize = size; + InvalidateVertexSetup (); } virtual const csVector2& GetParticleSize () const @@ -650,6 +654,7 @@ csParticleRotationMode rotationMode; csParticleIntegrationMode integrationMode; csParticleSortMode sortMode; + csParticleTransformMode transformMode; csVector3 commonDirection; bool localMode; bool individualSize; Modified: CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.cpp =================================================================== --- CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.cpp 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.cpp 2006-09-09 12:23:22 UTC (rev 25317) @@ -171,14 +171,25 @@ baseObject->SetCommonDirection (dir); } break; - case XMLTOKEN_LOCALMODE: + case XMLTOKEN_TRANSFORMMODE: { - bool local; - if (!synldr->ParseBool (node, local, true)) + const char* transm = node->GetContentsValue (); + csParticleTransformMode m = CS_PARTICLE_LOCAL_MODE; + + if (!strcasecmp (transm, "local")) + m = CS_PARTICLE_LOCAL_MODE; + else if (!strcasecmp (transm, "localemitter")) + m = CS_PARTICLE_LOCAL_EMITTER; + else if (!strcasecmp (transm, "world")) + m = CS_PARTICLE_WORLD_MODE; + else { + synldr->ReportError ("crystalspace.particleloader.parsebase", node, + "Unknown transform mode (%s)!", transm); return false; } - baseObject->SetLocalMode (local); + + baseObject->SetTransformMode (m); } break; case XMLTOKEN_INDIVIDUALSIZE: @@ -871,6 +882,32 @@ return true; } + bool ParticlesBaseSaver::WriteTransform(iDocumentNode *paramsNode, + csParticleTransformMode mode) + { + csRef<iDocumentNode> transMode = paramsNode->CreateNodeBefore ( + CS_NODE_ELEMENT, 0); + transMode->SetValue ("transformmode"); + csRef<iDocumentNode> valueNode = transMode->CreateNodeBefore (CS_NODE_TEXT, 0); + + switch (mode) + { + case CS_PARTICLE_LOCAL_MODE: + valueNode->SetValue ("local"); + break; + case CS_PARTICLE_LOCAL_EMITTER: + valueNode->SetValue ("localemitter"); + break; + case CS_PARTICLE_WORLD_MODE: + valueNode->SetValue ("world"); + break; + default: + valueNode->SetValue ("local"); + } + + return true; + } + bool ParticlesBaseSaver::WriteEmitter(iDocumentNode *paramsNode, iParticleEmitter *emitter) { @@ -1141,6 +1178,8 @@ //Integration mode WriteIntegration (paramsNode, partFact->GetIntegrationMode ()); + //Transform mode + WriteTransform (paramsNode, partFact->GetTransformMode ()); //Common direction csRef<iDocumentNode> comdirNode = paramsNode->CreateNodeBefore ( @@ -1148,9 +1187,6 @@ comdirNode->SetValue ("commondirection"); synldr->WriteVector (comdirNode, partFact->GetCommonDirection ()); - //Local mode - synldr->WriteBool (paramsNode, "localmode", partFact->GetLocalMode ()); - //Individual size synldr->WriteBool (paramsNode, "individualsize", partFact->GetUseIndividualSize ()); @@ -1234,6 +1270,9 @@ if (factObj->GetIntegrationMode () != partObj->GetIntegrationMode ()) WriteIntegration (paramsNode, partObj->GetIntegrationMode ()); + //Transform mode + if (factObj->GetTransformMode () != partObj->GetTransformMode ()) + WriteTransform (paramsNode, partObj->GetTransformMode ()); //Common direction csVector3 commonDir = partObj->GetCommonDirection (); @@ -1246,10 +1285,6 @@ synldr->WriteVector (comdirNode, commonDir); } - //Local mode - if (factObj->GetLocalMode () != partObj->GetLocalMode ()) - synldr->WriteBool (paramsNode, "localmode", partObj->GetLocalMode ()); - //Individual size if (factObj->GetUseIndividualSize () != partObj->GetUseIndividualSize ()) synldr->WriteBool (paramsNode, "individualsize", Modified: CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.h =================================================================== --- CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.h 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.h 2006-09-09 12:23:22 UTC (rev 25317) @@ -118,6 +118,9 @@ bool WriteIntegration (iDocumentNode* paramsNode, csParticleIntegrationMode integ); + bool WriteTransform (iDocumentNode* paramsNode, + csParticleTransformMode mode); + bool WriteEmitter (iDocumentNode* paramsNode, iParticleEmitter* emitter); Modified: CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.tok =================================================================== --- CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.tok 2006-09-09 00:28:33 UTC (rev 25316) +++ CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.tok 2006-09-09 12:23:22 UTC (rev 25317) @@ -8,7 +8,7 @@ CS_TOKEN_LIST_TOKEN(SORTMODE) CS_TOKEN_LIST_TOKEN(INTEGRATIONMODE) CS_TOKEN_LIST_TOKEN(COMMONDIRECTION) -CS_TOKEN_LIST_TOKEN(LOCALMODE) +CS_TOKEN_LIST_TOKEN(TRANSFORMMODE) CS_TOKEN_LIST_TOKEN(INDIVIDUALSIZE) CS_TOKEN_LIST_TOKEN(PARTICLESIZE) CS_TOKEN_LIST_TOKEN(EMITTER) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cry...@us...> - 2006-09-10 00:30:04
|
Revision: 25318 http://svn.sourceforge.net/crystal/?rev=25318&view=rev Author: crystal-manage Date: 2006-09-09 17:27:47 -0700 (Sat, 09 Sep 2006) Log Message: ----------- master header files: Automated master header file repair. Visual-C++ project files: Automated Visual-C++ project file repair. Texinfo files: Automated Texinfo @node and @menu repair. Swig Python files: Automated Swig Python file repair. Swig Perl5 files: Automated Swig Perl5 file repair. User's Manual: Automated Texinfo to HTML conversion. Modified Paths: -------------- CS/trunk/docs/html/manual/cs_4.9.24.html CS/trunk/mk/msvc/app3ds2lev.rc CS/trunk/mk/msvc/appawstest.rc CS/trunk/mk/msvc/appawstut.rc CS/trunk/mk/msvc/appceguitest.rc CS/trunk/mk/msvc/appconsoletest.rc CS/trunk/mk/msvc/appcsbench.rc CS/trunk/mk/msvc/appcsdemo.rc CS/trunk/mk/msvc/appcsfgen.rc CS/trunk/mk/msvc/appcslight.rc CS/trunk/mk/msvc/appdocconv.rc CS/trunk/mk/msvc/appeventtest.rc CS/trunk/mk/msvc/appg2dtest.rc CS/trunk/mk/msvc/appgenmeshify.rc CS/trunk/mk/msvc/appgfxtest.rc CS/trunk/mk/msvc/appheightmapgen.rc CS/trunk/mk/msvc/appisotest.rc CS/trunk/mk/msvc/appjoytest.rc CS/trunk/mk/msvc/applevtool.rc CS/trunk/mk/msvc/applghtngtest.rc CS/trunk/mk/msvc/applighter2.rc CS/trunk/mk/msvc/appmaya2spr.rc CS/trunk/mk/msvc/appmazing.rc CS/trunk/mk/msvc/appmd32spr.rc CS/trunk/mk/msvc/appmdl2spr.rc CS/trunk/mk/msvc/apppartconv.rc CS/trunk/mk/msvc/apppartedit.rc CS/trunk/mk/msvc/apppartedit2.rc CS/trunk/mk/msvc/apppathtut.rc CS/trunk/mk/msvc/appphystut.rc CS/trunk/mk/msvc/apppicview.rc CS/trunk/mk/msvc/apppysimp.rc CS/trunk/mk/msvc/appsimpcd.rc CS/trunk/mk/msvc/appsimple1.rc CS/trunk/mk/msvc/appsimple2.rc CS/trunk/mk/msvc/appsimplept.rc CS/trunk/mk/msvc/appsimpmap.rc CS/trunk/mk/msvc/appsimpvs.rc CS/trunk/mk/msvc/appsndtest.rc CS/trunk/mk/msvc/appstartme.rc CS/trunk/mk/msvc/appunittest.rc CS/trunk/mk/msvc/appviewmesh.rc CS/trunk/mk/msvc/appvsh.rc CS/trunk/mk/msvc/appvsh_static.rc CS/trunk/mk/msvc/appwalktest.rc CS/trunk/mk/msvc/appwalktest_static.rc CS/trunk/mk/msvc/appwaterdemo.rc CS/trunk/mk/msvc/appwxtest.rc CS/trunk/mk/msvc/plg_cspace.rc CS/trunk/mk/msvc/plgaws.rc CS/trunk/mk/msvc/plgaws2.rc CS/trunk/mk/msvc/plgbezier.rc CS/trunk/mk/msvc/plgbezierldr.rc CS/trunk/mk/msvc/plgbindoc.rc CS/trunk/mk/msvc/plgbruteblock.rc CS/trunk/mk/msvc/plgbugplug.rc CS/trunk/mk/msvc/plgbullet.rc CS/trunk/mk/msvc/plgcacacanvas.rc CS/trunk/mk/msvc/plgcegui.rc CS/trunk/mk/msvc/plgcsbmpimg.rc CS/trunk/mk/msvc/plgcsconin.rc CS/trunk/mk/msvc/plgcsconout.rc CS/trunk/mk/msvc/plgcscursor.rc CS/trunk/mk/msvc/plgcsddsimg.rc CS/trunk/mk/msvc/plgcsfont.rc CS/trunk/mk/msvc/plgcsgifimg.rc CS/trunk/mk/msvc/plgcsjngimg.rc CS/trunk/mk/msvc/plgcsjpgimg.rc CS/trunk/mk/msvc/plgcsopcode.rc CS/trunk/mk/msvc/plgcsparser.rc CS/trunk/mk/msvc/plgcspngimg.rc CS/trunk/mk/msvc/plgcspython.rc CS/trunk/mk/msvc/plgcssaver.rc CS/trunk/mk/msvc/plgcssynldr.rc CS/trunk/mk/msvc/plgcstgaimg.rc CS/trunk/mk/msvc/plgddraw2d.rc CS/trunk/mk/msvc/plgdsplex.rc CS/trunk/mk/msvc/plgdynavis.rc CS/trunk/mk/msvc/plgemit.rc CS/trunk/mk/msvc/plgemitldr.rc CS/trunk/mk/msvc/plgengine.rc CS/trunk/mk/msvc/plgengseq.rc CS/trunk/mk/msvc/plgexplo.rc CS/trunk/mk/msvc/plgexploldr.rc CS/trunk/mk/msvc/plgfancycon.rc CS/trunk/mk/msvc/plgfire.rc CS/trunk/mk/msvc/plgfireldr.rc CS/trunk/mk/msvc/plgfontplex.rc CS/trunk/mk/msvc/plgfountain.rc CS/trunk/mk/msvc/plgfountldr.rc CS/trunk/mk/msvc/plgfreefnt2.rc CS/trunk/mk/msvc/plgfrustvis.rc CS/trunk/mk/msvc/plggenmesh.rc CS/trunk/mk/msvc/plggl3d.rc CS/trunk/mk/msvc/plgglshader_arb.rc CS/trunk/mk/msvc/plgglshader_cg.rc CS/trunk/mk/msvc/plgglshader_fixed.rc CS/trunk/mk/msvc/plgglshader_ps1.rc CS/trunk/mk/msvc/plgglwin32.rc CS/trunk/mk/msvc/plggmesh3ds.rc CS/trunk/mk/msvc/plggmeshanim.rc CS/trunk/mk/msvc/plggmeshldr.rc CS/trunk/mk/msvc/plggmeshskelanim.rc CS/trunk/mk/msvc/plggmeshskelanim2.rc CS/trunk/mk/msvc/plghaze.rc CS/trunk/mk/msvc/plghazeldr.rc CS/trunk/mk/msvc/plgimgplex.rc CS/trunk/mk/msvc/plginstmesh.rc CS/trunk/mk/msvc/plginstmeshldr.rc CS/trunk/mk/msvc/plgjoywin.rc CS/trunk/mk/msvc/plglghtng.rc CS/trunk/mk/msvc/plglghtngldr.rc CS/trunk/mk/msvc/plgmemory2d.rc CS/trunk/mk/msvc/plgmovierecorder.rc CS/trunk/mk/msvc/plgnull2d.rc CS/trunk/mk/msvc/plgnull3d.rc CS/trunk/mk/msvc/plgnullmesh.rc CS/trunk/mk/msvc/plgnullmeshldr.rc CS/trunk/mk/msvc/plgodedynam.rc CS/trunk/mk/msvc/plgpagingformer.rc CS/trunk/mk/msvc/plgpagingformerldr.rc CS/trunk/mk/msvc/plgparticles.rc CS/trunk/mk/msvc/plgparticlesldr.rc CS/trunk/mk/msvc/plgphysldr.rc CS/trunk/mk/msvc/plgprotomesh.rc CS/trunk/mk/msvc/plgprotomeshldr.rc CS/trunk/mk/msvc/plgptanimimg.rc CS/trunk/mk/msvc/plgptpdlight.rc CS/trunk/mk/msvc/plgrain.rc CS/trunk/mk/msvc/plgrainldr.rc CS/trunk/mk/msvc/plgrendloop_loader.rc CS/trunk/mk/msvc/plgrendstep_fatrl.rc CS/trunk/mk/msvc/plgrendstep_std.rc CS/trunk/mk/msvc/plgrendstep_stencil.rc CS/trunk/mk/msvc/plgrendstep_stencil2.rc CS/trunk/mk/msvc/plgreporter.rc CS/trunk/mk/msvc/plgsequence.rc CS/trunk/mk/msvc/plgshadermgr.rc CS/trunk/mk/msvc/plgsimpleformer.rc CS/trunk/mk/msvc/plgsimpleformerldr.rc CS/trunk/mk/msvc/plgskeleton.rc CS/trunk/mk/msvc/plgskelldr.rc CS/trunk/mk/msvc/plgsndmanager.rc CS/trunk/mk/msvc/plgsndsyseventrecorder.rc CS/trunk/mk/msvc/plgsndsysloader.rc CS/trunk/mk/msvc/plgsndsysnull.rc CS/trunk/mk/msvc/plgsndsysogg.rc CS/trunk/mk/msvc/plgsndsyssoft.rc CS/trunk/mk/msvc/plgsndsyswav.rc CS/trunk/mk/msvc/plgsndsyswin.rc CS/trunk/mk/msvc/plgsnow.rc CS/trunk/mk/msvc/plgsnowldr.rc CS/trunk/mk/msvc/plgsoft3d.rc CS/trunk/mk/msvc/plgsoftshader.rc CS/trunk/mk/msvc/plgspiral.rc CS/trunk/mk/msvc/plgspirldr.rc CS/trunk/mk/msvc/plgspr2d.rc CS/trunk/mk/msvc/plgspr2dldr.rc CS/trunk/mk/msvc/plgspr3d.rc CS/trunk/mk/msvc/plgspr3dbin.rc CS/trunk/mk/msvc/plgspr3dldr.rc CS/trunk/mk/msvc/plgspr3md2.rc CS/trunk/mk/msvc/plgsprcal3d.rc CS/trunk/mk/msvc/plgsprcal3dldr.rc CS/trunk/mk/msvc/plgstdpt.rc CS/trunk/mk/msvc/plgstdrep.rc CS/trunk/mk/msvc/plgterrainldr.rc CS/trunk/mk/msvc/plgthing.rc CS/trunk/mk/msvc/plgthingldr.rc CS/trunk/mk/msvc/plgtlfunc.rc CS/trunk/mk/msvc/plgvfs.rc CS/trunk/mk/msvc/plgvproc_std.rc CS/trunk/mk/msvc/plgwxgl.rc CS/trunk/mk/msvc/plgxmlread.rc CS/trunk/mk/msvc/plgxmlshader.rc CS/trunk/mk/msvc/plgxmltiny.rc CS/trunk/plugins/cscript/cspython/cs_pyth.cpp CS/trunk/scripts/perl5/cspace.pm CS/trunk/scripts/perl5/cswigpl5.inc CS/trunk/scripts/python/cspace.py Modified: CS/trunk/docs/html/manual/cs_4.9.24.html =================================================================== --- CS/trunk/docs/html/manual/cs_4.9.24.html 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/docs/html/manual/cs_4.9.24.html 2006-09-10 00:27:47 UTC (rev 25318) @@ -168,10 +168,9 @@ <dd><p>Set common direction. Common direction is used as a reference direction for billboard setup for a few particle billboard orientations. </p></dd> -<dt> <code><localmode>yes/no</localmode></code> </dt> -<dd><p>Set if particle system should be in local or global mode. In local mode the -positions of emitters and particles are relative to the particles mesh, while -in global mode they are world space. +<dt> <code><transformmode>tmode</transformmode></code> </dt> +<dd><p>Set the transform mode of the particle system and thereby the coordinate systems +used. Valid values are <samp>`local'</samp>, <samp>`localemitter'</samp>, <samp>`world'</samp>. </p></dd> <dt> <code><individualsize>yes/no</individualsize></code> </dt> <dd><p>Determin if particle rendering should use the individual size associated with Modified: CS/trunk/mk/msvc/app3ds2lev.rc =================================================================== --- CS/trunk/mk/msvc/app3ds2lev.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/app3ds2lev.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "3DS to Crystal Space map converter" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appawstest.rc =================================================================== --- CS/trunk/mk/msvc/appawstest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appawstest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Alternate Windowing System test" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appawstut.rc =================================================================== --- CS/trunk/mk/msvc/appawstut.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appawstut.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Alternate Windowing System Tutorial" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appceguitest.rc =================================================================== --- CS/trunk/mk/msvc/appceguitest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appceguitest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "CEGUI Test Application" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appconsoletest.rc =================================================================== --- CS/trunk/mk/msvc/appconsoletest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appconsoletest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "console output tester" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appcsbench.rc =================================================================== --- CS/trunk/mk/msvc/appcsbench.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appcsbench.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Crystal Space benchmark" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appcsdemo.rc =================================================================== --- CS/trunk/mk/msvc/appcsdemo.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appcsdemo.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Demo" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appcsfgen.rc =================================================================== --- CS/trunk/mk/msvc/appcsfgen.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appcsfgen.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "TrueType to Crystal Space font converter" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appcslight.rc =================================================================== --- CS/trunk/mk/msvc/appcslight.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appcslight.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Lighting Calculator" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appdocconv.rc =================================================================== --- CS/trunk/mk/msvc/appdocconv.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appdocconv.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Document Converter" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appeventtest.rc =================================================================== --- CS/trunk/mk/msvc/appeventtest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appeventtest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "event tester" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appg2dtest.rc =================================================================== --- CS/trunk/mk/msvc/appg2dtest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appg2dtest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "canvas plugin test" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appgenmeshify.rc =================================================================== --- CS/trunk/mk/msvc/appgenmeshify.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appgenmeshify.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Thing-to-GenMesh converter" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appgfxtest.rc =================================================================== --- CS/trunk/mk/msvc/appgfxtest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appgfxtest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "image manipulator" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appheightmapgen.rc =================================================================== --- CS/trunk/mk/msvc/appheightmapgen.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appheightmapgen.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Convert object to heightmap" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appisotest.rc =================================================================== --- CS/trunk/mk/msvc/appisotest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appisotest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "isotest demo executable" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appjoytest.rc =================================================================== --- CS/trunk/mk/msvc/appjoytest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appjoytest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Joystick Test" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/applevtool.rc =================================================================== --- CS/trunk/mk/msvc/applevtool.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/applevtool.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Level Tool" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/applghtngtest.rc =================================================================== --- CS/trunk/mk/msvc/applghtngtest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/applghtngtest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Lightning Test" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/applighter2.rc =================================================================== --- CS/trunk/mk/msvc/applighter2.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/applighter2.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "New Renderer Lightmap Calculator, take 2" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appmaya2spr.rc =================================================================== --- CS/trunk/mk/msvc/appmaya2spr.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appmaya2spr.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Maya to CS Sprite convertor" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appmazing.rc =================================================================== --- CS/trunk/mk/msvc/appmazing.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appmazing.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "mazing tutorial" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appmd32spr.rc =================================================================== --- CS/trunk/mk/msvc/appmd32spr.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appmd32spr.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Quake MD3 conversion tool" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appmdl2spr.rc =================================================================== --- CS/trunk/mk/msvc/appmdl2spr.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appmdl2spr.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Quake model MDL conversion tool" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/apppartconv.rc =================================================================== --- CS/trunk/mk/msvc/apppartconv.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/apppartconv.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Particle system converter" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/apppartedit.rc =================================================================== --- CS/trunk/mk/msvc/apppartedit.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/apppartedit.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "particle system editor" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/apppartedit2.rc =================================================================== --- CS/trunk/mk/msvc/apppartedit2.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/apppartedit2.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "partedit2" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/apppathtut.rc =================================================================== --- CS/trunk/mk/msvc/apppathtut.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/apppathtut.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Path Tutorial" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appphystut.rc =================================================================== --- CS/trunk/mk/msvc/appphystut.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appphystut.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "physics tutorial" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/apppicview.rc =================================================================== --- CS/trunk/mk/msvc/apppicview.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/apppicview.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Picture Viewer" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/apppysimp.rc =================================================================== --- CS/trunk/mk/msvc/apppysimp.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/apppysimp.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Python example" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appsimpcd.rc =================================================================== --- CS/trunk/mk/msvc/appsimpcd.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appsimpcd.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "collision detection tutorial" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appsimple1.rc =================================================================== --- CS/trunk/mk/msvc/appsimple1.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appsimple1.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "tutorial part one" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appsimple2.rc =================================================================== --- CS/trunk/mk/msvc/appsimple2.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appsimple2.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "tutorial part two, sprite" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appsimplept.rc =================================================================== --- CS/trunk/mk/msvc/appsimplept.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appsimplept.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "procedural textures tutorial" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appsimpmap.rc =================================================================== --- CS/trunk/mk/msvc/appsimpmap.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appsimpmap.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "tutorial part three, map loading" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appsimpvs.rc =================================================================== --- CS/trunk/mk/msvc/appsimpvs.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appsimpvs.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "tutorial, video selector" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appsndtest.rc =================================================================== --- CS/trunk/mk/msvc/appsndtest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appsndtest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Sound test" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appstartme.rc =================================================================== --- CS/trunk/mk/msvc/appstartme.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appstartme.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Crystal Space demo launcher" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appunittest.rc =================================================================== --- CS/trunk/mk/msvc/appunittest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appunittest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "unittest tester" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appviewmesh.rc =================================================================== --- CS/trunk/mk/msvc/appviewmesh.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appviewmesh.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "mesh viewing utility" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appvsh.rc =================================================================== --- CS/trunk/mk/msvc/appvsh.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appvsh.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Virtual Shell tool" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appvsh_static.rc =================================================================== --- CS/trunk/mk/msvc/appvsh_static.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appvsh_static.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Virtual Shell tool (static build)" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appwalktest.rc =================================================================== --- CS/trunk/mk/msvc/appwalktest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appwalktest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "WalkTest demo" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appwalktest_static.rc =================================================================== --- CS/trunk/mk/msvc/appwalktest_static.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appwalktest_static.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "WalkTest demo (static build)" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appwaterdemo.rc =================================================================== --- CS/trunk/mk/msvc/appwaterdemo.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appwaterdemo.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "water surface shader demonstration" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/appwxtest.rc =================================================================== --- CS/trunk/mk/msvc/appwxtest.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/appwxtest.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "WxWidgets Canvas Test" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plg_cspace.rc =================================================================== --- CS/trunk/mk/msvc/plg_cspace.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plg_cspace.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "pure Python module" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgaws.rc =================================================================== --- CS/trunk/mk/msvc/plgaws.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgaws.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Alternate Windowing System plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgaws2.rc =================================================================== --- CS/trunk/mk/msvc/plgaws2.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgaws2.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Alternate Windowing System version 2 plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgbezier.rc =================================================================== --- CS/trunk/mk/msvc/plgbezier.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgbezier.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Bezier mesh object plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgbezierldr.rc =================================================================== --- CS/trunk/mk/msvc/plgbezierldr.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgbezierldr.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Bezier mesh object loader" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgbindoc.rc =================================================================== --- CS/trunk/mk/msvc/plgbindoc.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgbindoc.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "binary document system" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgbruteblock.rc =================================================================== --- CS/trunk/mk/msvc/plgbruteblock.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgbruteblock.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Brute Block Terrain plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgbugplug.rc =================================================================== --- CS/trunk/mk/msvc/plgbugplug.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgbugplug.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "debugging plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgbullet.rc =================================================================== --- CS/trunk/mk/msvc/plgbullet.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgbullet.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Bullet physics plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcacacanvas.rc =================================================================== --- CS/trunk/mk/msvc/plgcacacanvas.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcacacanvas.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Colour Ascii Art driver" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcegui.rc =================================================================== --- CS/trunk/mk/msvc/plgcegui.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcegui.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "CEGUI Wrapper Plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcsbmpimg.rc =================================================================== --- CS/trunk/mk/msvc/plgcsbmpimg.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcsbmpimg.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "bmp image loader" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcsconin.rc =================================================================== --- CS/trunk/mk/msvc/plgcsconin.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcsconin.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "standard input console" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcsconout.rc =================================================================== --- CS/trunk/mk/msvc/plgcsconout.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcsconout.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "standard output console" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcscursor.rc =================================================================== --- CS/trunk/mk/msvc/plgcscursor.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcscursor.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Custom cursor plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcsddsimg.rc =================================================================== --- CS/trunk/mk/msvc/plgcsddsimg.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcsddsimg.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "dds image loader" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcsfont.rc =================================================================== --- CS/trunk/mk/msvc/plgcsfont.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcsfont.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "default font server" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcsgifimg.rc =================================================================== --- CS/trunk/mk/msvc/plgcsgifimg.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcsgifimg.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "gif image loader" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcsjngimg.rc =================================================================== --- CS/trunk/mk/msvc/plgcsjngimg.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcsjngimg.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "jng image loader" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcsjpgimg.rc =================================================================== --- CS/trunk/mk/msvc/plgcsjpgimg.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcsjpgimg.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "jpg image loader" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcsopcode.rc =================================================================== --- CS/trunk/mk/msvc/plgcsopcode.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcsopcode.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "OPCODE collision detection plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcsparser.rc =================================================================== --- CS/trunk/mk/msvc/plgcsparser.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcsparser.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "map file parser" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcspngimg.rc =================================================================== --- CS/trunk/mk/msvc/plgcspngimg.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcspngimg.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "png image loader" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcspython.rc =================================================================== --- CS/trunk/mk/msvc/plgcspython.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcspython.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Python plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcssaver.rc =================================================================== --- CS/trunk/mk/msvc/plgcssaver.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcssaver.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "map file saver" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcssynldr.rc =================================================================== --- CS/trunk/mk/msvc/plgcssynldr.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcssynldr.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "format loader services" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgcstgaimg.rc =================================================================== --- CS/trunk/mk/msvc/plgcstgaimg.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgcstgaimg.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "tga image loader" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgddraw2d.rc =================================================================== --- CS/trunk/mk/msvc/plgddraw2d.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgddraw2d.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "DirectDraw 2D driver" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgdsplex.rc =================================================================== --- CS/trunk/mk/msvc/plgdsplex.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgdsplex.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "document system multiplexer" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgdynavis.rc =================================================================== --- CS/trunk/mk/msvc/plgdynavis.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgdynavis.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Dynamic Visibility System" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgemit.rc =================================================================== --- CS/trunk/mk/msvc/plgemit.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgemit.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "ProductName", "Crystal Space" VALUE "ProductVersion", "1.1" VALUE "FileVersion", "1.1" - VALUE "LegalCopyright", "Copyright (C)1998-2005 Jorrit Tyberghein and others" + VALUE "LegalCopyright", "Copyright (C)1998-2006 Jorrit Tyberghein and others" VALUE "FileDescription", "Emit mesh object plugin" #ifdef CS_DEBUG VALUE "Comments", "Debug build" Modified: CS/trunk/mk/msvc/plgemitldr.rc =================================================================== --- CS/trunk/mk/msvc/plgemitldr.rc 2006-09-09 12:23:22 UTC (rev 25317) +++ CS/trunk/mk/msvc/plgemitldr.rc 2006-09-10 00:27:47 UTC (rev 25318) @@ -16,7 +16,7 @@ VALUE "Pr... [truncated message content] |
From: <kir...@us...> - 2006-09-10 18:09:17
|
Revision: 25319 http://svn.sourceforge.net/crystal/?rev=25319&view=rev Author: kirchdorfer Date: 2006-09-10 11:08:55 -0700 (Sun, 10 Sep 2006) Log Message: ----------- Changing ViewMesh to use CEGUI and fixing a bug in csHash::Delete (const K& key, const T &value). Modified Paths: -------------- CS/trunk/apps/tools/viewmesh/Jamfile CS/trunk/apps/tools/viewmesh/viewmesh.cpp CS/trunk/apps/tools/viewmesh/viewmesh.h CS/trunk/docs/history.txt CS/trunk/include/csutil/hash.h Added Paths: ----------- CS/trunk/data/ceguitest/0.5/viewmesh.layout Removed Paths: ------------- CS/trunk/data/varia/viewmesh.def Modified: CS/trunk/apps/tools/viewmesh/Jamfile =================================================================== --- CS/trunk/apps/tools/viewmesh/Jamfile 2006-09-10 00:27:47 UTC (rev 25318) +++ CS/trunk/apps/tools/viewmesh/Jamfile 2006-09-10 18:08:55 UTC (rev 25319) @@ -1,12 +1,17 @@ SubDir TOP apps tools viewmesh ; -Description viewmesh : "mesh viewing utility" ; -Application viewmesh : [ Wildcard *.cpp *.h ] ; -LinkWith viewmesh : crystalspace ; -CFlags viewmesh : $(COMPILER.C++FLAGS.STRICTALIASING.DISABLE) ; -MsvcCFlags viewmesh : "/D CS_HAVE_CAL3D" ; -if $(CAL3D.AVAILABLE) = yes +if $(CEGUI.AVAILABLE) = "yes" { - CFlags viewmesh : [ FDefines CS_HAVE_CAL3D ] ; - ExternalLibs viewmesh : CAL3D ; + Description viewmesh : "mesh viewing utility" ; + Application viewmesh : [ Wildcard *.cpp *.h ] ; + LinkWith viewmesh : crystalspace ; + CFlags viewmesh : $(COMPILER.C++FLAGS.STRICTALIASING.DISABLE) ; + CFlags viewmesh : $(COMPILER.C++FLAGS.EXCEPTIONS.ENABLE) ; + MsvcCFlags viewmesh : "/D CS_HAVE_CAL3D" ; + ExternalLibs viewmesh : CEGUI ; + if $(CAL3D.AVAILABLE) = yes + { + CFlags viewmesh : [ FDefines CS_HAVE_CAL3D ] ; + ExternalLibs viewmesh : CEGUI CAL3D ; + } } Modified: CS/trunk/apps/tools/viewmesh/viewmesh.cpp =================================================================== --- CS/trunk/apps/tools/viewmesh/viewmesh.cpp 2006-09-10 00:27:47 UTC (rev 25318) +++ CS/trunk/apps/tools/viewmesh/viewmesh.cpp 2006-09-10 18:08:55 UTC (rev 25319) @@ -21,9 +21,16 @@ #include "viewmesh.h" #include "csutil/cscolor.h" +#include "csutil/common_handlers.h" +#include "csutil/event.h" #include "csutil/scfstr.h" +#include "imesh/object.h" +#include "imesh/thing.h" #include "iutil/eventq.h" +#include "iutil/object.h" +#include "iutil/stringarray.h" #include "iengine/scenenode.h" +#include "ivideo/graph2d.h" // Hack: work around problems caused by #defining 'new' #if defined(CS_EXTENSIVE_MEMDEBUG) || defined(CS_MEMORY_TRACKER) @@ -84,15 +91,6 @@ csTicks elapsed_time = vc->GetElapsedTicks (); float speed = (elapsed_time / 1000.0) * (0.06 * 20); - iGraphics2D* g2d = g3d->GetDriver2D (); - - if (g2d->GetHeight() != y || g2d->GetWidth() != x) - { - x = g2d->GetWidth(); - y = g2d->GetHeight(); - aws->SetupCanvas(0, g3d->GetDriver2D (), g3d); - } - iCamera* c = view->GetCamera(); if (!spritewrapper) camMode = movenormal; @@ -209,9 +207,7 @@ if (!g3d->BeginDraw (CSDRAW_2DGRAPHICS)) return; - aws->Redraw (); - aws->Print (g3d, 64); - + cegui->Render(); } void ViewMesh::FinishFrame () @@ -237,14 +233,6 @@ return false; } -bool ViewMesh::HandleEvent (iEvent &event) -{ - if (aws) - if (aws->HandleEvent (event)) - return true; - return csBaseEventHandler::HandleEvent(event);; -} - void ViewMesh::Help () { csPrintf ("Options for ViewMesh:\n"); @@ -347,7 +335,7 @@ CS_REQUEST_LEVELSAVER, CS_REQUEST_REPORTER, CS_REQUEST_REPORTERLISTENER, - CS_REQUEST_PLUGIN("crystalspace.window.alternatemanager", iAws), + CS_REQUEST_PLUGIN ("crystalspace.cegui.wrapper", iCEGUI), CS_REQUEST_END)) return ReportError("Failed to initialize plugins!"); @@ -389,8 +377,8 @@ saver = CS_QUERY_REGISTRY(GetObjectRegistry(), iSaver); if (!saver) return ReportError("Failed to locate Saver!"); - aws = CS_QUERY_REGISTRY(GetObjectRegistry(), iAws); - if (!aws) return ReportError("Failed to locate AWS!"); + cegui = CS_QUERY_REGISTRY(GetObjectRegistry(), iCEGUI); + if (!cegui) return ReportError("Failed to locate CEGUI plugin"); view.AttachNew(new csView (engine, g3d)); iGraphics2D* g2d = g3d->GetDriver2D (); @@ -451,83 +439,205 @@ ll->Add (light); } -void ViewMesh::CreateGui () +void ViewMesh::CreateGui() { - aws->SetupCanvas(0, g3d->GetDriver2D (), g3d); + // Initialize CEGUI wrapper + cegui->Initialize (); - iAwsSink* sink; + // Set the logging level + cegui->GetLoggerPtr ()->setLoggingLevel(CEGUI::Informative); - //GENERAL - sink = aws->GetSinkMgr ()->CreateSink ((intptr_t)this); - sink->RegisterTrigger ("CameraMode", &CameraMode); - sink->RegisterTrigger ("LoadButton", &LoadButton); - sink->RegisterTrigger ("LoadLibButton", &LoadLibButton); - sink->RegisterTrigger ("SaveButton", &SaveButton); - sink->RegisterTrigger ("SaveBinaryButton", &SaveBinaryButton); - sink->RegisterTrigger ("ScaleSprite", &SetScaleSprite); - aws->GetSinkMgr ()->RegisterSink ("General", sink); +#if (CEGUI_VERSION_MAJOR == 0) && (CEGUI_VERSION_MINOR >= 5) + // Use the 0.5 version of the skin + vfs->ChDir ("/ceguitest/0.5/"); +#else + // Use the old version of the skin + vfs->ChDir ("/ceguitest/"); +#endif - //ANIMATION - sink = aws->GetSinkMgr ()->CreateSink ((intptr_t)this); - sink->RegisterTrigger ("ReversAnimation", &ReversAnimation); - sink->RegisterTrigger ("StopAnimation", &StopAnimation); - sink->RegisterTrigger ("SlowerAnimation", &SlowerAnimation); - sink->RegisterTrigger ("AddAnimation", &AddAnimation); - sink->RegisterTrigger ("FasterAnimation", &FasterAnimation); - sink->RegisterTrigger ("SetAnimation", &SetAnimation); - sink->RegisterTrigger ("RemoveAnimation", &RemoveAnimation); - sink->RegisterTrigger ("ClearAnimation", &ClearAnimation); - sink->RegisterTrigger ("SelAnimation", &SelAnimation); - aws->GetSinkMgr ()->RegisterSink ("Anim", sink); + // Load the ice skin (which uses Falagard skinning system) + cegui->GetSchemeManagerPtr ()->loadScheme("ice.scheme"); - //SOCKET - sink = aws->GetSinkMgr ()->CreateSink ((intptr_t)this); - sink->RegisterTrigger ("SetMesh", &SetMesh); - sink->RegisterTrigger ("SetSubMesh", &SetSubMesh); - sink->RegisterTrigger ("SetTriangle", &SetTriangle); - sink->RegisterTrigger ("SetRotX", &SetRotX); - sink->RegisterTrigger ("SetRotY", &SetRotY); - sink->RegisterTrigger ("SetRotZ", &SetRotZ); - sink->RegisterTrigger ("AttachButton", &AttachButton); - sink->RegisterTrigger ("DetachButton", &DetachButton); - sink->RegisterTrigger ("AddSocket", &AddSocket); - sink->RegisterTrigger ("DelSocket", &DelSocket); - sink->RegisterTrigger ("SelSocket", &SelSocket); - sink->RegisterTrigger ("RenameSocket", &RenameSocket); - aws->GetSinkMgr ()->RegisterSink ("Socket", sink); + cegui->GetSystemPtr ()->setDefaultMouseCursor("ice", "MouseArrow"); - //SOCKET - sink = aws->GetSinkMgr ()->CreateSink ((intptr_t)this); - sink->RegisterTrigger ("SelMorph", &SelMorph); - sink->RegisterTrigger ("BlendButton", &BlendButton); - sink->RegisterTrigger ("ClearButton", &ClearButton); - aws->GetSinkMgr ()->RegisterSink ("Morph", sink); +#if (CEGUI_VERSION_MAJOR == 0) && (CEGUI_VERSION_MINOR >= 5) + CEGUI::Font* font = cegui->GetFontManagerPtr ()->createFont("FreeType", + "Vera", "/fonts/ttf/Vera.ttf"); + font->setProperty("PointSize", "10"); + font->load(); +#else + cegui->GetFontManagerPtr ()->createFont("Vera", "/fonts/ttf/Vera.ttf", 10, + CEGUI::Default); +#endif - //STDDLG - sink = aws->GetSinkMgr ()->CreateSink ((intptr_t)this); - sink->RegisterTrigger ("OkButton", &StdDlgOkButton); - sink->RegisterTrigger ("CancleButton", &StdDlgCancleButton); - sink->RegisterTrigger ("FileSelect", &StdDlgFileSelect); - sink->RegisterTrigger ("DirSelect", &StdDlgDirSelect); - aws->GetSinkMgr ()->RegisterSink ("StdDlg", sink); + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - if (!aws->GetPrefMgr()->Load ("/aws/windows_skin.def")) - ReportError("couldn't load skin definition file!"); - if (!aws->GetPrefMgr()->Load ("/varia/viewmesh.def")) - ReportError("couldn't load ViewMesh AWS definition file!"); - if (!aws->GetPrefMgr()->Load ("/aws/stddlg.def")) - ReportError("couldn't load Standard Dialog AWS definition file!"); - aws->GetPrefMgr ()->SelectDefaultSkin ("Windows"); + // Load layout and set as root + cegui->GetSystemPtr ()->setGUISheet(winMgr->loadWindowLayout("viewmesh.layout")); - form = aws->CreateWindowFrom ("Form1"); - stddlg = aws->CreateWindowFrom ("StdDlg"); - form->Show(); + form = winMgr->getWindow("Form"); + stddlg = winMgr->getWindow("StdDlg"); - iAwsComponent* InputPath = stddlg->FindChild("InputPath"); - csRef<iString> valuePath(new scfString(vfs->GetCwd())); - if (InputPath) InputPath->SetProperty("Text",(intptr_t)(iString*)valuePath); + CEGUI::Window* btn = 0; + // ----[ GENERAL ]--------------------------------------------------------- - StdDlgUpdateLists(valuePath->GetData()); + btn = winMgr->getWindow("Tab1/SaveButton"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::SaveButton, this)); + + btn = winMgr->getWindow("Tab1/LoadButton"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::LoadButton, this)); + + btn = winMgr->getWindow("Tab1/SaveBinaryButton"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::SaveBinaryButton, this)); + + btn = winMgr->getWindow("Tab1/LoadLibButton"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::LoadLibButton, this)); + + btn = winMgr->getWindow("Tab1/NormalMovementRadio"); + btn->subscribeEvent(CEGUI::RadioButton::EventSelectStateChanged, + CEGUI::Event::Subscriber(&ViewMesh::CameraModeMoveNormal, this)); + + btn = winMgr->getWindow("Tab1/LooktooriginRadio"); + btn->subscribeEvent(CEGUI::RadioButton::EventSelectStateChanged, + CEGUI::Event::Subscriber(&ViewMesh::CameraModeMoveOrigin, this)); + + btn = winMgr->getWindow("Tab1/RotateRadio"); + btn->subscribeEvent(CEGUI::RadioButton::EventSelectStateChanged, + CEGUI::Event::Subscriber(&ViewMesh::CameraModeRotate, this)); + + btn = winMgr->getWindow("Tab1/ScaleSprite"); + btn->subscribeEvent(CEGUI::Editbox::EventTextAccepted, + CEGUI::Event::Subscriber(&ViewMesh::SetScaleSprite, this)); + + // ----[ ANIMATION ]------------------------------------------------------- + + btn = winMgr->getWindow("Tab2/ReverseAnimation"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::ReversAnimation, this)); + + btn = winMgr->getWindow("Tab2/StopAnimation"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::StopAnimation, this)); + + btn = winMgr->getWindow("Tab2/SlowerAnimation"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::SlowerAnimation, this)); + + btn = winMgr->getWindow("Tab2/AddAnimation"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::AddAnimation, this)); + + btn = winMgr->getWindow("Tab2/FasterAnimation"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::FasterAnimation, this)); + + btn = winMgr->getWindow("Tab2/SetAnimation"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::SetAnimation, this)); + + btn = winMgr->getWindow("Tab2/RemoveAnimation"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::RemoveAnimation, this)); + + btn = winMgr->getWindow("Tab2/ClearAnimation"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::ClearAnimation, this)); + + btn = winMgr->getWindow("Tab2/List"); + btn->subscribeEvent(CEGUI::Listbox::EventSelectionChanged, + CEGUI::Event::Subscriber(&ViewMesh::SelAnimation, this)); + + // ----[ SOCKET ]---------------------------------------------------------- + + btn = winMgr->getWindow("Tab3/RotX/Input"); + btn->subscribeEvent(CEGUI::Editbox::EventTextAccepted, + CEGUI::Event::Subscriber(&ViewMesh::SetRotX, this)); + + btn = winMgr->getWindow("Tab3/RotY/Input"); + btn->subscribeEvent(CEGUI::Editbox::EventTextAccepted, + CEGUI::Event::Subscriber(&ViewMesh::SetRotY, this)); + + btn = winMgr->getWindow("Tab3/RotZ/Input"); + btn->subscribeEvent(CEGUI::Editbox::EventTextAccepted, + CEGUI::Event::Subscriber(&ViewMesh::SetRotZ, this)); + + btn = winMgr->getWindow("Tab3/Mesh/Input"); + btn->subscribeEvent(CEGUI::Editbox::EventTextAccepted, + CEGUI::Event::Subscriber(&ViewMesh::SetMesh, this)); + + btn = winMgr->getWindow("Tab3/Sub/Input"); + btn->subscribeEvent(CEGUI::Editbox::EventTextAccepted, + CEGUI::Event::Subscriber(&ViewMesh::SetSubMesh, this)); + + btn = winMgr->getWindow("Tab3/Tria/Input"); + btn->subscribeEvent(CEGUI::Editbox::EventTextAccepted, + CEGUI::Event::Subscriber(&ViewMesh::SetTriangle, this)); + + btn = winMgr->getWindow("Tab3/AttachButton"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::AttachButton, this)); + + btn = winMgr->getWindow("Tab3/DetachButton"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::DetachButton, this)); + + btn = winMgr->getWindow("Tab3/AddSocket"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::AddSocket, this)); + + btn = winMgr->getWindow("Tab3/DelSocket"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::DelSocket, this)); + + btn = winMgr->getWindow("Tab3/List"); + btn->subscribeEvent(CEGUI::Listbox::EventSelectionChanged, + CEGUI::Event::Subscriber(&ViewMesh::SelSocket, this)); + + btn = winMgr->getWindow("Tab3/RenameSocket"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::RenameSocket, this)); + + // ----[ Morph ]---------------------------------------------------------- + + btn = winMgr->getWindow("Tab4/List"); + btn->subscribeEvent(CEGUI::Listbox::EventSelectionChanged, + CEGUI::Event::Subscriber(&ViewMesh::SelMorph, this)); + + btn = winMgr->getWindow("Tab4/BlendButton"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::BlendButton, this)); + + btn = winMgr->getWindow("Tab4/ClearButton"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::ClearButton, this)); + + // ----[ STDDLG ]---------------------------------------------------------- + + btn = winMgr->getWindow("StdDlg/OkButton"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::StdDlgOkButton, this)); + + btn = winMgr->getWindow("StdDlg/CancleButton"); + btn->subscribeEvent(CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&ViewMesh::StdDlgCancleButton, this)); + + btn = winMgr->getWindow("StdDlg/FileSelect"); + btn->subscribeEvent(CEGUI::Listbox::EventSelectionChanged, + CEGUI::Event::Subscriber(&ViewMesh::StdDlgFileSelect, this)); + + btn = winMgr->getWindow("StdDlg/DirSelect"); + btn->subscribeEvent(CEGUI::Listbox::EventSelectionChanged, + CEGUI::Event::Subscriber(&ViewMesh::StdDlgDirSelect, this)); + + // ------------------------------------------------------------------------ + + btn = winMgr->getWindow("StdDlg/Path"); + btn->setProperty("Text", vfs->GetCwd()); + StdDlgUpdateLists(vfs->GetCwd()); } void ViewMesh::LoadSprite (const char* filename) @@ -809,12 +919,12 @@ void ViewMesh::UpdateSocketList () { - iAwsComponent* list = form->FindChild("SocketList"); - iAwsParmList* pl = aws->CreateParmList(); - if (!list) return; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - list->Execute("ClearList", pl); + CEGUI::Listbox* list = (CEGUI::Listbox*)winMgr->getWindow("Tab3/List"); + list->resetList(); + if (sprite) { for (int i = 0; i < sprite->GetSocketCount(); i++) @@ -824,9 +934,11 @@ if (i==0) SelectSocket(sock->GetName()); - pl->AddString("text0", sock->GetName()); - list->Execute("InsertItem", pl); - pl->Clear(); + CEGUI::ListboxTextItem* item = new CEGUI::ListboxTextItem(sock->GetName()); + item->setTextColours(CEGUI::colour(0,0,0)); + item->setSelectionBrushImage("ice", "TextSelectionBrush"); + item->setSelectionColours(CEGUI::colour(0.5f,0.5f,1)); + list->addItem(item); } } else if (cal3dsprite) @@ -838,25 +950,29 @@ if (i==0) SelectSocket(sock->GetName()); - pl->AddString("text0", sock->GetName()); - list->Execute("InsertItem", pl); - pl->Clear(); + CEGUI::ListboxTextItem* item = new CEGUI::ListboxTextItem(sock->GetName()); + item->setTextColours(CEGUI::colour(0,0,0)); + item->setSelectionBrushImage("ice", "TextSelectionBrush"); + item->setSelectionColours(CEGUI::colour(0.5f,0.5f,1)); + list->addItem(item); } } } void ViewMesh::UpdateAnimationList () { - iAwsComponent* list = form->FindChild("AnimList"); - iAwsParmList* pl = aws->CreateParmList(); - if (!list) return; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - list->Execute("ClearList", pl); + CEGUI::Listbox* list = (CEGUI::Listbox*)winMgr->getWindow("Tab2/List"); - pl->AddString("text0", "default"); - list->Execute("InsertItem", pl); - pl->Clear(); + list->resetList(); + CEGUI::ListboxTextItem* item = new CEGUI::ListboxTextItem("default"); + item->setTextColours(CEGUI::colour(0,0,0)); + item->setSelectionBrushImage("ice", "TextSelectionBrush"); + item->setSelectionColours(CEGUI::colour(0.5f,0.5f,1)); + list->addItem(item); + if (sprite) { for (int i = 0; i < sprite->GetActionCount(); i++) @@ -864,9 +980,11 @@ iSpriteAction* action = sprite->GetAction(i); if (!action) continue; - pl->AddString("text0", action->GetName ()); - list->Execute("InsertItem", pl); - pl->Clear(); + item = new CEGUI::ListboxTextItem(action->GetName()); + item->setTextColours(CEGUI::colour(0,0,0)); + item->setSelectionBrushImage("ice", "TextSelectionBrush"); + item->setSelectionColours(CEGUI::colour(0.5f,0.5f,1)); + list->addItem(item); } } else if (cal3dsprite) @@ -876,25 +994,29 @@ const char* animname = cal3dstate->GetAnimName(i); if (!animname) continue; - pl->AddString("text0", animname); - list->Execute("InsertItem", pl); - pl->Clear(); + item = new CEGUI::ListboxTextItem(animname); + item->setTextColours(CEGUI::colour(0,0,0)); + item->setSelectionBrushImage("ice", "TextSelectionBrush"); + item->setSelectionColours(CEGUI::colour(0.5f,0.5f,1)); + list->addItem(item); } } } void ViewMesh::UpdateMorphList () { - iAwsComponent* list = form->FindChild("MorphList"); - iAwsParmList* pl = aws->CreateParmList(); - if (!list) return; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - list->Execute("ClearList", pl); + CEGUI::Listbox* list = (CEGUI::Listbox*)winMgr->getWindow("Tab4/List"); - pl->AddString("text0", "default"); - list->Execute("InsertItem", pl); - pl->Clear(); + list->resetList(); + CEGUI::ListboxTextItem* item = new CEGUI::ListboxTextItem("default"); + item->setTextColours(CEGUI::colour(0,0,0)); + item->setSelectionBrushImage("ice", "TextSelectionBrush"); + item->setSelectionColours(CEGUI::colour(0.5f,0.5f,1)); + list->addItem(item); + if (cal3dsprite) { for (int i = 0; i < cal3dsprite->GetMorphAnimationCount(); i++) @@ -902,9 +1024,11 @@ const char* morphname = cal3dsprite->GetMorphAnimationName(i); if (!morphname) continue; - pl->AddString("text0", morphname); - list->Execute("InsertItem", pl); - pl->Clear(); + item = new CEGUI::ListboxTextItem(morphname); + item->setTextColours(CEGUI::colour(0,0,0)); + item->setSelectionBrushImage("ice", "TextSelectionBrush"); + item->setSelectionColours(CEGUI::colour(0.5f,0.5f,1)); + list->addItem(item); } } } @@ -928,51 +1052,51 @@ void ViewMesh::UpdateSocket () { + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); + if (selectedSocket) { - iAwsComponent* InputName = form->FindChild("InputName"); + CEGUI::Window* InputName = winMgr->getWindow("Tab3/RenameSocket/Input"); const char* name = selectedSocket->GetName(); - csRef<iString> valueName(new scfString(name)); - InputName->SetProperty("Text",(intptr_t)(iString*)valueName); + InputName->setProperty("Text", name); - iAwsComponent* InputTriangle = form->FindChild("InputTriangle"); + CEGUI::Window* InputTriangle = winMgr->getWindow("Tab3/Tria/Input"); csRef<iString> valueTriangle(new scfString()); valueTriangle->Format("%d", selectedSocket->GetTriangleIndex()); - InputTriangle->SetProperty("Text",(intptr_t)(iString*)valueTriangle); + InputTriangle->setProperty("Text", valueTriangle->GetData()); } else if (selectedCal3dSocket) { - iAwsComponent* InputName = form->FindChild("InputName"); + CEGUI::Window* InputName = winMgr->getWindow("Tab3/RenameSocket/Input"); const char* name = selectedCal3dSocket->GetName(); - csRef<iString> valueName(new scfString(name)); - InputName->SetProperty("Text",(intptr_t)(iString*)valueName); + InputName->setProperty("Text", name); - iAwsComponent* InputMesh = form->FindChild("InputMesh"); + CEGUI::Window* InputMesh = winMgr->getWindow("Tab3/Mesh/Input"); csRef<iString> valueMesh(new scfString()); valueMesh->Format("%d", selectedCal3dSocket->GetMeshIndex()); - InputMesh->SetProperty("Text",(intptr_t)(iString*)valueMesh); + InputMesh->setProperty("Text", valueMesh->GetData()); - iAwsComponent* InputSubMesh = form->FindChild("InputSubMesh"); + CEGUI::Window* InputSubMesh = winMgr->getWindow("Tab3/Sub/Input"); csRef<iString> valueSubmesh(new scfString()); valueSubmesh->Format("%d", selectedCal3dSocket->GetSubmeshIndex()); - InputSubMesh->SetProperty("Text",(intptr_t)(iString*)valueSubmesh); + InputSubMesh->setProperty("Text", valueSubmesh->GetData()); - iAwsComponent* InputTriangle = form->FindChild("InputTriangle"); + CEGUI::Window* InputTriangle = winMgr->getWindow("Tab3/Tria/Input"); csRef<iString> valueTriangle(new scfString()); valueTriangle->Format("%d", selectedCal3dSocket->GetTriangleIndex()); - InputTriangle->SetProperty("Text",(intptr_t)(iString*)valueTriangle); + InputTriangle->setProperty("Text", valueTriangle->GetData()); } } void ViewMesh::ScaleSprite (float newScale) { - csMatrix3 scalingHt; scalingHt.Identity(); scalingHt *= newScale/scale; + csMatrix3 scalingHt; scalingHt.Identity(); scalingHt *= scale/newScale; csReversibleTransform rTH; rTH.SetT2O (scalingHt); if (spritewrapper) spritewrapper->HardTransform (rTH); - csMatrix3 scaling; scaling.Identity(); scaling *= newScale; + csMatrix3 scaling; scaling.Identity(); scaling /= newScale; csReversibleTransform rT; rT.SetT2O (scaling); if (spritewrapper) @@ -980,590 +1104,604 @@ scale = newScale; - iAwsComponent* InputMesh = form->FindChild("InputScale"); + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); + + CEGUI::Window* component = winMgr->getWindow("Tab1/ScaleSprite"); csRef<iString> valueMesh(new scfString()); valueMesh->Format("%.2f", scale); - InputMesh->SetProperty("Text",(intptr_t)(iString*)valueMesh); + component->setProperty("Text", valueMesh->GetData()); } //--------------------------------------------------------------------------- -void ViewMesh::ReversAnimation (unsigned long, intptr_t awst, iAwsSource* /*source*/) +bool ViewMesh::ReversAnimation (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - if (tut->cal3dstate) + + if (cal3dstate) { - tut->cal3dstate->SetAnimationTime(-1); + cal3dstate->SetAnimationTime(-1); } - else if (tut->state) + else if (state) { - tut->state->SetReverseAction(tut->state->GetReverseAction()^true); + state->SetReverseAction(state->GetReverseAction()^true); } + return true; } -void ViewMesh::StopAnimation (unsigned long, intptr_t awst, iAwsSource* /*source*/) +bool ViewMesh::StopAnimation (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - tut->move_sprite_speed = 0; + move_sprite_speed = 0; + return true; } -void ViewMesh::SlowerAnimation (unsigned long, intptr_t awst, iAwsSource* /*source*/) +bool ViewMesh::SlowerAnimation (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - tut->move_sprite_speed -= 0.5f; + move_sprite_speed -= 0.5f; + return true; } -void ViewMesh::AddAnimation (unsigned long, intptr_t awst, iAwsSource* /*source*/) +bool ViewMesh::AddAnimation (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - if (tut->cal3dstate) + if (cal3dstate) { - if (!tut->selectedAnimation) return; - int anim = tut->cal3dstate->FindAnim(tut->selectedAnimation); - tut->cal3dstate->AddAnimCycle(anim,1,3); + if (!selectedAnimation) return false; + int anim = cal3dstate->FindAnim(selectedAnimation); + cal3dstate->AddAnimCycle(anim,1,3); } + return true; } -void ViewMesh::FasterAnimation (unsigned long, intptr_t awst, iAwsSource* /*source*/) +bool ViewMesh::FasterAnimation (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - tut->move_sprite_speed += 0.5f; + move_sprite_speed += 0.5f; + return true; } -void ViewMesh::SetAnimation (unsigned long, intptr_t awst, iAwsSource* /*source*/) +bool ViewMesh::SetAnimation (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - if (tut->cal3dstate) + if (cal3dstate) { - if (!tut->selectedAnimation) return; - int anim = tut->cal3dstate->FindAnim(tut->selectedAnimation); - tut->cal3dstate->SetAnimAction(anim,1,1); + if (!selectedAnimation) return false; + int anim = cal3dstate->FindAnim(selectedAnimation); + cal3dstate->SetAnimAction(anim,1,1); } - else if (tut->state) + else if (state) { - if (!tut->selectedAnimation) return; - tut->state->SetAction(tut->selectedAnimation); + if (!selectedAnimation) return false; + state->SetAction(selectedAnimation); } + return true; } -void ViewMesh::RemoveAnimation (unsigned long, intptr_t awst, iAwsSource* /*source*/) +bool ViewMesh::RemoveAnimation (const CEGUI::EventArgs& e) { //TODO: Implement it. - ViewMesh* tut = (ViewMesh*)awst; - tut->ReportWarning("Removal of Animation is not yet implemented"); + + ReportWarning("Removal of Animation is not yet implemented"); + return true; } -void ViewMesh::ClearAnimation (unsigned long, intptr_t awst, iAwsSource* /*source*/) +bool ViewMesh::ClearAnimation (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - if (tut->cal3dstate) + if (cal3dstate) { - if (!tut->selectedAnimation) return; - int anim = tut->cal3dstate->FindAnim(tut->selectedAnimation); - tut->cal3dstate->ClearAnimCycle(anim,3); + if (!selectedAnimation) return false; + int anim = cal3dstate->FindAnim(selectedAnimation); + cal3dstate->ClearAnimCycle(anim,3); } + return true; } -void ViewMesh::SelAnimation (unsigned long, intptr_t awst, iAwsSource* /*source*/) +bool ViewMesh::SelAnimation (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - iAwsComponent* list = tut->form->FindChild("AnimList"); - iAwsParmList* pl = tut->aws->CreateParmList(); - if (!list) return; + CEGUI::Listbox* list = (CEGUI::Listbox*)winMgr->getWindow("Tab2/List"); - pl->AddString("text0",""); - list->Execute("GetSelectedItem", pl); - pl->GetString("text0",&text); + CEGUI::ListboxItem* item = list->getFirstSelectedItem(); + const CEGUI::String& text = item->getText(); + if (text.empty()) return false; - if (!text->GetData()) return; - - tut->selectedAnimation = text->GetData(); + selectedAnimation = text.c_str(); + return true; } //--------------------------------------------------------------------------- -void ViewMesh::SetMesh (unsigned long, intptr_t awst, iAwsSource *s) +bool ViewMesh::SetMesh (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + if (!selectedCal3dSocket) return false; - if (!tut->selectedCal3dSocket) return; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - if (!s->GetComponent()->GetProperty("Text",(intptr_t*)&text)) return; + CEGUI::Window* component = winMgr->getWindow("Tab3/Mesh/Input"); + CEGUI::String text = component->getProperty("Text"); - if (!text->GetData()) return; + if (!text.c_str()) return false; int i; - if (sscanf(text->GetData(),"%d", &i) != 1) return; + if (sscanf(text.c_str(),"%d", &i) != 1) return false; - tut->selectedCal3dSocket->SetMeshIndex(i); - tut->UpdateSocket(); + selectedCal3dSocket->SetMeshIndex(i); + UpdateSocket(); + return true; } -void ViewMesh::SetSubMesh (unsigned long, intptr_t awst, iAwsSource *s) +bool ViewMesh::SetSubMesh (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + if (!selectedCal3dSocket) return false; - if (!tut->selectedCal3dSocket) return; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - if (!s->GetComponent()->GetProperty("Text",(intptr_t*)&text)) return; + CEGUI::Window* component = winMgr->getWindow("Tab3/Sub/Input"); + CEGUI::String text = component->getProperty("Text"); - if (!text->GetData()) return; + if (!text.c_str()) return false; int i; - if (sscanf(text->GetData(),"%d", &i) != 1) return; + if (sscanf(text.c_str(),"%d", &i) != 1) return false; - tut->selectedCal3dSocket->SetSubmeshIndex(i); - tut->UpdateSocket(); + selectedCal3dSocket->SetSubmeshIndex(i); + UpdateSocket(); + return true; } -void ViewMesh::SetTriangle (unsigned long, intptr_t awst, iAwsSource *s) +bool ViewMesh::SetTriangle (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - if (!s->GetComponent()->GetProperty("Text",(intptr_t*)&text)) return; + CEGUI::Window* component = winMgr->getWindow("Tab3/Tria/Input"); + CEGUI::String text = component->getProperty("Text"); - if (!text->GetData()) return; + if (!text.c_str()) return false; int i; - if (sscanf(text->GetData(),"%d", &i) != 1) return; + if (sscanf(text.c_str(),"%d", &i) != 1) return false; - if (tut->selectedCal3dSocket) - tut->selectedCal3dSocket->SetTriangleIndex(i); - else if (tut->selectedSocket) - tut->selectedSocket->SetTriangleIndex(i); + if (selectedCal3dSocket) + selectedCal3dSocket->SetTriangleIndex(i); + else if (selectedSocket) + selectedSocket->SetTriangleIndex(i); - tut->UpdateSocket(); + UpdateSocket(); + return true; } -void ViewMesh::SetRotX (unsigned long, intptr_t awst, iAwsSource *s) +bool ViewMesh::SetRotX (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - if (!s->GetComponent()->GetProperty("Text",(intptr_t*)&text)) return; + CEGUI::Window* component = winMgr->getWindow("Tab3/RotX/Input"); + CEGUI::String text = component->getProperty("Text"); - if (!text->GetData()) return; + if (!text.c_str()) return false; float f; - if (sscanf(text->GetData(),"%f", &f) != 1) return; + if (sscanf(text.c_str(),"%f", &f) != 1) return false; - if (tut->selectedCal3dSocket && tut->selectedCal3dSocket->GetMeshWrapper()) + if (selectedCal3dSocket && selectedCal3dSocket->GetMeshWrapper()) { - csRef<iMeshWrapper> meshWrap = tut->selectedCal3dSocket->GetMeshWrapper(); + csRef<iMeshWrapper> meshWrap = selectedCal3dSocket->GetMeshWrapper(); meshWrap->QuerySceneNode ()->SetParent (0); csReversibleTransform Tr; - Tr.RotateOther(csVector3(0,0,1),-tut->meshTz); - Tr.RotateOther(csVector3(0,1,0),-tut->meshTy); - Tr.RotateOther(csVector3(1,0,0),-tut->meshTx); + Tr.RotateOther(csVector3(0,0,1),-meshTz); + Tr.RotateOther(csVector3(0,1,0),-meshTy); + Tr.RotateOther(csVector3(1,0,0),-meshTx); Tr.RotateOther(csVector3(1,0,0),f); - Tr.RotateOther(csVector3(0,1,0),tut->meshTy); - Tr.RotateOther(csVector3(0,0,1),tut->meshTz); + Tr.RotateOther(csVector3(0,1,0),meshTy); + Tr.RotateOther(csVector3(0,0,1),meshTz); meshWrap->GetMeshObject()->HardTransform(Tr); meshWrap->GetFactory()->GetMeshObjectFactory()->HardTransform(Tr); - meshWrap->QuerySceneNode ()->SetParent (tut->spritewrapper + meshWrap->QuerySceneNode ()->SetParent (spritewrapper ->QuerySceneNode ()); - tut->selectedCal3dSocket->SetMeshWrapper( meshWrap ); - tut->spritewrapper->GetMovable()->UpdateMove(); - tut->meshTx = f; + selectedCal3dSocket->SetMeshWrapper( meshWrap ); + spritewrapper->GetMovable()->UpdateMove(); + meshTx = f; } - else if (tut->selectedSocket && tut->selectedSocket->GetMeshWrapper()) + else if (selectedSocket && selectedSocket->GetMeshWrapper()) { - csRef<iMeshWrapper> meshWrap = tut->selectedSocket->GetMeshWrapper(); + csRef<iMeshWrapper> meshWrap = selectedSocket->GetMeshWrapper(); meshWrap->QuerySceneNode ()->SetParent (0); csReversibleTransform Tr; - Tr.RotateOther(csVector3(0,0,1),-tut->meshTz); - Tr.RotateOther(csVector3(0,1,0),-tut->meshTy); - Tr.RotateOther(csVector3(1,0,0),-tut->meshTx); + Tr.RotateOther(csVector3(0,0,1),-meshTz); + Tr.RotateOther(csVector3(0,1,0),-meshTy); + Tr.RotateOther(csVector3(1,0,0),-meshTx); Tr.RotateOther(csVector3(1,0,0),f); - Tr.RotateOther(csVector3(0,1,0),tut->meshTy); - Tr.RotateOther(csVector3(0,0,1),tut->meshTz); + Tr.RotateOther(csVector3(0,1,0),meshTy); + Tr.RotateOther(csVector3(0,0,1),meshTz); meshWrap->GetMeshObject()->HardTransform(Tr); meshWrap->GetFactory()->GetMeshObjectFactory()->HardTransform(Tr); - meshWrap->QuerySceneNode ()->SetParent (tut->spritewrapper + meshWrap->QuerySceneNode ()->SetParent (spritewrapper ->QuerySceneNode ()); - tut->selectedSocket->SetMeshWrapper( meshWrap ); - tut->spritewrapper->GetMovable()->UpdateMove(); - tut->meshTx = f; + selectedSocket->SetMeshWrapper( meshWrap ); + spritewrapper->GetMovable()->UpdateMove(); + meshTx = f; } + return true; } -void ViewMesh::SetRotY (unsigned long, intptr_t awst, iAwsSource *s) +bool ViewMesh::SetRotY (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - if (!s->GetComponent()->GetProperty("Text",(intptr_t*)&text)) return; + CEGUI::Window* component = winMgr->getWindow("Tab3/RotY/Input"); + CEGUI::String text = component->getProperty("Text"); - if (!text->GetData()) return; + if (!text.c_str()) return false; float f; - if (sscanf(text->GetData(),"%f", &f) != 1) return; + if (sscanf(text.c_str(),"%f", &f) != 1) return false; - if (tut->selectedCal3dSocket && tut->selectedCal3dSocket->GetMeshWrapper()) + if (selectedCal3dSocket && selectedCal3dSocket->GetMeshWrapper()) { - csRef<iMeshWrapper> meshWrap = tut->selectedCal3dSocket->GetMeshWrapper(); + csRef<iMeshWrapper> meshWrap = selectedCal3dSocket->GetMeshWrapper(); meshWrap->QuerySceneNode ()->SetParent (0); csReversibleTransform Tr; - Tr.RotateOther(csVector3(0,0,1),-tut->meshTz); - Tr.RotateOther(csVector3(0,1,0),-tut->meshTy); - Tr.RotateOther(csVector3(1,0,0),-tut->meshTx); - Tr.RotateOther(csVector3(1,0,0),tut->meshTx); + Tr.RotateOther(csVector3(0,0,1),-meshTz); + Tr.RotateOther(csVector3(0,1,0),-meshTy); + Tr.RotateOther(csVector3(1,0,0),-meshTx); + Tr.RotateOther(csVector3(1,0,0),meshTx); Tr.RotateOther(csVector3(0,1,0),f); - Tr.RotateOther(csVector3(0,0,1),tut->meshTz); + Tr.RotateOther(csVector3(0,0,1),meshTz); meshWrap->GetMeshObject()->HardTransform(Tr); meshWrap->GetFactory()->GetMeshObjectFactory()->HardTransform(Tr); - meshWrap->QuerySceneNode ()->SetParent (tut->spritewrapper + meshWrap->QuerySceneNode ()->SetParent (spritewrapper ->QuerySceneNode ()); - tut->selectedCal3dSocket->SetMeshWrapper( meshWrap ); - tut->spritewrapper->GetMovable()->UpdateMove(); - tut->meshTy = f; + selectedCal3dSocket->SetMeshWrapper( meshWrap ); + spritewrapper->GetMovable()->UpdateMove(); + meshTy = f; } - else if (tut->selectedSocket && tut->selectedSocket->GetMeshWrapper()) + else if (selectedSocket && selectedSocket->GetMeshWrapper()) { - csRef<iMeshWrapper> meshWrap = tut->selectedSocket->GetMeshWrapper(); + csRef<iMeshWrapper> meshWrap = selectedSocket->GetMeshWrapper(); meshWrap->QuerySceneNode ()->SetParent (0); csReversibleTransform Tr; - Tr.RotateOther(csVector3(0,0,1),-tut->meshTz); - Tr.RotateOther(csVector3(0,1,0),-tut->meshTy); - Tr.RotateOther(csVector3(1,0,0),-tut->meshTx); - Tr.RotateOther(csVector3(1,0,0),tut->meshTx); + Tr.RotateOther(csVector3(0,0,1),-meshTz); + Tr.RotateOther(csVector3(0,1,0),-meshTy); + Tr.RotateOther(csVector3(1,0,0),-meshTx); + Tr.RotateOther(csVector3(1,0,0),meshTx); Tr.RotateOther(csVector3(0,1,0),f); - Tr.RotateOther(csVector3(0,0,1),tut->meshTz); + Tr.RotateOther(csVector3(0,0,1),meshTz); meshWrap->GetMeshObject()->HardTransform(Tr); meshWrap->GetFactory()->GetMeshObjectFactory()->HardTransform(Tr); - meshWrap->QuerySceneNode ()->SetParent (tut->spritewrapper + meshWrap->QuerySceneNode ()->SetParent (spritewrapper ->QuerySceneNode ()); - tut->selectedSocket->SetMeshWrapper( meshWrap ); - tut->spritewrapper->GetMovable()->UpdateMove(); - tut->meshTy = f; + selectedSocket->SetMeshWrapper( meshWrap ); + spritewrapper->GetMovable()->UpdateMove(); + meshTy = f; } + return true; } -void ViewMesh::SetRotZ (unsigned long, intptr_t awst, iAwsSource *s) +bool ViewMesh::SetRotZ (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - if (!s->GetComponent()->GetProperty("Text",(intptr_t*)&text)) return; + CEGUI::Window* component = winMgr->getWindow("Tab3/RotZ/Input"); + CEGUI::String text = component->getProperty("Text"); - if (!text->GetData()) return; + if (!text.c_str()) return false; float f; - if (sscanf(text->GetData(),"%f", &f) != 1) return; + if (sscanf(text.c_str(),"%f", &f) != 1) return false; - if (tut->selectedCal3dSocket && tut->selectedCal3dSocket->GetMeshWrapper()) + if (selectedCal3dSocket && selectedCal3dSocket->GetMeshWrapper()) { - csRef<iMeshWrapper> meshWrap = tut->selectedCal3dSocket->GetMeshWrapper(); + csRef<iMeshWrapper> meshWrap = selectedCal3dSocket->GetMeshWrapper(); meshWrap->QuerySceneNode ()->SetParent (0); csReversibleTransform Tr; - Tr.RotateOther(csVector3(0,0,1),-tut->meshTz); - Tr.RotateOther(csVector3(0,1,0),-tut->meshTy); - Tr.RotateOther(csVector3(1,0,0),-tut->meshTx); - Tr.RotateOther(csVector3(1,0,0),tut->meshTx); - Tr.RotateOther(csVector3(0,1,0),tut->meshTy); + Tr.RotateOther(csVector3(0,0,1),-meshTz); + Tr.RotateOther(csVector3(0,1,0),-meshTy); + Tr.RotateOther(csVector3(1,0,0),-meshTx); + Tr.RotateOther(csVector3(1,0,0),meshTx); + Tr.RotateOther(csVector3(0,1,0),meshTy); Tr.RotateOther(csVector3(0,0,1),f); meshWrap->GetMeshObject()->HardTransform(Tr); meshWrap->GetFactory()->GetMeshObjectFactory()->HardTransform(Tr); - meshWrap->QuerySceneNode ()->SetParent (tut->spritewrapper + meshWrap->QuerySceneNode ()->SetParent (spritewrapper ->QuerySceneNode ()); - tut->selectedCal3dSocket->SetMeshWrapper( meshWrap ); - tut->spritewrapper->GetMovable()->UpdateMove(); - tut->meshTz = f; + selectedCal3dSocket->SetMeshWrapper( meshWrap ); + spritewrapper->GetMovable()->UpdateMove(); + meshTz = f; } - else if (tut->selectedSocket && tut->selectedSocket->GetMeshWrapper()) + else if (selectedSocket && selectedSocket->GetMeshWrapper()) { - csRef<iMeshWrapper> meshWrap = tut->selectedSocket->GetMeshWrapper(); + csRef<iMeshWrapper> meshWrap = selectedSocket->GetMeshWrapper(); meshWrap->QuerySceneNode ()->SetParent (0); csReversibleTransform Tr; - Tr.RotateOther(csVector3(0,0,1),-tut->meshTz); - Tr.RotateOther(csVector3(0,1,0),-tut->meshTy); - Tr.RotateOther(csVector3(1,0,0),-tut->meshTx); - Tr.RotateOther(csVector3(1,0,0),tut->meshTx); - Tr.RotateOther(csVector3(0,1,0),tut->meshTy); + Tr.RotateOther(csVector3(0,0,1),-meshTz); + Tr.RotateOther(csVector3(0,1,0),-meshTy); + Tr.RotateOther(csVector3(1,0,0),-meshTx); + Tr.RotateOther(csVector3(1,0,0),meshTx); + Tr.RotateOther(csVector3(0,1,0),meshTy); Tr.RotateOther(csVector3(0,0,1),f); meshWrap->GetMeshObject()->HardTransform(Tr); meshWrap->GetFactory()->GetMeshObjectFactory()->HardTransform(Tr); - meshWrap->QuerySceneNode ()->SetParent (tut->spritewrapper + meshWrap->QuerySceneNode ()->SetParent (spritewrapper ->QuerySceneNode ()); - tut->selectedSocket->SetMeshWrapper( meshWrap ); - tut->spritewrapper->GetMovable()->UpdateMove(); - tut->meshTz = f; + selectedSocket->SetMeshWrapper( meshWrap ); + spritewrapper->GetMovable()->UpdateMove(); + meshTz = f; } + return true; } -void ViewMesh::AttachButton (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::AttachButton (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - tut->form->Hide(); - tut->stddlg->Show(); - tut->stddlgPurpose=attach; + form->hide(); + stddlg->show(); + stddlgPurpose=attach; + return true; } -void ViewMesh::DetachButton (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::DetachButton (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - csRef<iMeshWrapper> meshWrapOld; - if (tut->selectedCal3dSocket) - meshWrapOld = tut->selectedCal3dSocket->GetMeshWrapper(); - else if (tut->selectedSocket) - meshWrapOld = tut->selectedSocket->GetMeshWrapper(); + if (selectedCal3dSocket) + meshWrapOld = selectedCal3dSocket->GetMeshWrapper(); + else if (selectedSocket) + meshWrapOld = selectedSocket->GetMeshWrapper(); - if (!meshWrapOld ) return; + if (!meshWrapOld ) return false; meshWrapOld->QuerySceneNode ()->SetParent (0); - tut->engine->RemoveObject(meshWrapOld); - tut->engine->RemoveObject(meshWrapOld->GetFactory()); + engine->RemoveObject(meshWrapOld); + engine->RemoveObject(meshWrapOld->GetFactory()); - if (tut->selectedCal3dSocket) - tut->selectedCal3dSocket->SetMeshWrapper( 0 ); - else if (tut->selectedSocket) - tut->selectedSocket->SetMeshWrapper( 0 ); + if (selectedCal3dSocket) + selectedCal3dSocket->SetMeshWrapper( 0 ); + else if (selectedSocket) + selectedSocket->SetMeshWrapper( 0 ); + return true; } -void ViewMesh::AddSocket (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::AddSocket (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + ReportWarning("Adding sockets is not yet implemented"); - tut->ReportWarning("Adding sockets is not yet implemented"); - - if (tut->cal3dsprite) + if (cal3dsprite) { - //tut->cal3dsprite->AddSocket()->SetName("NewSocket"); - //tut->cal3dstate->AddSocket()->SetName("NewSocket"); - //tut->SelectSocket("NewSocket"); + //cal3dsprite->AddSocket()->SetName("NewSocket"); + //cal3dstate->AddSocket()->SetName("NewSocket"); + //SelectSocket("NewSocket"); } - else if (tut->sprite) + else if (sprite) { - //iSpriteSocket* newsocket = tut->sprite->AddSocket(); + //iSpriteSocket* newsocket = sprite->AddSocket(); //newsocket->SetName("NewSocket"); - //tut->SelectSocket(newsocket->GetName()); + //SelectSocket(newsocket->GetName()); } - tut->UpdateSocketList(); + UpdateSocketList(); + return true; } -void ViewMesh::DelSocket (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::DelSocket (const CEGUI::EventArgs& e) { //Change API of iSpriteCal3DFactoryState to enable this! - ViewMesh* tut = (ViewMesh*)awst; - tut->ReportWarning("Deleting sockets is not yet implemented"); - //tut->socket->DelSocket(selectedCal3dSocket); + + ReportWarning("Deleting sockets is not yet implemented"); + //socket->DelSocket(selectedCal3dSocket); //selectedCal3dSocket = 0; - tut->UpdateSocketList(); + UpdateSocketList(); + return true; } -void ViewMesh::SelSocket (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::SelSocket (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - iAwsComponent* list = tut->form->FindChild("SocketList"); - iAwsParmList* pl = tut->aws->CreateParmList(); - if (!list) return; + CEGUI::Listbox* list = (CEGUI::Listbox*)winMgr->getWindow("Tab3/List"); - pl->AddString("text0",""); - list->Execute("GetSelectedItem", pl); - pl->GetString("text0",&text); + CEGUI::ListboxItem* item = list->getFirstSelectedItem(); + const CEGUI::String& text = item->getText(); + if (text.empty()) return false; - if (!text->GetData()) return; - - tut->SelectSocket(text->GetData()); + SelectSocket(text.c_str()); + return true; } -void ViewMesh::RenameSocket (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::RenameSocket (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); + CEGUI::Window* textfield = winMgr->getWindow("Tab3/RenameSocket/Input"); - iAwsComponent* textfield = tut->form->FindChild("InputName"); - if (!textfield) return; + CEGUI::String text = textfield->getProperty("Text"); - iString* text; - if (!textfield->GetComponent()->GetProperty("Text",(intptr_t*)&text)) return; + if (text.empty()) return false; - if (!text->GetData()) return; - - if (tut->selectedSocket) + if (selectedSocket) { - tut->selectedSocket->SetName(*text); + selectedSocket->SetName(text.c_str()); } - else if (tut->selectedCal3dSocket) + else if (selectedCal3dSocket) { - const char* name = tut->selectedCal3dSocket->GetName(); - tut->cal3dsprite->FindSocket(name)->SetName(*text); - tut->cal3dstate->FindSocket(name)->SetName(*text); - tut->selectedCal3dSocket = tut->cal3dsprite->FindSocket(*text); + const char* name = selectedCal3dSocket->GetName(); + cal3dsprite->FindSocket(name)->SetName(text.c_str()); + cal3dstate->FindSocket(name)->SetName(text.c_str()); + selectedCal3dSocket = cal3dsprite->FindSocket(text.c_str()); } - tut->UpdateSocketList(); + UpdateSocketList(); + return true; } //--------------------------------------------------------------------------- -void ViewMesh::CameraMode (unsigned long, intptr_t awst, iAwsSource *s) +bool ViewMesh::CameraModeRotate (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - bool* state; - if (!s->GetComponent()->GetProperty("State",(intptr_t*)&state)) return; + CEGUI::RadioButton* radio = + (CEGUI::RadioButton*) winMgr->getWindow("Tab1/RotateRadio"); - if (!state) return; + if (radio->getSelectedButtonInGroup() == radio) + camMode = rotateorigin; + return true; +} - iString* caption; - if (!s->GetComponent()->GetProperty("Caption",(intptr_t*)&caption)) return; +bool ViewMesh::CameraModeMoveOrigin (const CEGUI::EventArgs& e) +{ + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - if (!caption->GetData()) return; + CEGUI::RadioButton* radio = + (CEGUI::RadioButton*) winMgr->getWindow("Tab1/LooktooriginRadio"); - if (!strcmp (*caption, "Rotate")) - tut->camMode = rotateorigin; - else if (!strcmp (*caption, "Look to Origin")) - tut->camMode = moveorigin; - else if (!strcmp (*caption, "Normal Movement")) - tut->camMode = movenormal; + if (radio->getSelectedButtonInGroup() == radio) + camMode = moveorigin; + return true; } -void ViewMesh::LoadButton (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::CameraModeMoveNormal (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - tut->form->Hide(); - tut->stddlg->Show(); - tut->stddlgPurpose=load; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); + + CEGUI::RadioButton* radio = + (CEGUI::RadioButton*) winMgr->getWindow("Tab1/NormalMovementRadio"); + + if (radio->getSelectedButtonInGroup() == radio) + camMode = movenormal; + return true; } -void ViewMesh::LoadLibButton (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::LoadButton (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - tut->form->Hide(); - tut->stddlg->Show(); - tut->stddlgPurpose=loadlib; + form->hide(); + stddlg->show(); + stddlgPurpose=load; + return true; } -void ViewMesh::SaveButton (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::LoadLibButton (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - tut->form->Hide(); - tut->stddlg->Show(); - tut->stddlgPurpose=save; + form->hide(); + stddlg->show(); + stddlgPurpose=loadlib; + return true; } -void ViewMesh::SaveBinaryButton (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::SaveButton (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - tut->form->Hide(); - tut->stddlg->Show(); - tut->stddlgPurpose=savebinary; + form->hide(); + stddlg->show(); + stddlgPurpose=save; + return true; } -void ViewMesh::SetScaleSprite (unsigned long, intptr_t awst, iAwsSource *s) +bool ViewMesh::SaveBinaryButton (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + form->hide(); + stddlg->show(); + stddlgPurpose=savebinary; + return true; +} - iString* text; - if (!s->GetComponent()->GetProperty("Text",(intptr_t*)&text)) return; +bool ViewMesh::SetScaleSprite (const CEGUI::EventArgs& e) +{ + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - if (!text->GetData()) return; + CEGUI::Editbox* component = (CEGUI::Editbox*)winMgr->getWindow("Tab1/ScaleSprite"); + const CEGUI::String& text = component->getText(); + if (text.empty()) return false; + float f; - if (sscanf(text->GetData(),"%f", &f) != 1) return; + if (sscanf(text.c_str(),"%f", &f) != 1) return false; - tut->ScaleSprite(f); + ScaleSprite(f); + return true; } //--------------------------------------------------------------------------- -void ViewMesh::SelMorph (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::SelMorph (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - iAwsComponent* list = tut->form->FindChild("MorphList"); - iAwsParmList* pl = tut->aws->CreateParmList(); - if (!list) return; + CEGUI::Listbox* list = (CEGUI::Listbox*)winMgr->getWindow("Tab4/List"); - pl->AddString("text0",""); - list->Execute("GetSelectedItem", pl); - pl->GetString("text0",&text); + CEGUI::ListboxItem* item = list->getFirstSelectedItem(); + const CEGUI::String& text = item->getText(); + if (text.empty()) return false; - if (!text->GetData()) return; - - tut->selectedMorphTarget = text->GetData(); + selectedMorphTarget = text.c_str(); + return true; } -void ViewMesh::BlendButton (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::BlendButton (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - if (!tut->cal3dstate) return; + if (!cal3dstate) return false; - iString *Sweight=0, *Sdelay=0; float weight=1, delay=1; - iAwsComponent* component; - component = tut->stddlg->FindChild("InputWeight"); - if (component) component->GetProperty("Text",(intptr_t*)&Sweight); - if (Sweight && Sweight->GetData()) + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); + + CEGUI::Window* component = winMgr->getWindow("Tab4/WeightInput"); + CEGUI::String Sweight = component->getProperty("Text"); + + if (! Sweight.empty()) { - if(sscanf(Sweight->GetData(), "%f", &weight) != 1) weight = 1; + if(sscanf(Sweight.c_str(), "%f", &weight) != 1) weight = 1; } - component = tut->stddlg->FindChild("InputDelay"); - if (component) component->GetProperty("Text",(intptr_t*)&Sdelay); - if (Sdelay && Sdelay->GetData()) + component = winMgr->getWindow("Tab4/DelayInput"); + CEGUI::String Sdelay = component->getProperty("Text"); + if (! Sdelay.empty()) { - if(sscanf(Sdelay->GetData(), "%f", &delay) != 1) delay = 1; + if(sscanf(Sdelay.c_str(), "%f", &delay) != 1) delay = 1; } int target = - tut->cal3dsprite->FindMorphAnimationName(tut->selectedMorphTarget); + cal3dsprite->FindMorphAnimationName(selectedMorphTarget); - if (target == -1) return; + if (target == -1) return false; - tut->cal3dstate->BlendMorphTarget(target, weight, delay); + cal3dstate->BlendMorphTarget(target, weight, delay); + return true; } -void ViewMesh::ClearButton (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::ClearButton (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - if (!tut->cal3dstate) return; + if (!cal3dstate) return false; - iString *Sweight=0; float weight=1; - iAwsComponent* component; - component = tut->stddlg->FindChild("InputWeight"); - if (component) component->GetProperty("Text",(intptr_t*)&Sweight); - if (Sweight && Sweight->GetData()) + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); + + CEGUI::Window* component = winMgr->getWindow("Tab4/WeightInput"); + CEGUI::String Sweight = component->getProperty("Text"); + + if (! Sweight.empty()) { - if(sscanf(Sweight->GetData(), "%f", &weight) != 1) weight = 1; + if(sscanf(Sweight.c_str(), "%f", &weight) != 1) weight = 1; } int target = - tut->cal3dsprite->FindMorphAnimationName(tut->selectedMorphTarget); + cal3dsprite->FindMorphAnimationName(selectedMorphTarget); - if (target == -1) return; + if (target == -1) return false; - tut->cal3dstate->ClearMorphTarget(target, weight); + cal3dstate->ClearMorphTarget(target, weight); + return true; } //--------------------------------------------------------------------------- void ViewMesh::StdDlgUpdateLists(const char* filename) { - iAwsComponent* dirlist = stddlg->FindChild("DirList"); - iAwsComponent* filelist = stddlg->FindChild("FileList"); - iAwsParmList* pl = aws->CreateParmList(); - if (!dirlist || !filelist) return; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - dirlist->Execute("ClearList", pl); - filelist->Execute("ClearList", pl); + CEGUI::Listbox* dirlist = (CEGUI::Listbox*)winMgr->getWindow("StdDlg/DirSelect"); + CEGUI::Listbox* filelist = (CEGUI::Listbox*)winMgr->getWindow("StdDlg/FileSelect"); - pl->AddString("text0", ".."); - dirlist->Execute("InsertItem", pl); - pl->Clear(); + dirlist->resetList(); + filelist->resetList(); + CEGUI::ListboxTextItem* item = new CEGUI::ListboxTextItem(".."); + item->setTextColours(CEGUI::colour(0,0,0)); + //item->setSelectionBrushImage("ice", "TextSelectionBrush"); + //item->setSelectionColours(CEGUI::colour(0.5f,0.5f,1)); + dirlist->addItem(item); + csRef<iStringArray> files = vfs->FindFiles(filename); for (size_t i = 0; i < files->Length(); i++) @@ -1581,129 +1719,119 @@ if (file[strlen(file)-1] == '/') { file[strlen(file)-1]='\0'; - pl->AddString("text0", file); - dirlist->Execute("InsertItem", pl); - pl->Clear(); + CEGUI::ListboxTextItem* item = new CEGUI::ListboxTextItem(file); + item->setTextColours(CEGUI::colour(0,0,0)); + //item->setSelectionBrushImage("ice", "TextSelectionBrush"); + //item->setSelectionColours(CEGUI::colour(0.5f,0.5f,1)); + dirlist->addItem(item); } else { - pl->AddString("text0", file); - filelist->Execute("InsertItem", pl); - pl->Clear(); + CEGUI::ListboxTextItem* item = new CEGUI::ListboxTextItem(file); + item->setTextColours(CEGUI::colour(0,0,0)); + //item->setSelectionBrushImage("ice", "TextSelectionBrush"); + //item->setSelectionColours(CEGUI::colour(0.5f,0.5f,1)); + filelist->addItem(item); } } } //--------------------------------------------------------------------------- -void ViewMesh::StdDlgOkButton (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::StdDlgOkButton (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + form->show(); + stddlg->hide(); - iString* path=0; - iString* file=0; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - tut->form->Show(); - tut->stddlg->Hide(); + CEGUI::Window* inputpath = winMgr->getWindow("StdDlg/Path"); + CEGUI::String path = inputpath->getProperty("Text"); + if (path.empty()) return false; - iAwsComponent* inputpath = tut->stddlg->FindChild("InputPath"); - if (inputpath) inputpath->GetProperty("Text",(intptr_t*)&path); - if (!path || !path->GetData()) return; - tut->vfs->ChDir (path->GetData ()); + vfs->ChDir (path.c_str()); - iAwsComponent* inputfile = tut->stddlg->FindChild("InputFile"); - if (inputfile) inputfile->GetProperty("Text",(intptr_t*)&file); - if (!file || !file->GetData()) return; + CEGUI::Window* inputfile = winMgr->getWindow("StdDlg/File"); + CEGUI::String file = inputfile->getProperty("Text"); + if (path.empty()) return false; - switch (tut->stddlgPurpose) + switch (stddlgPurpose) { case save: - tut->SaveSprite(*file, false); + SaveSprite(file.c_str(), false); break; case savebinary: - tut->SaveSprite(*file, true); + SaveSprite(file.c_str(), true); break; case load: - tut->LoadSprite(*file); + LoadSprite(file.c_str()); break; case loadlib: - tut->LoadLibrary(*file); + LoadLibrary(file.c_str()); break; case attach: - tut->AttachMesh(*file); + AttachMesh(file.c_str()); break; } + return true; } -void ViewMesh::StdDlgCancleButton (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::StdDlgCancleButton (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; - - tut->form->Show(); - tut->stddlg->Hide(); + form->show(); + stddlg->hide(); + return true; } -void ViewMesh::StdDlgFileSelect (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::StdDlgFileSelect (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - iAwsComponent* list = tut->stddlg->FindChild("FileList"); - iAwsParmList* pl = tut->aws->CreateParmList(); - if (!list) return; + CEGUI::Listbox* list = (CEGUI::Listbox*) winMgr->getWindow("StdDlg/FileSelect"); + CEGUI::ListboxItem* item = list->getFirstSelectedItem(); + CEGUI::String text = item->getText(); + if (text.empty()) return false; - pl->AddString("text0",""); - list->Execute("GetSelectedItem", pl); - pl->GetString("text0",&text); - - if (!text->GetData()) return; - - iAwsComponent* InputPath = tut->stddlg->FindChild("InputFile"); - InputPath->SetProperty("Text", (intptr_t)text); + CEGUI::Window* file = winMgr->getWindow("StdDlg/File"); + file->setProperty("Text", text); + return true; } -void ViewMesh::StdDlgDirSelect (unsigned long, intptr_t awst, iAwsSource* /*s*/) +bool ViewMesh::StdDlgDirSelect (const CEGUI::EventArgs& e) { - ViewMesh* tut = (ViewMesh*)awst; + CEGUI::WindowManager* winMgr = cegui->GetWindowManagerPtr (); - iString* text; - iAwsComponent* list = tut->stddlg->FindChild("DirList"); - iAwsParmList* pl = tut->aws->CreateParmList(); - if (!list) return; + CEGUI::Listbox* list = (CEGUI::Listbox*) winMgr->getWindow("StdDlg/DirSelect"); + CEGUI::ListboxItem* item = list->getFirstSelectedItem(); + CEGUI::String text = item->getText(); + if (text.empty()) return false; - pl->AddString("text0",""); - ... [truncated message content] |
From: <the...@us...> - 2006-09-10 22:09:25
|
Revision: 25323 http://svn.sourceforge.net/crystal/?rev=25323&view=rev Author: thebolt00 Date: 2006-09-10 15:09:07 -0700 (Sun, 10 Sep 2006) Log Message: ----------- - Marten fixed (hopefully) the script building (with Swig) on both older swigs and for jobber. Modified Paths: -------------- CS/trunk/bin/jobber-cel-svn.cfg CS/trunk/bin/jobber-svn.cfg CS/trunk/docs/history.txt CS/trunk/plugins/cscript/csjava/Jamfile CS/trunk/plugins/cscript/csperl5/Jamfile CS/trunk/plugins/cscript/cspython/Jamfile Modified: CS/trunk/bin/jobber-cel-svn.cfg =================================================================== --- CS/trunk/bin/jobber-cel-svn.cfg 2006-09-10 21:55:23 UTC (rev 25322) +++ CS/trunk/bin/jobber-cel-svn.cfg 2006-09-10 22:09:07 UTC (rev 25323) @@ -114,6 +114,7 @@ "#define __CS_CSCONFIG_H__\n" . "#define CS_HAVE_INTTYPES_H\n" . "#define CS_HAVE_STDINT_H\n" . + "#define CS_HAVE_INT64_C\n" . "#endif // __CS_CSCONFIG_H__\n" . "EOF\n" ; Modified: CS/trunk/bin/jobber-svn.cfg =================================================================== --- CS/trunk/bin/jobber-svn.cfg 2006-09-10 21:55:23 UTC (rev 25322) +++ CS/trunk/bin/jobber-svn.cfg 2006-09-10 22:09:07 UTC (rev 25323) @@ -103,6 +103,7 @@ "#define __CS_CSCONFIG_H__\n" . "#define CS_HAVE_INTTYPES_H\n" . "#define CS_HAVE_STDINT_H\n" . + "#define CS_HAVE_INT64_C\n" . "#endif // __CS_CSCONFIG_H__\n" . "EOF\n" ; Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-10 21:55:23 UTC (rev 25322) +++ CS/trunk/docs/history.txt 2006-09-10 22:09:07 UTC (rev 25323) @@ -6,6 +6,9 @@ individual changes for each given day, however, are in normal (ascending) chronological order. +11-Sep-2006 + - Marten fixed (hopefully) the script building (with Swig) on both + older swigs and for jobber. 10-Sep-2006 - PK changed ViewMesh to use CEGUI instead of AWS. - PK fixed a bug in csHash::Delete (const K& key, const T &value). Modified: CS/trunk/plugins/cscript/csjava/Jamfile =================================================================== --- CS/trunk/plugins/cscript/csjava/Jamfile 2006-09-10 21:55:23 UTC (rev 25322) +++ CS/trunk/plugins/cscript/csjava/Jamfile 2006-09-10 22:09:07 UTC (rev 25323) @@ -70,7 +70,7 @@ Swig $(common) : [ DoSourceGrist cspace.i ] : java : - -c++ -java -cpperraswarn -package org.crystalspace3d : + -c++ -java -package org.crystalspace3d : [ ConcatDirs $(TOP) include ] [ ConcatDirs $(BUILDTOP) include ] : [ ConcatDirs $(TOP) include bindings ] : Modified: CS/trunk/plugins/cscript/csperl5/Jamfile =================================================================== --- CS/trunk/plugins/cscript/csperl5/Jamfile 2006-09-10 21:55:23 UTC (rev 25322) +++ CS/trunk/plugins/cscript/csperl5/Jamfile 2006-09-10 22:09:07 UTC (rev 25323) @@ -60,7 +60,7 @@ Swig $(target) $(pmfile) : [ FGristFiles cspace.i ] : perl5 : - -c++ -shadow -const -cpperraswarn -module cspace : + -c++ -shadow -const -module cspace : [ ConcatDirs $(TOP) include ] [ ConcatDirs $(BUILDTOP) include ] : [ ConcatDirs $(TOP) include bindings ] : Modified: CS/trunk/plugins/cscript/cspython/Jamfile =================================================================== --- CS/trunk/plugins/cscript/cspython/Jamfile 2006-09-10 21:55:23 UTC (rev 25322) +++ CS/trunk/plugins/cscript/cspython/Jamfile 2006-09-10 22:09:07 UTC (rev 25323) @@ -36,7 +36,7 @@ Swig $(common) $(cspacepy) : [ DoSourceGrist cspace.i ] : python : - -c++ -shadow -cpperraswarn : + -c++ -shadow : [ ConcatDirs $(TOP) include ] [ ConcatDirs $(BUILDTOP) include ] : [ ConcatDirs $(TOP) include bindings ] : This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2006-09-11 08:57:29
|
Revision: 25324 http://svn.sourceforge.net/crystal/?rev=25324&view=rev Author: jorrit Date: 2006-09-11 01:57:18 -0700 (Mon, 11 Sep 2006) Log Message: ----------- - Jorrit fixed a bug in particles and particlesldr. It would initialize start time to -1 which caused particles to fail on particle systems with very small duration. Modified Paths: -------------- CS/trunk/docs/history.txt CS/trunk/plugins/mesh/particles/object/builtinemitters.h CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.cpp Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-10 22:09:07 UTC (rev 25323) +++ CS/trunk/docs/history.txt 2006-09-11 08:57:18 UTC (rev 25324) @@ -9,6 +9,9 @@ 11-Sep-2006 - Marten fixed (hopefully) the script building (with Swig) on both older swigs and for jobber. + - Jorrit fixed a bug in particles and particlesldr. It would + initialize start time to -1 which caused particles to fail on + particle systems with very small duration. 10-Sep-2006 - PK changed ViewMesh to use CEGUI instead of AWS. - PK fixed a bug in csHash::Delete (const K& key, const T &value). Modified: CS/trunk/plugins/mesh/particles/object/builtinemitters.h =================================================================== --- CS/trunk/plugins/mesh/particles/object/builtinemitters.h 2006-09-10 22:09:07 UTC (rev 25323) +++ CS/trunk/plugins/mesh/particles/object/builtinemitters.h 2006-09-11 08:57:18 UTC (rev 25324) @@ -96,7 +96,7 @@ ParticleEmitterHelper () : base (this), - isEnabled (true), startTime (-1), duration (FLT_MAX), + isEnabled (true), startTime (0), duration (FLT_MAX), initialTTLMin(1.0f), initialTTLMax (1.0f), initialMassMin (1.0f), initialMassMax (1.0f), position (0.0f), placement (CS_PARTICLE_BUILTIN_VOLUME), Modified: CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.cpp =================================================================== --- CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.cpp 2006-09-10 22:09:07 UTC (rev 25323) +++ CS/trunk/plugins/mesh/particles/persist/standard/particlesldr.cpp 2006-09-11 08:57:18 UTC (rev 25324) @@ -282,7 +282,7 @@ float radius = 1.0f, coneAngle = PI/4; csVector3 position (0.0f), extent (0.0f), initialVelocity (0.0f); bool enabled = true; - float startTime = -1.0f, duration = FLT_MAX, emissionRate = 0.0f, + float startTime = 0.0f, duration = FLT_MAX, emissionRate = 0.0f, minTTL = FLT_MAX, maxTTL = FLT_MAX, minMass = 1.0f, maxMass = 1.0f; csOBB box; csParticleBuiltinEmitterPlacement placement = CS_PARTICLE_BUILTIN_CENTER; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2006-09-11 09:51:56
|
Revision: 25325 http://svn.sourceforge.net/crystal/?rev=25325&view=rev Author: jorrit Date: 2006-09-11 02:51:48 -0700 (Mon, 11 Sep 2006) Log Message: ----------- - Jorrit added some missing operators for csColor4. Modified Paths: -------------- CS/trunk/docs/history.txt CS/trunk/include/csutil/cscolor.h Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-11 08:57:18 UTC (rev 25324) +++ CS/trunk/docs/history.txt 2006-09-11 09:51:48 UTC (rev 25325) @@ -12,6 +12,7 @@ - Jorrit fixed a bug in particles and particlesldr. It would initialize start time to -1 which caused particles to fail on particle systems with very small duration. + - Jorrit added some missing operators for csColor4. 10-Sep-2006 - PK changed ViewMesh to use CEGUI instead of AWS. - PK fixed a bug in csHash::Delete (const K& key, const T &value). Modified: CS/trunk/include/csutil/cscolor.h =================================================================== --- CS/trunk/include/csutil/cscolor.h 2006-09-11 08:57:18 UTC (rev 25324) +++ CS/trunk/include/csutil/cscolor.h 2006-09-11 09:51:48 UTC (rev 25325) @@ -232,4 +232,19 @@ inline csColor operator- (const csColor& s1, const csColor& s2) { csColor c (s1); c -= s2; return c; } +/// Multiply a color by a scalar value. +inline csColor4 operator* (const csColor4& s, float f) +{ csColor4 c (s); c *= f; return c; } + +/// Multiply a scalar value by a color. +inline csColor4 operator* (float f, const csColor4& s) +{ csColor4 c (s); c *= f; return c; } + +/// Add two colors. +inline csColor4 operator+ (const csColor4& s1, const csColor4& s2) +{ csColor4 c (s1); c += s2; return c; } +/// Subtract two colors. +inline csColor4 operator- (const csColor4& s1, const csColor4& s2) +{ csColor4 c (s1); c -= s2; return c; } + #endif // __CS_CSCOLOR_H__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2006-09-11 11:40:14
|
Revision: 25326 http://svn.sourceforge.net/crystal/?rev=25326&view=rev Author: jorrit Date: 2006-09-11 04:40:05 -0700 (Mon, 11 Sep 2006) Log Message: ----------- - Jorrit removed the operators again as they break compilation of CS in some cases. Modified Paths: -------------- CS/trunk/docs/history.txt CS/trunk/include/csutil/cscolor.h Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-11 09:51:48 UTC (rev 25325) +++ CS/trunk/docs/history.txt 2006-09-11 11:40:05 UTC (rev 25326) @@ -13,6 +13,8 @@ initialize start time to -1 which caused particles to fail on particle systems with very small duration. - Jorrit added some missing operators for csColor4. + - Jorrit removed the operators again as they break compilation of CS + in some cases. 10-Sep-2006 - PK changed ViewMesh to use CEGUI instead of AWS. - PK fixed a bug in csHash::Delete (const K& key, const T &value). Modified: CS/trunk/include/csutil/cscolor.h =================================================================== --- CS/trunk/include/csutil/cscolor.h 2006-09-11 09:51:48 UTC (rev 25325) +++ CS/trunk/include/csutil/cscolor.h 2006-09-11 11:40:05 UTC (rev 25326) @@ -232,19 +232,4 @@ inline csColor operator- (const csColor& s1, const csColor& s2) { csColor c (s1); c -= s2; return c; } -/// Multiply a color by a scalar value. -inline csColor4 operator* (const csColor4& s, float f) -{ csColor4 c (s); c *= f; return c; } - -/// Multiply a scalar value by a color. -inline csColor4 operator* (float f, const csColor4& s) -{ csColor4 c (s); c *= f; return c; } - -/// Add two colors. -inline csColor4 operator+ (const csColor4& s1, const csColor4& s2) -{ csColor4 c (s1); c += s2; return c; } -/// Subtract two colors. -inline csColor4 operator- (const csColor4& s1, const csColor4& s2) -{ csColor4 c (s1); c -= s2; return c; } - #endif // __CS_CSCOLOR_H__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2006-09-11 12:53:13
|
Revision: 25327 http://svn.sourceforge.net/crystal/?rev=25327&view=rev Author: jorrit Date: 2006-09-11 05:52:58 -0700 (Mon, 11 Sep 2006) Log Message: ----------- - Jorrit added a new system in the CS engine so that objects can have themselves removed after a specific interval. Call iEngine->DelayedRemoveObject() with an object (any object that can be removed through the normal iEngine->RemoveObject()) and a delay. This new system is more general then the old iEngine->WantToDie() method that is called by some particle systems. Modified Paths: -------------- CS/trunk/docs/history.txt CS/trunk/include/iengine/engine.h CS/trunk/plugins/engine/3d/engine.cpp CS/trunk/plugins/engine/3d/engine.h Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-11 11:40:05 UTC (rev 25326) +++ CS/trunk/docs/history.txt 2006-09-11 12:52:58 UTC (rev 25327) @@ -15,6 +15,12 @@ - Jorrit added some missing operators for csColor4. - Jorrit removed the operators again as they break compilation of CS in some cases. + - Jorrit added a new system in the CS engine so that objects can have + themselves removed after a specific interval. Call + iEngine->DelayedRemoveObject() with an object (any object that can + be removed through the normal iEngine->RemoveObject()) and a delay. + This new system is more general then the old iEngine->WantToDie() + method that is called by some particle systems. 10-Sep-2006 - PK changed ViewMesh to use CEGUI instead of AWS. - PK fixed a bug in csHash::Delete (const K& key, const T &value). Modified: CS/trunk/include/iengine/engine.h =================================================================== --- CS/trunk/include/iengine/engine.h 2006-09-11 11:40:05 UTC (rev 25326) +++ CS/trunk/include/iengine/engine.h 2006-09-11 12:52:58 UTC (rev 25327) @@ -1295,6 +1295,23 @@ * This function will also remove the object from the region it may be in. */ virtual bool RemoveObject (iBase* object) = 0; + + /** + * This function can be used to remove an object after a specific amount + * of time. This is mostly useful for particle systems (like explosions) + * that you want to live for a specific time before they are automatically + * cleaned up by the engine. Note that calling this function will cause + * the engine to keep an additional reference until it is time to delete + * the object. + */ + virtual void DelayedRemoveObject (csTicks delay, iBase* object) = 0; + + /** + * Clear all delayed removals. + * \param remove if true then the objects will also be removed from engine. + * Otherwise they are simply removed from this list. + */ + virtual void RemoveDelayedRemoves (bool remove = false) = 0; /// Delete everything in the engine. virtual void DeleteAll () = 0; Modified: CS/trunk/plugins/engine/3d/engine.cpp =================================================================== --- CS/trunk/plugins/engine/3d/engine.cpp 2006-09-11 11:40:05 UTC (rev 25326) +++ CS/trunk/plugins/engine/3d/engine.cpp 2006-09-11 12:52:58 UTC (rev 25327) @@ -768,6 +768,8 @@ nextframePending = 0; halos.DeleteAll (); collections.RemoveAll (); + wantToDieSet.Empty (); + RemoveDelayedRemoves (false); GetMeshes ()->RemoveAll (); meshFactories.RemoveAll (); @@ -1663,6 +1665,16 @@ GetMeshes ()->Remove (mesh); } wantToDieSet.Empty (); + + // Delete all objects that should be removed given the current + // time. + csTicks current = virtualClock->GetCurrentTicks (); + while (delayedRemoves.Length () > 0 + && delayedRemoves.Top ().time_to_delete <= current) + { + csDelayedRemoveObject ro = delayedRemoves.Pop (); + RemoveObject (ro.object); + } } char* csEngine::SplitRegionName (const char* name, iRegion*& region, @@ -3258,6 +3270,39 @@ return CreateMeshWrapper (mo, name, sector, pos); } +static int CompareDelayedRemoveObject (csDelayedRemoveObject const& r1, + csDelayedRemoveObject const& r2) +{ + // Reverse sort! + if (r1.time_to_delete < r2.time_to_delete) return 1; + else if (r2.time_to_delete < r1.time_to_delete) return -1; + else return 0; +} + +void csEngine::DelayedRemoveObject (csTicks delay, iBase *object) +{ + csDelayedRemoveObject ro; + ro.object = object; + ro.time_to_delete = virtualClock->GetCurrentTicks () + delay; + delayedRemoves.InsertSorted (ro, CompareDelayedRemoveObject); +} + +void csEngine::RemoveDelayedRemoves (bool remove) +{ + if (remove) + { + while (delayedRemoves.Length () > 0) + { + csDelayedRemoveObject ro = delayedRemoves.Pop (); + RemoveObject (ro.object); + } + } + else + { + delayedRemoves.DeleteAll (); + } +} + bool csEngine::RemoveObject (iBase *object) { csRef<iObject> obj = scfQueryInterface<iObject> (object); Modified: CS/trunk/plugins/engine/3d/engine.h =================================================================== --- CS/trunk/plugins/engine/3d/engine.h 2006-09-11 11:40:05 UTC (rev 25326) +++ CS/trunk/plugins/engine/3d/engine.h 2006-09-11 12:52:58 UTC (rev 25327) @@ -159,6 +159,12 @@ sector (sector), pos (pos) { } }; +struct csDelayedRemoveObject +{ + csRef<iBase> object; + csTicks time_to_delete; +}; + /** * List of camera positions for the engine. This class implements * iCameraPositionList. @@ -557,6 +563,8 @@ iRegion* region = 0); virtual bool RemoveObject (iBase* object); + virtual void DelayedRemoveObject (csTicks delay, iBase *object); + virtual void RemoveDelayedRemoves (bool remove = false); virtual void DeleteAll (); @@ -855,6 +863,9 @@ /// Array of objects that want to die next frame (iMeshWrapper*). csSet<csPtrKey<iMeshWrapper> > wantToDieSet; + /// An array of objects to remove at a specific time. + csArray<csDelayedRemoveObject> delayedRemoves; + /// The list of all named render priorities. csStringArray renderPriorities; /// Sorting flags for the render priorities. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2006-09-11 13:11:12
|
Revision: 25328 http://svn.sourceforge.net/crystal/?rev=25328&view=rev Author: jorrit Date: 2006-09-11 06:11:02 -0700 (Mon, 11 Sep 2006) Log Message: ----------- - Jorrit added a commented out version of the explosion in walktest using the new particle system. Doesn't yet work 100% (fading is broken). Modified Paths: -------------- CS/trunk/apps/walktest/walkdemo.cpp CS/trunk/docs/history.txt Modified: CS/trunk/apps/walktest/walkdemo.cpp =================================================================== --- CS/trunk/apps/walktest/walkdemo.cpp 2006-09-11 12:52:58 UTC (rev 25327) +++ CS/trunk/apps/walktest/walkdemo.cpp 2006-09-11 13:11:02 UTC (rev 25328) @@ -37,6 +37,7 @@ #include "imesh/objmodel.h" #include "igeom/polymesh.h" #include "imap/loader.h" +#include "imesh/particles.h" #include "imesh/explode.h" #include "imesh/fire.h" #include "imesh/fountain.h" @@ -276,6 +277,56 @@ return; } +#if 0 + csRef<iMeshFactoryWrapper> mfw = Sys->view->GetEngine ()-> + CreateMeshFactory ("crystalspace.mesh.object.particles", "explosion"); + if (!mfw) return; + + csRef<iMeshWrapper> exp ( + Sys->view->GetEngine ()->CreateMeshWrapper (mfw, "custom explosion", + sector, center)); + + exp->SetZBufMode(CS_ZBUF_TEST); + exp->SetRenderPriority (engine->GetAlphaRenderPriority ()); + + csRef<iParticleSystem> partstate = + scfQueryInterface<iParticleSystem> (exp->GetMeshObject ()); + exp->GetMeshObject()->SetMaterialWrapper (mat); + //partstate->SetMixMode (CS_FX_SETALPHA (0.50)); + exp->GetMeshObject()->SetColor (csColor (1, 1, 0)); + + csRef<iParticleBuiltinEmitterFactory> emit_factory = + csLoadPluginCheck<iParticleBuiltinEmitterFactory> ( + Sys->object_reg, "crystalspace.mesh.object.particles.emitter", false); + csRef<iParticleBuiltinEffectorFactory> eff_factory = + csLoadPluginCheck<iParticleBuiltinEffectorFactory> ( + Sys->object_reg, "crystalspace.mesh.object.particles.effector", false); + + csRef<iParticleBuiltinEmitterSphere> sphereemit = emit_factory-> + CreateSphere (); + sphereemit->SetRadius (0.1); + sphereemit->SetParticlePlacement (CS_PARTICLE_BUILTIN_CENTER); + sphereemit->SetPosition (csVector3 (0, 0, 0)); + sphereemit->SetInitialVelocity (csVector3 (1, 0, 0), csVector3 (3, 3, 3)); + sphereemit->SetUniformVelocity (false); + sphereemit->SetDuration (0.1f); + sphereemit->SetEmissionRate (1000.0f); + sphereemit->SetInitialTTL (1.0f, 1.0f); + + csRef<iParticleBuiltinEffectorLinColor> lincol = eff_factory-> + CreateLinColor (); + lincol->AddColor (csColor4 (1,1,1,1), 0.5f); + lincol->AddColor (csColor4 (1,1,1,0), 0.0f); + + partstate->SetParticleSize (csVector2 (0.15f, 0.15f)); + partstate->SetRotationMode (CS_PARTICLE_ROTATE_VERTICES); + partstate->SetIntegrationMode (CS_PARTICLE_INTEGRATE_BOTH); + + partstate->AddEmitter (sphereemit); + partstate->AddEffector (lincol); + Sys->Engine->DelayedRemoveObject (1100, exp); + Sys->Engine->DelayedRemoveObject (1101, mfw); +#else csRef<iMeshFactoryWrapper> mfw (Sys->view->GetEngine ()-> CreateMeshFactory ("crystalspace.mesh.object.explosion", "explosion")); if (!mfw) return; @@ -308,6 +359,7 @@ expstate->SetSpreadSpeed (2.0f); expstate->SetSpreadAcceleration (2.0f); expstate->SetFadeSprites (500); +#endif exp->PlaceMesh (); } Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-11 12:52:58 UTC (rev 25327) +++ CS/trunk/docs/history.txt 2006-09-11 13:11:02 UTC (rev 25328) @@ -21,6 +21,9 @@ be removed through the normal iEngine->RemoveObject()) and a delay. This new system is more general then the old iEngine->WantToDie() method that is called by some particle systems. + - Jorrit added a commented out version of the explosion in walktest + using the new particle system. Doesn't yet work 100% (fading is + broken). 10-Sep-2006 - PK changed ViewMesh to use CEGUI instead of AWS. - PK fixed a bug in csHash::Delete (const K& key, const T &value). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cry...@us...> - 2006-09-12 01:18:19
|
Revision: 25329 http://svn.sourceforge.net/crystal/?rev=25329&view=rev Author: crystal-manage Date: 2006-09-11 18:17:52 -0700 (Mon, 11 Sep 2006) Log Message: ----------- master header files: Automated master header file repair. Visual-C++ project files: Automated Visual-C++ project file repair. Texinfo files: Automated Texinfo @node and @menu repair. Swig Python files: Automated Swig Python file repair. Swig Perl5 files: Automated Swig Perl5 file repair. User's Manual: Automated Texinfo to HTML conversion. Modified Paths: -------------- CS/trunk/plugins/cscript/cspython/cs_pyth.cpp CS/trunk/scripts/perl5/cspace.pm CS/trunk/scripts/perl5/cswigpl5.inc CS/trunk/scripts/python/cspace.py Modified: CS/trunk/plugins/cscript/cspython/cs_pyth.cpp =================================================================== --- CS/trunk/plugins/cscript/cspython/cs_pyth.cpp 2006-09-11 13:11:02 UTC (rev 25328) +++ CS/trunk/plugins/cscript/cspython/cs_pyth.cpp 2006-09-12 01:17:52 UTC (rev 25329) @@ -85301,6 +85301,140 @@ } +SWIGINTERN PyObject *_wrap_iEngine_DelayedRemoveObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + iEngine *arg1 = (iEngine *) 0 ; + csTicks arg2 ; + iBase *arg3 = (iBase *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + unsigned int val2 ; + int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OOO:iEngine_DelayedRemoveObject",&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iEngine, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iEngine_DelayedRemoveObject" "', argument " "1"" of type '" "iEngine *""'"); + } + arg1 = reinterpret_cast<iEngine * >(argp1); + ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iEngine_DelayedRemoveObject" "', argument " "2"" of type '" "csTicks""'"); + } + arg2 = static_cast<csTicks >(val2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_iBase, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "iEngine_DelayedRemoveObject" "', argument " "3"" of type '" "iBase *""'"); + } + arg3 = reinterpret_cast<iBase * >(argp3); + (arg1)->DelayedRemoveObject(arg2,arg3); + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_iEngine_RemoveDelayedRemoves__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + iEngine *arg1 = (iEngine *) 0 ; + bool arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:iEngine_RemoveDelayedRemoves",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iEngine, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iEngine_RemoveDelayedRemoves" "', argument " "1"" of type '" "iEngine *""'"); + } + arg1 = reinterpret_cast<iEngine * >(argp1); + ecode2 = SWIG_AsVal_bool(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iEngine_RemoveDelayedRemoves" "', argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast<bool >(val2); + (arg1)->RemoveDelayedRemoves(arg2); + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_iEngine_RemoveDelayedRemoves__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + iEngine *arg1 = (iEngine *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:iEngine_RemoveDelayedRemoves",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_iEngine, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iEngine_RemoveDelayedRemoves" "', argument " "1"" of type '" "iEngine *""'"); + } + arg1 = reinterpret_cast<iEngine * >(argp1); + (arg1)->RemoveDelayedRemoves(); + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_iEngine_RemoveDelayedRemoves(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[3]; + int ii; + + if (!PyTuple_Check(args)) SWIG_fail; + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 2); ii++) { + argv[ii] = PyTuple_GET_ITEM(args,ii); + } + if (argc == 1) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_iEngine, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_iEngine_RemoveDelayedRemoves__SWIG_1(self, args); + } + } + if (argc == 2) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_iEngine, 0); + _v = SWIG_CheckState(res); + if (_v) { + { + int res = SWIG_AsVal_bool(argv[1], NULL); + _v = SWIG_CheckState(res); + } + if (_v) { + return _wrap_iEngine_RemoveDelayedRemoves__SWIG_0(self, args); + } + } + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'iEngine_RemoveDelayedRemoves'"); + return NULL; +} + + SWIGINTERN PyObject *_wrap_iEngine_DeleteAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; iEngine *arg1 = (iEngine *) 0 ; @@ -216955,6 +217089,8 @@ { (char *)"iEngine_GetCollections", _wrap_iEngine_GetCollections, METH_VARARGS, NULL}, { (char *)"iEngine_FindCollection", _wrap_iEngine_FindCollection, METH_VARARGS, NULL}, { (char *)"iEngine_RemoveObject", _wrap_iEngine_RemoveObject, METH_VARARGS, NULL}, + { (char *)"iEngine_DelayedRemoveObject", _wrap_iEngine_DelayedRemoveObject, METH_VARARGS, NULL}, + { (char *)"iEngine_RemoveDelayedRemoves", _wrap_iEngine_RemoveDelayedRemoves, METH_VARARGS, NULL}, { (char *)"iEngine_DeleteAll", _wrap_iEngine_DeleteAll, METH_VARARGS, NULL}, { (char *)"iEngine_ResetWorldSpecificSettings", _wrap_iEngine_ResetWorldSpecificSettings, METH_VARARGS, NULL}, { (char *)"delete_iEngine", _wrap_delete_iEngine, METH_VARARGS, NULL}, Modified: CS/trunk/scripts/perl5/cspace.pm =================================================================== --- CS/trunk/scripts/perl5/cspace.pm 2006-09-11 13:11:02 UTC (rev 25328) +++ CS/trunk/scripts/perl5/cspace.pm 2006-09-12 01:17:52 UTC (rev 25329) @@ -5794,6 +5794,8 @@ *GetCollections = *cspacec::iEngine_GetCollections; *FindCollection = *cspacec::iEngine_FindCollection; *RemoveObject = *cspacec::iEngine_RemoveObject; +*DelayedRemoveObject = *cspacec::iEngine_DelayedRemoveObject; +*RemoveDelayedRemoves = *cspacec::iEngine_RemoveDelayedRemoves; *DeleteAll = *cspacec::iEngine_DeleteAll; *ResetWorldSpecificSettings = *cspacec::iEngine_ResetWorldSpecificSettings; sub DESTROY { Modified: CS/trunk/scripts/perl5/cswigpl5.inc =================================================================== --- CS/trunk/scripts/perl5/cswigpl5.inc 2006-09-11 13:11:02 UTC (rev 25328) +++ CS/trunk/scripts/perl5/cswigpl5.inc 2006-09-12 01:17:52 UTC (rev 25329) @@ -116180,6 +116180,192 @@ } +XS(_wrap_iEngine_DelayedRemoveObject) { + { + iEngine *arg1 = (iEngine *) 0 ; + csTicks arg2 ; + iBase *arg3 = (iBase *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + unsigned int val2 ; + int ecode2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 3) || (items > 3)) { + SWIG_croak("Usage: iEngine_DelayedRemoveObject(self,delay,object);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iEngine, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iEngine_DelayedRemoveObject" "', argument " "1"" of type '" "iEngine *""'"); + } + arg1 = reinterpret_cast<iEngine * >(argp1); + ecode2 = SWIG_AsVal_unsigned_SS_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iEngine_DelayedRemoveObject" "', argument " "2"" of type '" "csTicks""'"); + } + arg2 = static_cast<csTicks >(val2); + res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_iBase, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "iEngine_DelayedRemoveObject" "', argument " "3"" of type '" "iBase *""'"); + } + arg3 = reinterpret_cast<iBase * >(argp3); + (arg1)->DelayedRemoveObject(arg2,arg3); + + + + + + XSRETURN(argvi); + fail: + + + + SWIG_croak_null(); + } +} + + +XS(_wrap_iEngine_RemoveDelayedRemoves__SWIG_0) { + { + iEngine *arg1 = (iEngine *) 0 ; + bool arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + bool val2 ; + int ecode2 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: iEngine_RemoveDelayedRemoves(self,remove);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iEngine, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iEngine_RemoveDelayedRemoves" "', argument " "1"" of type '" "iEngine *""'"); + } + arg1 = reinterpret_cast<iEngine * >(argp1); + ecode2 = SWIG_AsVal_bool SWIG_PERL_CALL_ARGS_2(ST(1), &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iEngine_RemoveDelayedRemoves" "', argument " "2"" of type '" "bool""'"); + } + arg2 = static_cast<bool >(val2); + (arg1)->RemoveDelayedRemoves(arg2); + + + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } +} + + +XS(_wrap_iEngine_RemoveDelayedRemoves__SWIG_1) { + { + iEngine *arg1 = (iEngine *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: iEngine_RemoveDelayedRemoves(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_iEngine, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iEngine_RemoveDelayedRemoves" "', argument " "1"" of type '" "iEngine *""'"); + } + arg1 = reinterpret_cast<iEngine * >(argp1); + (arg1)->RemoveDelayedRemoves(); + + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + +XS(_wrap_iEngine_RemoveDelayedRemoves) { + dXSARGS; + + { + unsigned long _index = 0; + SWIG_TypeRank _rank = 0; + if (items == 1) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_iEngine, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 1; + if (_rank == _rankm) goto dispatch; + } + } + check_1: + + if (items == 2) { + SWIG_TypeRank _ranki = 0; + SWIG_TypeRank _rankm = 0; + SWIG_TypeRank _pi = 1; + int _v = 0; + { + void *vptr = 0; + int res = SWIG_ConvertPtr(ST(0), &vptr, SWIGTYPE_p_iEngine, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + { + { + int res = SWIG_AsVal_bool SWIG_PERL_CALL_ARGS_2(ST(1), NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_2; + _ranki += _v*_pi; + _rankm += _pi; + _pi *= SWIG_MAXCASTRANK; + if (!_index || (_ranki < _rank)) { + _rank = _ranki; _index = 2; + if (_rank == _rankm) goto dispatch; + } + } + check_2: + + dispatch: + switch(_index) { + case 1: + (*PL_markstack_ptr++);SWIG_CALLXS(_wrap_iEngine_RemoveDelayedRemoves__SWIG_1); return; + case 2: + (*PL_markstack_ptr++);SWIG_CALLXS(_wrap_iEngine_RemoveDelayedRemoves__SWIG_0); return; + } + } + + croak("No matching function for overloaded 'iEngine_RemoveDelayedRemoves'"); + XSRETURN(0); +} + + XS(_wrap_iEngine_DeleteAll) { { iEngine *arg1 = (iEngine *) 0 ; @@ -287928,6 +288114,8 @@ {"cspacec::iEngine_GetCollections", _wrap_iEngine_GetCollections}, {"cspacec::iEngine_FindCollection", _wrap_iEngine_FindCollection}, {"cspacec::iEngine_RemoveObject", _wrap_iEngine_RemoveObject}, +{"cspacec::iEngine_DelayedRemoveObject", _wrap_iEngine_DelayedRemoveObject}, +{"cspacec::iEngine_RemoveDelayedRemoves", _wrap_iEngine_RemoveDelayedRemoves}, {"cspacec::iEngine_DeleteAll", _wrap_iEngine_DeleteAll}, {"cspacec::iEngine_ResetWorldSpecificSettings", _wrap_iEngine_ResetWorldSpecificSettings}, {"cspacec::delete_iEngine", _wrap_delete_iEngine}, Modified: CS/trunk/scripts/python/cspace.py =================================================================== --- CS/trunk/scripts/python/cspace.py 2006-09-11 13:11:02 UTC (rev 25328) +++ CS/trunk/scripts/python/cspace.py 2006-09-12 01:17:52 UTC (rev 25329) @@ -4101,6 +4101,8 @@ def GetCollections(*args): return _cspace.iEngine_GetCollections(*args) def FindCollection(*args): return _cspace.iEngine_FindCollection(*args) def RemoveObject(*args): return _cspace.iEngine_RemoveObject(*args) + def DelayedRemoveObject(*args): return _cspace.iEngine_DelayedRemoveObject(*args) + def RemoveDelayedRemoves(*args): return _cspace.iEngine_RemoveDelayedRemoves(*args) def DeleteAll(*args): return _cspace.iEngine_DeleteAll(*args) def ResetWorldSpecificSettings(*args): return _cspace.iEngine_ResetWorldSpecificSettings(*args) __swig_destroy__ = _cspace.delete_iEngine This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2006-09-12 07:42:39
|
Revision: 25330 http://svn.sourceforge.net/crystal/?rev=25330&view=rev Author: jorrit Date: 2006-09-12 00:42:30 -0700 (Tue, 12 Sep 2006) Log Message: ----------- - Jorrit fixed a bug with iSector->HitBeamPortals(). It was broken and failed to detect the correct destination sector. Modified Paths: -------------- CS/trunk/docs/history.txt CS/trunk/plugins/engine/3d/portal.cpp Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-12 01:17:52 UTC (rev 25329) +++ CS/trunk/docs/history.txt 2006-09-12 07:42:30 UTC (rev 25330) @@ -6,6 +6,9 @@ individual changes for each given day, however, are in normal (ascending) chronological order. +12-Sep-2006 + - Jorrit fixed a bug with iSector->HitBeamPortals(). It was + broken and failed to detect the correct destination sector. 11-Sep-2006 - Marten fixed (hopefully) the script building (with Swig) on both older swigs and for jobber. Modified: CS/trunk/plugins/engine/3d/portal.cpp =================================================================== --- CS/trunk/plugins/engine/3d/portal.cpp 2006-09-12 01:17:52 UTC (rev 25329) +++ CS/trunk/plugins/engine/3d/portal.cpp 2006-09-12 07:42:30 UTC (rev 25330) @@ -511,16 +511,17 @@ csVector3 new_start = warp_wor.Other2This (start); csVector3 new_end = warp_wor.Other2This (end); csSectorHitBeamResult hbresult = sector->HitBeamPortals (new_start, new_end); - final_sector = &hbresult.final_sector; + if (final_sector) *final_sector = hbresult.final_sector; - if (hbresult.mesh && hbresult.polygon_idx != -1) isect = warp_wor.This2Other (hbresult.isect); + if (hbresult.mesh && hbresult.polygon_idx != -1) + isect = warp_wor.This2Other (hbresult.isect); if (hbresult.mesh && polygon_idx) *polygon_idx = hbresult.polygon_idx; return hbresult.mesh; } else { csSectorHitBeamResult hbresult = sector->HitBeamPortals (start, end); - final_sector = &hbresult.final_sector; + if (final_sector) *final_sector = hbresult.final_sector; if (hbresult.mesh && polygon_idx) *polygon_idx = hbresult.polygon_idx; return hbresult.mesh; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-12 10:00:55
|
Revision: 25332 http://svn.sourceforge.net/crystal/?rev=25332&view=rev Author: thebolt00 Date: 2006-09-12 03:00:36 -0700 (Tue, 12 Sep 2006) Log Message: ----------- - Marten fixed csColor4 for operators + - * and /. Modified Paths: -------------- CS/trunk/apps/walktest/walkdemo.cpp CS/trunk/docs/history.txt CS/trunk/include/csutil/cscolor.h CS/trunk/plugins/mesh/genmesh/anim/gmeshanim.cpp CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp Modified: CS/trunk/apps/walktest/walkdemo.cpp =================================================================== --- CS/trunk/apps/walktest/walkdemo.cpp 2006-09-12 09:59:47 UTC (rev 25331) +++ CS/trunk/apps/walktest/walkdemo.cpp 2006-09-12 10:00:36 UTC (rev 25332) @@ -277,7 +277,7 @@ return; } -#if 0 +#if 1 csRef<iMeshFactoryWrapper> mfw = Sys->view->GetEngine ()-> CreateMeshFactory ("crystalspace.mesh.object.particles", "explosion"); if (!mfw) return; @@ -287,11 +287,14 @@ sector, center)); exp->SetZBufMode(CS_ZBUF_TEST); + exp->GetMeshObject ()->SetMixMode (CS_FX_ALPHA); + exp->SetRenderPriority (engine->GetAlphaRenderPriority ()); csRef<iParticleSystem> partstate = scfQueryInterface<iParticleSystem> (exp->GetMeshObject ()); exp->GetMeshObject()->SetMaterialWrapper (mat); + //partstate->SetMixMode (CS_FX_SETALPHA (0.50)); exp->GetMeshObject()->SetColor (csColor (1, 1, 0)); Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-12 09:59:47 UTC (rev 25331) +++ CS/trunk/docs/history.txt 2006-09-12 10:00:36 UTC (rev 25332) @@ -9,6 +9,7 @@ 12-Sep-2006 - Jorrit fixed a bug with iSector->HitBeamPortals(). It was broken and failed to detect the correct destination sector. + - Marten fixed csColor4 for operators + - * and /. 11-Sep-2006 - Marten fixed (hopefully) the script building (with Swig) on both older swigs and for jobber. Modified: CS/trunk/include/csutil/cscolor.h =================================================================== --- CS/trunk/include/csutil/cscolor.h 2006-09-12 09:59:47 UTC (rev 25331) +++ CS/trunk/include/csutil/cscolor.h 2006-09-12 10:00:36 UTC (rev 25332) @@ -117,6 +117,22 @@ v1.blue * v2.blue); } + +/// Multiply a color by a scalar value. +inline csColor operator* (const csColor& s, float f) +{ csColor c (s); c *= f; return c; } + +/// Multiply a scalar value by a color. +inline csColor operator* (float f, const csColor& s) +{ csColor c (s); c *= f; return c; } + +/// Add two colors. +inline csColor operator+ (const csColor& s1, const csColor& s2) +{ csColor c (s1); c += s2; return c; } +/// Subtract two colors. +inline csColor operator- (const csColor& s1, const csColor& s2) +{ csColor c (s1); c -= s2; return c; } + /** * A class used to represent a color in RGBA space. */ @@ -217,19 +233,32 @@ } }; + +/// Divide a color by a scalar. +inline csColor4 operator/ (const csColor4& v, float f) +{ f = 1.0f/f; return csColor4(v.red*f, v.green*f, v.blue*f); } +/// Multiply two colors. +inline csColor4 operator* (const csColor4& v1, const csColor4& v2) +{ + return csColor4 (v1.red * v2.red, + v1.green * v2.green, + v1.blue * v2.blue); +} + + /// Multiply a color by a scalar value. -inline csColor operator* (const csColor& s, float f) -{ csColor c (s); c *= f; return c; } +inline csColor4 operator* (const csColor4& s, float f) +{ csColor4 c (s); c *= f; return c; } /// Multiply a scalar value by a color. -inline csColor operator* (float f, const csColor& s) -{ csColor c (s); c *= f; return c; } +inline csColor4 operator* (float f, const csColor4& s) +{ csColor4 c (s); c *= f; return c; } /// Add two colors. -inline csColor operator+ (const csColor& s1, const csColor& s2) -{ csColor c (s1); c += s2; return c; } +inline csColor4 operator+ (const csColor4& s1, const csColor4& s2) +{ csColor4 c (s1); c += s2; return c; } /// Subtract two colors. -inline csColor operator- (const csColor& s1, const csColor& s2) -{ csColor c (s1); c -= s2; return c; } +inline csColor4 operator- (const csColor4& s1, const csColor4& s2) +{ csColor4 c (s1); c -= s2; return c; } #endif // __CS_CSCOLOR_H__ Modified: CS/trunk/plugins/mesh/genmesh/anim/gmeshanim.cpp =================================================================== --- CS/trunk/plugins/mesh/genmesh/anim/gmeshanim.cpp 2006-09-12 09:59:47 UTC (rev 25331) +++ CS/trunk/plugins/mesh/genmesh/anim/gmeshanim.cpp 2006-09-12 10:00:36 UTC (rev 25332) @@ -278,7 +278,7 @@ ac_color_execution m; m.final = current + inst.color.duration; m.group = groups[inst.color.group_id]; - csColor4 current_col = m.group->GetColor (); + csColor current_col = m.group->GetColor (); m.final_color.Set (inst.color.red, inst.color.green, inst.color.blue); if (inst.color.duration == 0) Modified: CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp =================================================================== --- CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp 2006-09-12 09:59:47 UTC (rev 25331) +++ CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp 2006-09-12 10:00:36 UTC (rev 25332) @@ -886,7 +886,7 @@ lighting_dirty = false; mesh_colors_dirty_flag = true; - csColor col; + csColor4 col; if (factory->engine) { factory->engine->GetAmbientLight (col); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2006-09-12 11:15:07
|
Revision: 25333 http://svn.sourceforge.net/crystal/?rev=25333&view=rev Author: jorrit Date: 2006-09-12 04:14:57 -0700 (Tue, 12 Sep 2006) Log Message: ----------- - Jorrit changed walktest to use new particles for explosion. Modified Paths: -------------- CS/trunk/apps/walktest/walkdemo.cpp CS/trunk/docs/history.txt Modified: CS/trunk/apps/walktest/walkdemo.cpp =================================================================== --- CS/trunk/apps/walktest/walkdemo.cpp 2006-09-12 10:00:36 UTC (rev 25332) +++ CS/trunk/apps/walktest/walkdemo.cpp 2006-09-12 11:14:57 UTC (rev 25333) @@ -294,8 +294,7 @@ csRef<iParticleSystem> partstate = scfQueryInterface<iParticleSystem> (exp->GetMeshObject ()); exp->GetMeshObject()->SetMaterialWrapper (mat); - - //partstate->SetMixMode (CS_FX_SETALPHA (0.50)); + exp->GetMeshObject()->SetMixMode (CS_FX_ALPHA); exp->GetMeshObject()->SetColor (csColor (1, 1, 0)); csRef<iParticleBuiltinEmitterFactory> emit_factory = @@ -318,7 +317,7 @@ csRef<iParticleBuiltinEffectorLinColor> lincol = eff_factory-> CreateLinColor (); - lincol->AddColor (csColor4 (1,1,1,1), 0.5f); + lincol->AddColor (csColor4 (1,1,1,1), 1.0f); lincol->AddColor (csColor4 (1,1,1,0), 0.0f); partstate->SetParticleSize (csVector2 (0.15f, 0.15f)); Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-12 10:00:36 UTC (rev 25332) +++ CS/trunk/docs/history.txt 2006-09-12 11:14:57 UTC (rev 25333) @@ -10,6 +10,7 @@ - Jorrit fixed a bug with iSector->HitBeamPortals(). It was broken and failed to detect the correct destination sector. - Marten fixed csColor4 for operators + - * and /. + - Jorrit changed walktest to use new particles for explosion. 11-Sep-2006 - Marten fixed (hopefully) the script building (with Swig) on both older swigs and for jobber. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kir...@us...> - 2006-09-12 18:18:16
|
Revision: 25334 http://svn.sourceforge.net/crystal/?rev=25334&view=rev Author: kirchdorfer Date: 2006-09-12 11:17:59 -0700 (Tue, 12 Sep 2006) Log Message: ----------- Extending the ice-skin for tabbuttons. Modified Paths: -------------- CS/trunk/data/ceguitest/0.5/ice.imageset CS/trunk/data/ceguitest/0.5/ice.looknfeel CS/trunk/docs/history.txt Modified: CS/trunk/data/ceguitest/0.5/ice.imageset =================================================================== --- CS/trunk/data/ceguitest/0.5/ice.imageset 2006-09-12 11:14:57 UTC (rev 25333) +++ CS/trunk/data/ceguitest/0.5/ice.imageset 2006-09-12 18:17:59 UTC (rev 25334) @@ -145,24 +145,24 @@ <Image Name="StaticBottomLeft" XPos="100" YPos="166" Width="10" Height="10" /> <Image Name="StaticBottom" XPos="118" YPos="166" Width="10" Height="10" /> <Image Name="StaticBottomRight" XPos="136" YPos="166" Width="10" Height="10" /> -<Image Name="TabButtonUpperLeftNormal" XPos="10" YPos="10" Width="10" Height="10" /> -<Image Name="TabButtonUpperNormal" XPos="20" YPos="10" Width="10" Height="10" /> -<Image Name="TabButtonUpperRightNormal" XPos="30" YPos="10" Width="10" Height="10" /> -<Image Name="TabButtonLeftNormal" XPos="10" YPos="20" Width="10" Height="10" /> -<Image Name="TabButtonMiddleNormal" XPos="20" YPos="20" Width="10" Height="10" /> -<Image Name="TabButtonRightNormal" XPos="30" YPos="20" Width="10" Height="10" /> -<Image Name="TabButtonLowerLeftNormal" XPos="10" YPos="30" Width="10" Height="10" /> -<Image Name="TabButtonLowerNormal" XPos="20" YPos="30" Width="10" Height="10" /> -<Image Name="TabButtonLowerRightNormal" XPos="30" YPos="30" Width="10" Height="10" /> -<Image Name="TabButtonUpperLeftSelected" XPos="10" YPos="10" Width="10" Height="10" /> -<Image Name="TabButtonUpperSelected" XPos="20" YPos="10" Width="10" Height="10" /> -<Image Name="TabButtonUpperRightSelected" XPos="30" YPos="10" Width="10" Height="10" /> -<Image Name="TabButtonLeftSelected" XPos="10" YPos="20" Width="10" Height="10" /> -<Image Name="TabButtonMiddleSelected" XPos="20" YPos="20" Width="10" Height="10" /> -<Image Name="TabButtonRightSelected" XPos="30" YPos="20" Width="10" Height="10" /> -<Image Name="TabButtonLowerLeftSelected" XPos="10" YPos="30" Width="10" Height="10" /> -<Image Name="TabButtonLowerSelected" XPos="20" YPos="30" Width="10" Height="10" /> -<Image Name="TabButtonLowerRightSelected" XPos="30" YPos="30" Width="10" Height="10" /> +<Image Name="TabButtonUpperLeftNormal" XPos="102" YPos="3" Width="4" Height="6" /> +<Image Name="TabButtonUpperNormal" XPos="107" YPos="3" Width="5" Height="6" /> +<Image Name="TabButtonUpperRightNormal" XPos="145" YPos="3" Width="4" Height="6" /> +<Image Name="TabButtonLeftNormal" XPos="102" YPos="8" Width="4" Height="4" /> +<Image Name="TabButtonMiddleNormal" XPos="107" YPos="8" Width="5" Height="4" /> +<Image Name="TabButtonRightNormal" XPos="145" YPos="8" Width="4" Height="4" /> +<Image Name="TabButtonLowerLeftNormal" XPos="102" YPos="12" Width="4" Height="4" /> +<Image Name="TabButtonLowerNormal" XPos="107" YPos="12" Width="5" Height="4" /> +<Image Name="TabButtonLowerRightNormal" XPos="145" YPos="12" Width="4" Height="4" /> +<Image Name="TabButtonUpperLeftSelected" XPos="102" YPos="21" Width="4" Height="6" /> +<Image Name="TabButtonUpperSelected" XPos="107" YPos="21" Width="5" Height="6" /> +<Image Name="TabButtonUpperRightSelected" XPos="145" YPos="21" Width="4" Height="6" /> +<Image Name="TabButtonLeftSelected" XPos="102" YPos="26" Width="4" Height="4" /> +<Image Name="TabButtonMiddleSelected" XPos="107" YPos="26" Width="5" Height="4" /> +<Image Name="TabButtonRightSelected" XPos="145" YPos="26" Width="4" Height="4" /> +<Image Name="TabButtonLowerLeftSelected" XPos="120" YPos="30" Width="4" Height="4" /> +<Image Name="TabButtonLowerSelected" XPos="107" YPos="30" Width="5" Height="4" /> +<Image Name="TabButtonLowerRightSelected" XPos="145" YPos="30" Width="4" Height="4" /> <Image Name="TabControlButtonPaneFiller" XPos="10" YPos="10" Width="10" Height="10" /> <Image Name="TabPaneLeft" XPos="10" YPos="10" Width="10" Height="10" /> <Image Name="TabPaneMiddle" XPos="20" YPos="10" Width="10" Height="10" /> Modified: CS/trunk/data/ceguitest/0.5/ice.looknfeel =================================================================== --- CS/trunk/data/ceguitest/0.5/ice.looknfeel 2006-09-12 11:14:57 UTC (rev 25333) +++ CS/trunk/data/ceguitest/0.5/ice.looknfeel 2006-09-12 18:17:59 UTC (rev 25334) @@ -3090,10 +3090,10 @@ *************************************************** --> <WidgetLook name="ice/TabButton"> - <PropertyDefinition name="NormalTextColour" initialValue="FFFFFFFF" redrawOnWrite="true" /> - <PropertyDefinition name="HoverTextColour" initialValue="FFFFFFFF" redrawOnWrite="true" /> + <PropertyDefinition name="NormalTextColour" initialValue="FF000000" redrawOnWrite="true" /> + <PropertyDefinition name="HoverTextColour" initialValue="FF000000" redrawOnWrite="true" /> <PropertyDefinition name="PushedTextColour" initialValue="FFFFFFFF" redrawOnWrite="true" /> - <PropertyDefinition name="DisabledTextColour" initialValue="FF7F7F7F" redrawOnWrite="true" /> + <PropertyDefinition name="DisabledTextColour" initialValue="FF888888" redrawOnWrite="true" /> <ImagerySection name="label"> <TextComponent> <Area> @@ -3980,4 +3980,3 @@ </WidgetLook> </Falagard> - Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-12 11:14:57 UTC (rev 25333) +++ CS/trunk/docs/history.txt 2006-09-12 18:17:59 UTC (rev 25334) @@ -11,6 +11,7 @@ broken and failed to detect the correct destination sector. - Marten fixed csColor4 for operators + - * and /. - Jorrit changed walktest to use new particles for explosion. + - PK extended the ice-skin for tabbuttons. 11-Sep-2006 - Marten fixed (hopefully) the script building (with Swig) on both older swigs and for jobber. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-09-14 21:07:39
|
Revision: 25337 http://svn.sourceforge.net/crystal/?rev=25337&view=rev Author: genjix Date: 2006-09-14 14:07:26 -0700 (Thu, 14 Sep 2006) Log Message: ----------- GetTuple() and SetTuple() for storing and getting lists of variable items in config files. Modified Paths: -------------- CS/trunk/docs/history.txt CS/trunk/include/csutil/cfgdoc.h CS/trunk/include/csutil/cfgfile.h CS/trunk/include/csutil/cfgmgr.h CS/trunk/include/iutil/cfgfile.h CS/trunk/libs/csutil/cfgdoc.cpp CS/trunk/libs/csutil/cfgfile.cpp CS/trunk/libs/csutil/cfgmgr.cpp Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-13 12:31:23 UTC (rev 25336) +++ CS/trunk/docs/history.txt 2006-09-14 21:07:26 UTC (rev 25337) @@ -6,6 +6,9 @@ individual changes for each given day, however, are in normal (ascending) chronological order. +14-Sep-2006 + - Genjix added iConfigFile GetTuple() and SetTuple(), for storing + and getting a list of variable objects in config files. 12-Sep-2006 - Jorrit fixed a bug with iSector->HitBeamPortals(). It was broken and failed to detect the correct destination sector. @@ -13,7 +16,7 @@ - Jorrit changed walktest to use new particles for explosion. - PK extended the ice-skin for tabbuttons. 11-Sep-2006 - - Marten fixed (hopefully) the script building (with Swig) on both + - Marten fixed (hopefully) the script building (with Swig) on both older swigs and for jobber. - Jorrit fixed a bug in particles and particlesldr. It would initialize start time to -1 which caused particles to fail on @@ -47,7 +50,7 @@ - res put the FBO stencil support into preprocessor conditionals (and also noted the current state of stencil attachment support). - res fixed a couple of gcc 4.1 optimize warnings. - - res fixed _cspace.so.dbg being tried to be split off before + - res fixed _cspace.so.dbg being tried to be split off before _cspace.so is built when installing. Fixes trac #11. - res added debug info splitting for the CS JNI library. - res changed ptpdlight to #include <limits.h> as per SFbug:1546141. @@ -63,14 +66,14 @@ destruction of Crystal Space. - res fixed an issue with the Java bindings where symbols didn't get exported properly from the JNI glue shared library due being hidden - by -fvisibility=hidden. Worked around that by also specifying + by -fvisibility=hidden. Worked around that by also specifying -fvisibility=default when compiling the JNI glue, causing the symbols to get exported correctly again. - res disabled strict aliasing when compiling the Java JNI glue. This fixes some issues in release builds. - res fixed some errors having crept into SimpleRoom.java when it was updated to work with latest CS. - - Marten made a small SWIG-tweak to shut up an error from newer + - Marten made a small SWIG-tweak to shut up an error from newer SWIG versions. - Marten made partconv not crash. - Marten converted nullmesh to new SCF syntax. @@ -84,9 +87,9 @@ - res changed the --as-needed check to (a) only use --as-needed for newer binutils versions (b) disable it by default. 2-Sep-2006 - - Marten fixed [ticket:7], invalid alpha modifier in shader + - Marten fixed [ticket:7], invalid alpha modifier in shader light.xml technique 150. - - Marten rewrote the OpenGL pixel format picker to enumerate + - Marten rewrote the OpenGL pixel format picker to enumerate all the values in strictly decreasing order. This should solve ticket:1. 31-Aug-2006 @@ -114,7 +117,7 @@ is not always added as a library search path. This may cause issues when the user manually specifies paths for some libraries, since then the Python linker flags cause e.g. /usr/lib to be scanned and - libraries errorneously taken from there. Instead, only add + libraries errorneously taken from there. Instead, only add sysprefix-based paths when needed. - res added support for response files when shared libs are enabled. They're used if supported by the linker. @@ -145,7 +148,7 @@ - Marten fixed csRefArray so that operator[] and Get (..) works as intended and don't cause refcounting errors. Bug 1487132. - Marten fixed his last commit to work on gcc too. One caveat with - current approach is that you cannot assign directly from a + current approach is that you cannot assign directly from a csRefArray::operator[] to a new csRef, you need to construct it (provide an explicit construction). No inefficiency, just some extra syntax. Modified: CS/trunk/include/csutil/cfgdoc.h =================================================================== --- CS/trunk/include/csutil/cfgdoc.h 2006-09-13 12:31:23 UTC (rev 25336) +++ CS/trunk/include/csutil/cfgdoc.h 2006-09-14 21:07:26 UTC (rev 25337) @@ -36,7 +36,7 @@ * iConfigFile implementation for configurations stored in documents. * \todo Write support */ -class CS_CRYSTALSPACE_EXPORT csConfigDocument : +class CS_CRYSTALSPACE_EXPORT csConfigDocument : public scfImplementation1<csConfigDocument,iConfigFile> { friend class csConfigDocumentIterator; @@ -71,16 +71,16 @@ void ParseDocument (iDocument* doc, bool Merge = false, bool NewWins = true); - void ParseNode (const char* parent, iDocumentNode* node, + void ParseNode (const char* parent, iDocumentNode* node, bool NewWins = true); public: - + csConfigDocument (); csConfigDocument (const char *Filename, iVFS* = 0); csConfigDocument (iDocument* doc); csConfigDocument (iDocumentNode* node); virtual ~csConfigDocument(); - + virtual const char* GetFileName () const; virtual iVFS* GetVFS () const; @@ -106,12 +106,14 @@ virtual float GetFloat (const char *Key, float Def = 0.0) const; virtual const char *GetStr (const char *Key, const char *Def = "") const; virtual bool GetBool (const char *Key, bool Def = false) const; + virtual csPtr<iStringArray> GetTuple(const char *Key) const; virtual const char *GetComment (const char *Key) const; virtual void SetStr (const char *Key, const char *Val); virtual void SetInt (const char *Key, int Value); virtual void SetFloat (const char *Key, float Value); virtual void SetBool (const char *Key, bool Value); + virtual void SetTuple (const char *Key, csRef<iStringArray> Value); virtual bool SetComment (const char *Key, const char *Text); virtual void DeleteKey (const char *Key); virtual const char *GetEOFComment () const; Modified: CS/trunk/include/csutil/cfgfile.h =================================================================== --- CS/trunk/include/csutil/cfgfile.h 2006-09-13 12:31:23 UTC (rev 25336) +++ CS/trunk/include/csutil/cfgfile.h 2006-09-14 21:07:26 UTC (rev 25337) @@ -36,7 +36,7 @@ /** * Configuration file which implements the iConfigFile SCF interface. */ -class CS_CRYSTALSPACE_EXPORT csConfigFile : +class CS_CRYSTALSPACE_EXPORT csConfigFile : public scfImplementation1<csConfigFile, iConfigFile> { public: @@ -67,10 +67,10 @@ /** * Load a configuration file. - * + * * If the file resides in a real filesystem, rather than a VFS filesystem, * then pass 0 for the VFS argument. - * + * * You can set the Merge flag to merge the newly loaded configuration * information into the existing information. If you do so, nothing will * happen if the named file doesn't exist. The NewWins flag determines @@ -121,6 +121,8 @@ virtual const char *GetStr(const char *Key, const char *Def = "") const; /// Get a boolean value from the configuration. virtual bool GetBool(const char *Key, bool Def = false) const; + /// Get a tuple set from the configuration. + virtual csPtr<iStringArray> GetTuple(const char *Key) const; /// Get the comment of the given key, or 0 if no comment exists. virtual const char *GetComment(const char *Key) const; @@ -132,6 +134,8 @@ virtual void SetFloat (const char *Key, float Value); /// Set a boolean value. virtual void SetBool (const char *Key, bool Value); + /// Set a tuple value. + virtual void SetTuple (const char *Key, csRef<iStringArray> Value); /** * Set the comment for given key. In addition to an actual comment, you can * use "" for Text to place an empty comment line before this key, or 0 to @@ -148,10 +152,10 @@ /** * Parse the command line for configuration options. - * Recognized are the <tt>-cfgset</tt> parameters, which sets a single + * Recognized are the <tt>-cfgset</tt> parameters, which sets a single * setting, and <tt>-cfgfile</tt>, which reads settings from the specified file. * - * The meanings of the \p vfs, \p Merge and \p NewWins arguments are the + * The meanings of the \p vfs, \p Merge and \p NewWins arguments are the * same as for Load(). */ virtual void ParseCommandLine (iCommandLineParser* cmdline, iVFS* vfs, Modified: CS/trunk/include/csutil/cfgmgr.h =================================================================== --- CS/trunk/include/csutil/cfgmgr.h 2006-09-13 12:31:23 UTC (rev 25336) +++ CS/trunk/include/csutil/cfgmgr.h 2006-09-14 21:07:26 UTC (rev 25337) @@ -20,7 +20,7 @@ #define __CS_CFGMGR_H__ /**\file - * Implementation for iConfigManager + * Implementation for iConfigManager */ #include "csextern.h" @@ -37,8 +37,8 @@ * appear to be a single configuration object. See the description of the * iConfigManager interface for full details. */ -class CS_CRYSTALSPACE_EXPORT csConfigManager - : public scfImplementation2<csConfigManager, +class CS_CRYSTALSPACE_EXPORT csConfigManager + : public scfImplementation2<csConfigManager, iConfigManager, scfFakeInterface<iConfigFile> > { @@ -115,7 +115,7 @@ * registered, then false is returned. */ virtual bool SetDynamicDomain(iConfigFile*); - /** + /** * Return a pointer to the dynamic configuration domain. The returned * pointer will remain valid as long as the domain is registered with the * configuration manager. @@ -209,6 +209,8 @@ virtual const char *GetStr(const char *Key, const char *Def = "") const; /// Get a boolean value from the configuration. virtual bool GetBool(const char *Key, bool Def = false) const; + /// Get a tuple set from the configuration. + virtual csPtr<iStringArray> GetTuple(const char *Key) const; /// Get the comment of the given key, or 0 if no comment exists. virtual const char *GetComment(const char *Key) const; @@ -220,6 +222,8 @@ virtual void SetFloat (const char *Key, float Value); /// Set a boolean value. virtual void SetBool (const char *Key, bool Value); + /// Set a tuple value. + virtual void SetTuple (const char *Key, csRef<iStringArray> Value); /** * Set the comment for given key. In addition to an actual comment, you can * use "" for Text to place an empty comment line before this key, or 0 to Modified: CS/trunk/include/iutil/cfgfile.h =================================================================== --- CS/trunk/include/iutil/cfgfile.h 2006-09-13 12:31:23 UTC (rev 25336) +++ CS/trunk/include/iutil/cfgfile.h 2006-09-14 21:07:26 UTC (rev 25337) @@ -119,6 +119,8 @@ * value (Def parameter) will be used if the key was not found. */ virtual bool GetBool (const char *Key, bool Def = false) const = 0; + /// Get a tuple set from the configuration. + virtual csPtr<iStringArray> GetTuple(const char *Key) const = 0; /// Get the comment of the given key, or 0 if no comment exists. virtual const char *GetComment (const char *Key) const = 0; @@ -130,6 +132,8 @@ virtual void SetFloat (const char *Key, float Value) = 0; /// Set a boolean value. virtual void SetBool (const char *Key, bool Value) = 0; + /// Set a tuple value. + virtual void SetTuple (const char *Key, csRef<iStringArray> Value) = 0; /** * Set the comment for given key. In addition to an actual comment, you can * use "" for Text to place an empty comment line before this key, or 0 to Modified: CS/trunk/libs/csutil/cfgdoc.cpp =================================================================== --- CS/trunk/libs/csutil/cfgdoc.cpp 2006-09-13 12:31:23 UTC (rev 25336) +++ CS/trunk/libs/csutil/cfgdoc.cpp 2006-09-14 21:07:26 UTC (rev 25337) @@ -39,7 +39,7 @@ csConfigDocumentIterator (csConfigDocument* doc, const char* Subsection); virtual ~csConfigDocumentIterator(); - + virtual iConfigFile *GetConfigFile () const; virtual const char *GetSubsection () const; @@ -50,17 +50,18 @@ virtual float GetFloat () const; virtual const char *GetStr () const; virtual bool GetBool () const; + virtual csPtr<iStringArray> GetTuple() const; virtual const char *GetComment () const; }; csConfigDocumentIterator::csConfigDocumentIterator (csConfigDocument* d, - const char* Subsection) + const char* Subsection) : scfImplementationType (this), doc (d), currentKey (0), currentKeyName(0) { subsection = csStrNew (Subsection); subsectionLen = subsection ? strlen (subsection) : 0; - iterator = new csHash<csConfigDocument::KeyInfo, + iterator = new csHash<csConfigDocument::KeyInfo, csStrKey>::GlobalIterator (doc->keys.GetIterator ()); } @@ -115,7 +116,7 @@ { if (!currentKey) return 0; const char* val = currentKey->cachedStringValue; - + int v = 0; sscanf (val, "%d", &v); return v; @@ -125,7 +126,7 @@ { if (!currentKey) return 0.0f; const char* val = currentKey->cachedStringValue; - + float v = 0.0f; sscanf (val, "%f", &v); return v; @@ -149,6 +150,11 @@ strcasecmp(val, "1" ) == 0); } +csPtr<iStringArray> csConfigDocumentIterator::GetTuple () const +{ + return 0; +} + const char* csConfigDocumentIterator::GetComment () const { if (!currentKey) return 0; @@ -156,12 +162,12 @@ } //--------------------------------------------------------------------------- -csConfigDocument::csConfigDocument () +csConfigDocument::csConfigDocument () : scfImplementationType (this), filename(0) { } -csConfigDocument::csConfigDocument (const char *Filename, iVFS* vfs) +csConfigDocument::csConfigDocument (const char *Filename, iVFS* vfs) : scfImplementationType (this), filename(0), fileVFS(vfs) { filename = csStrNew (Filename); @@ -175,18 +181,18 @@ new csTinyDocumentSystem())); csRef<iDocument> doc (docsys->CreateDocument ()); doc->Parse (file, true); - + document = doc; ParseDocument (doc); } -csConfigDocument::csConfigDocument (iDocument* doc) +csConfigDocument::csConfigDocument (iDocument* doc) : scfImplementationType (this), filename(0), document (doc) { ParseDocument (doc); } -csConfigDocument::csConfigDocument (iDocumentNode* node) +csConfigDocument::csConfigDocument (iDocumentNode* node) : scfImplementationType (this), filename(0) { LoadNode (node); @@ -204,7 +210,7 @@ LoadNode (config, Merge, NewWins); } -void csConfigDocument::ParseNode (const char* parent, iDocumentNode* node, +void csConfigDocument::ParseNode (const char* parent, iDocumentNode* node, bool NewWins) { csString fullKey; @@ -322,7 +328,7 @@ const char* val = info ? info->cachedStringValue : 0; if (!val) return Def; - + int v = Def; sscanf (val, "%d", &v); return v; @@ -335,7 +341,7 @@ const char* val = info ? info->cachedStringValue : 0; if (!val) return Def; - + float v = Def; sscanf (val, "%f", &v); return v; @@ -347,7 +353,7 @@ const KeyInfo* info = keys.GetElementPointer ((const char*)dcKey); const char* val = info ? info->cachedStringValue : 0; if (!val) return Def; - + return val; } @@ -358,7 +364,7 @@ const char* val = info ? info->cachedStringValue : 0; if (!val) return Def; - + return ( strcasecmp(val, "true") == 0 || strcasecmp(val, "yes" ) == 0 || @@ -366,6 +372,11 @@ strcasecmp(val, "1" ) == 0); } +csPtr<iStringArray> csConfigDocument::GetTuple (const char *Key) const +{ + return 0; +} + const char* csConfigDocument::GetComment (const char *Key) const { csString dcKey (Key); dcKey.Downcase (); @@ -389,6 +400,10 @@ { } +void csConfigDocument::SetTuple (const char * /*Key*/, csRef<iStringArray> /*Value*/) +{ +} + bool csConfigDocument::SetComment (const char * /*Key*/, const char * /*Text*/) { return false; Modified: CS/trunk/libs/csutil/cfgfile.cpp =================================================================== --- CS/trunk/libs/csutil/cfgfile.cpp 2006-09-13 12:31:23 UTC (rev 25336) +++ CS/trunk/libs/csutil/cfgfile.cpp 2006-09-14 21:07:26 UTC (rev 25337) @@ -22,6 +22,7 @@ #include "csutil/databuf.h" #include "csutil/physfile.h" #include "csutil/scf_implementation.h" +#include "csutil/scfstringarray.h" #include "csutil/snprintf.h" #include "csutil/sysfunc.h" #include "csutil/util.h" @@ -51,12 +52,14 @@ void SetInt(int); void SetFloat(float); void SetBool(bool); + void SetTuple (csRef<iStringArray> Value); void SetComment(const char*); // get data const char *GetStr() const; int GetInt() const; float GetFloat() const; bool GetBool() const; + csPtr<iStringArray> GetTuple() const; const char *GetComment() const; // return prev and next node csConfigNode *GetPrev() const; @@ -150,6 +153,21 @@ SetStr(b ? "true" : "false"); } +void csConfigNode::SetTuple (csRef<iStringArray> Value) +{ + // this should output a string like + // abc, def, ghi + csString s; + while (!Value->IsEmpty ()) + { + csString i = Value->Pop (); + if (!Value->IsEmpty ()) + i.Append (", "); + s.Append(i); + } + SetStr (s); +} + void csConfigNode::SetComment(const char *s) { delete[] Comment; @@ -180,6 +198,38 @@ strcasecmp(Data, "1" ) == 0)); } +csPtr<iStringArray> csConfigNode::GetTuple() const +{ + if (!Data) + return 0; + + scfStringArray *items = new scfStringArray; // the output list + csString item; + + char *sinp = Data; + char *comp; + int len; + bool finished = false; + + while (!finished) + { + comp = strchr (sinp, ','); + if (!comp) + { + finished = true; + comp = &sinp [strlen (sinp)]; + } + len = strlen (sinp) - strlen (comp); + item = csString (sinp, len); + item.Trim (); + sinp = comp + 1; + items->Push (item); + } + + csPtr<iStringArray> v(items); + return v; +} + const char *csConfigNode::GetComment() const { return Comment; @@ -187,7 +237,7 @@ /* config iterator */ -class csConfigIterator : public scfImplementation1<csConfigIterator, +class csConfigIterator : public scfImplementation1<csConfigIterator, iConfigIterator> { public: @@ -217,6 +267,8 @@ virtual const char *GetStr() const; /// Get a boolean value from the configuration. virtual bool GetBool() const; + /// Get a tuple set from the configuration. + virtual csPtr<iStringArray> GetTuple() const; /// Get the comment of the given key, or 0 if no comment exists. virtual const char *GetComment() const; @@ -340,6 +392,11 @@ return Node->GetBool(); } +csPtr<iStringArray> csConfigIterator::GetTuple() const +{ + return Node->GetTuple(); +} + const char *csConfigIterator::GetComment() const { return Node->GetComment(); @@ -442,10 +499,10 @@ { if (!Dirty) return true; - + if (!SaveNow(Filename, VFS)) return false; - + Dirty = false; return true; } @@ -585,6 +642,12 @@ return Node ? Node->GetBool() : Def; } +csPtr<iStringArray> csConfigFile::GetTuple(const char *Key) const +{ + csConfigNode *Node = FindNode(Key); + return Node ? Node->GetTuple() : 0; +} + const char *csConfigFile::GetComment(const char *Key) const { csConfigNode *Node = FindNode(Key); @@ -642,6 +705,50 @@ } } +void csConfigFile::SetTuple (const char *Key, csRef<iStringArray> Value) +{ + csConfigNode *Node = FindNode(Key); + bool const Create = !Node; + if (Create) Node = CreateNode(Key); + + bool changed = false; + // This checks to see whether the thing + // we're saving is the same as the saved + if (Node) + { + csRef<iStringArray> sa = Node->GetTuple (); + // was the tuple valid ? + if (sa) + { + // its different if lengths differ + if (sa->Length () != Value->Length ()) + { + changed = true; + } + else + { + for (uint i = 0 ; i < sa->Length (); i++) + { + // found 2 different strings in tuple + if (sa->Get (i) != Value->Get (i)) + { + changed = true; + break; + } + } + } + } + else + changed = true; + } + + if (Node && (Create || changed)) + { + Node->SetTuple(Value); + Dirty = true; + } +} + bool csConfigFile::SetComment (const char *Key, const char *Text) { csConfigNode *Node = FindNode(Key); Modified: CS/trunk/libs/csutil/cfgmgr.cpp =================================================================== --- CS/trunk/libs/csutil/cfgmgr.cpp 2006-09-13 12:31:23 UTC (rev 25336) +++ CS/trunk/libs/csutil/cfgmgr.cpp 2006-09-14 21:07:26 UTC (rev 25337) @@ -21,6 +21,7 @@ #include "csutil/cfgmgr.h" #include "csutil/csstring.h" #include "csutil/scf_implementation.h" +#include "csutil/scfstringarray.h" #include "csutil/strhash.h" #include "csutil/sysfunc.h" #include "csutil/util.h" @@ -436,6 +437,14 @@ return Def; } +csPtr<iStringArray> csConfigManager::GetTuple(const char *Key) const +{ + for (csConfigDomain *d=LastDomain; d!=0; d=d->Prev) + if (d->Cfg && d->Cfg->KeyExists(Key)) + return d->Cfg->GetTuple(Key); + return 0; +} + const char *csConfigManager::GetComment(const char *Key) const { for (csConfigDomain *d=LastDomain; d!=0; d=d->Prev) { @@ -470,6 +479,12 @@ ClearKeyAboveDynamic(Key); } +void csConfigManager::SetTuple (const char *Key, csRef<iStringArray> Value) +{ + DynamicDomain->Cfg->SetTuple(Key, Value); + ClearKeyAboveDynamic(Key); +} + bool csConfigManager::SetComment (const char *Key, const char *Text) { if (!DynamicDomain->Cfg->SetComment(Key, Text)) return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: res <re...@gm...> - 2006-09-15 17:08:00
Attachments:
signature.asc
|
On 14.09.2006 23:07, ge...@us... wrote: > Revision: 25337 > http://svn.sourceforge.net/crystal/?rev=3D25337&view=3Drev > Author: genjix > Date: 2006-09-14 14:07:26 -0700 (Thu, 14 Sep 2006) >=20 > Log Message: > ----------- > GetTuple() and SetTuple() for storing and getting lists of variable ite= ms in config files. What will you do when one string of the tuple contains the substring ","?= -f.r. |
From: res <re...@gm...> - 2006-09-15 17:15:17
Attachments:
signature.asc
|
On 14.09.2006 23:07, ge...@us... wrote: > Revision: 25337 > http://svn.sourceforge.net/crystal/?rev=3D25337&view=3Drev > Author: genjix > Date: 2006-09-14 14:07:26 -0700 (Thu, 14 Sep 2006) >=20 > Log Message: > ----------- > GetTuple() and SetTuple() for storing and getting lists of variable ite= ms in config files. Besides, when adding new methods to interfaces, you should really implement them in all classes implementing an interface. Really. -f.r. |
From: <cry...@us...> - 2006-09-15 00:27:41
|
Revision: 25338 http://svn.sourceforge.net/crystal/?rev=25338&view=rev Author: crystal-manage Date: 2006-09-14 17:27:21 -0700 (Thu, 14 Sep 2006) Log Message: ----------- master header files: Automated master header file repair. Visual-C++ project files: Automated Visual-C++ project file repair. Texinfo files: Automated Texinfo @node and @menu repair. Swig Python files: Automated Swig Python file repair. Swig Perl5 files: Automated Swig Perl5 file repair. User's Manual: Automated Texinfo to HTML conversion. Modified Paths: -------------- CS/trunk/plugins/cscript/cspython/cs_pyth.cpp CS/trunk/scripts/perl5/cspace.pm CS/trunk/scripts/perl5/cswigpl5.inc CS/trunk/scripts/python/cspace.py Modified: CS/trunk/plugins/cscript/cspython/cs_pyth.cpp =================================================================== --- CS/trunk/plugins/cscript/cspython/cs_pyth.cpp 2006-09-14 21:07:26 UTC (rev 25337) +++ CS/trunk/plugins/cscript/cspython/cs_pyth.cpp 2006-09-15 00:27:21 UTC (rev 25338) @@ -2516,880 +2516,881 @@ #define SWIGTYPE_p_csRefTiRenderBuffer_t swig_types[166] #define SWIGTYPE_p_csRefTiRigidBody_t swig_types[167] #define SWIGTYPE_p_csRefTiScriptObject_t swig_types[168] -#define SWIGTYPE_p_csRefTiString_t swig_types[169] -#define SWIGTYPE_p_csRenderBufferHolder swig_types[170] -#define SWIGTYPE_p_csRenderBufferName swig_types[171] -#define SWIGTYPE_p_csRenderMesh swig_types[172] -#define SWIGTYPE_p_csRenderMeshList swig_types[173] -#define SWIGTYPE_p_csRenderMeshModes swig_types[174] -#define SWIGTYPE_p_csReporterHelper swig_types[175] -#define SWIGTYPE_p_csReversibleTransform swig_types[176] -#define SWIGTYPE_p_csScreenBoxResult swig_types[177] -#define SWIGTYPE_p_csSectorHitBeamResult swig_types[178] -#define SWIGTYPE_p_csSegment2 swig_types[179] -#define SWIGTYPE_p_csSegment3 swig_types[180] -#define SWIGTYPE_p_csSetTcsPtrKeyTiMeshWrapper_t_CS__Memory__AllocatorMalloc_t swig_types[181] -#define SWIGTYPE_p_csSetTunsigned_long_CS__Memory__AllocatorMalloc_t swig_types[182] -#define SWIGTYPE_p_csShaderMetadata swig_types[183] -#define SWIGTYPE_p_csShaderTagPresence swig_types[184] -#define SWIGTYPE_p_csShaderVariable swig_types[185] -#define SWIGTYPE_p_csSimplePixmap swig_types[186] -#define SWIGTYPE_p_csSimpleRenderMesh swig_types[187] -#define SWIGTYPE_p_csSndSysRendererSoftware swig_types[188] -#define SWIGTYPE_p_csSndSysSoundFormat swig_types[189] -#define SWIGTYPE_p_csSourceParameters3D swig_types[190] -#define SWIGTYPE_p_csSphere swig_types[191] -#define SWIGTYPE_p_csSpline swig_types[192] -#define SWIGTYPE_p_csSprite2DVertex swig_types[193] -#define SWIGTYPE_p_csSpriteCal3DActiveAnim swig_types[194] -#define SWIGTYPE_p_csSquaredDist swig_types[195] -#define SWIGTYPE_p_csStrKey swig_types[196] -#define SWIGTYPE_p_csString swig_types[197] -#define SWIGTYPE_p_csStringArray swig_types[198] -#define SWIGTYPE_p_csStringBase swig_types[199] -#define SWIGTYPE_p_csStringFastT36_t swig_types[200] -#define SWIGTYPE_p_csStringSet swig_types[201] -#define SWIGTYPE_p_csTinyDocumentSystem swig_types[202] -#define SWIGTYPE_p_csTraceBeamResult swig_types[203] -#define SWIGTYPE_p_csTransform swig_types[204] -#define SWIGTYPE_p_csTriangle swig_types[205] -#define SWIGTYPE_p_csVector2 swig_types[206] -#define SWIGTYPE_p_csVector3 swig_types[207] -#define SWIGTYPE_p_csVector3Array swig_types[208] -#define SWIGTYPE_p_csVector4 swig_types[209] -#define SWIGTYPE_p_csVertexAttrib swig_types[210] -#define SWIGTYPE_p_csVertexStatus swig_types[211] -#define SWIGTYPE_p_csView swig_types[212] -#define SWIGTYPE_p_csWrapPtr swig_types[213] -#define SWIGTYPE_p_csXRotMatrix3 swig_types[214] -#define SWIGTYPE_p_csXScaleMatrix3 swig_types[215] -#define SWIGTYPE_p_csYRotMatrix3 swig_types[216] -#define SWIGTYPE_p_csYScaleMatrix3 swig_types[217] -#define SWIGTYPE_p_csZRotMatrix3 swig_types[218] -#define SWIGTYPE_p_csZScaleMatrix3 swig_types[219] -#define SWIGTYPE_p_double swig_types[220] -#define SWIGTYPE_p_f_p_iBase__p__csPyEventHandler swig_types[221] -#define SWIGTYPE_p_f_p_iBase__p_csPath swig_types[222] -#define SWIGTYPE_p_f_p_iBase__p_iAnimTimeUpdateHandler swig_types[223] -#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsShaderVariable_p_t swig_types[224] -#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsSprite2DVertex_t swig_types[225] -#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[226] -#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[227] -#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[228] -#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[229] -#define SWIGTYPE_p_f_p_iBase__p_iAws swig_types[230] -#define SWIGTYPE_p_f_p_iBase__p_iAwsComponent swig_types[231] -#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentFactory swig_types[232] -#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentNode swig_types[233] -#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionKey swig_types[234] -#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionNodeFactory swig_types[235] -#define SWIGTYPE_p_f_p_iBase__p_iAwsFloatKey swig_types[236] -#define SWIGTYPE_p_f_p_iBase__p_iAwsIntKey swig_types[237] -#define SWIGTYPE_p_f_p_iBase__p_iAwsKey swig_types[238] -#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyContainer swig_types[239] -#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyFactory swig_types[240] -#define SWIGTYPE_p_f_p_iBase__p_iAwsLayoutManager swig_types[241] -#define SWIGTYPE_p_f_p_iBase__p_iAwsPointKey swig_types[242] -#define SWIGTYPE_p_f_p_iBase__p_iAwsPrefManager swig_types[243] -#define SWIGTYPE_p_f_p_iBase__p_iAwsRGBKey swig_types[244] -#define SWIGTYPE_p_f_p_iBase__p_iAwsRectKey swig_types[245] -#define SWIGTYPE_p_f_p_iBase__p_iAwsSink swig_types[246] -#define SWIGTYPE_p_f_p_iBase__p_iAwsSinkManager swig_types[247] -#define SWIGTYPE_p_f_p_iBase__p_iAwsSlot swig_types[248] -#define SWIGTYPE_p_f_p_iBase__p_iAwsSource swig_types[249] -#define SWIGTYPE_p_f_p_iBase__p_iAwsStringKey swig_types[250] -#define SWIGTYPE_p_f_p_iBase__p_iBase swig_types[251] -#define SWIGTYPE_p_f_p_iBase__p_iBinaryLoaderPlugin swig_types[252] -#define SWIGTYPE_p_f_p_iBase__p_iBodyGroup swig_types[253] -#define SWIGTYPE_p_f_p_iBase__p_iCacheManager swig_types[254] -#define SWIGTYPE_p_f_p_iBase__p_iCamera swig_types[255] -#define SWIGTYPE_p_f_p_iBase__p_iCameraPosition swig_types[256] -#define SWIGTYPE_p_f_p_iBase__p_iCameraPositionList swig_types[257] -#define SWIGTYPE_p_f_p_iBase__p_iCameraSectorListener swig_types[258] -#define SWIGTYPE_p_f_p_iBase__p_iClipper2D swig_types[259] -#define SWIGTYPE_p_f_p_iBase__p_iCollideSystem swig_types[260] -#define SWIGTYPE_p_f_p_iBase__p_iCollider swig_types[261] -#define SWIGTYPE_p_f_p_iBase__p_iColoredVertices swig_types[262] -#define SWIGTYPE_p_f_p_iBase__p_iCommandLineParser swig_types[263] -#define SWIGTYPE_p_f_p_iBase__p_iComponent swig_types[264] -#define SWIGTYPE_p_f_p_iBase__p_iConfigFile swig_types[265] -#define SWIGTYPE_p_f_p_iBase__p_iConfigIterator swig_types[266] -#define SWIGTYPE_p_f_p_iBase__p_iConfigManager swig_types[267] -#define SWIGTYPE_p_f_p_iBase__p_iConsoleOutput swig_types[268] -#define SWIGTYPE_p_f_p_iBase__p_iConsoleWatcher swig_types[269] -#define SWIGTYPE_p_f_p_iBase__p_iDataBuffer swig_types[270] -#define SWIGTYPE_p_f_p_iBase__p_iDebugHelper swig_types[271] -#define SWIGTYPE_p_f_p_iBase__p_iDocument swig_types[272] -#define SWIGTYPE_p_f_p_iBase__p_iDocumentAttribute swig_types[273] -#define SWIGTYPE_p_f_p_iBase__p_iDocumentAttributeIterator swig_types[274] -#define SWIGTYPE_p_f_p_iBase__p_iDocumentNode swig_types[275] -#define SWIGTYPE_p_f_p_iBase__p_iDocumentNodeIterator swig_types[276] -#define SWIGTYPE_p_f_p_iBase__p_iDocumentSystem swig_types[277] -#define SWIGTYPE_p_f_p_iBase__p_iDynamicSystem swig_types[278] -#define SWIGTYPE_p_f_p_iBase__p_iDynamics swig_types[279] -#define SWIGTYPE_p_f_p_iBase__p_iDynamicsColliderCollisionCallback swig_types[280] -#define SWIGTYPE_p_f_p_iBase__p_iDynamicsCollisionCallback swig_types[281] -#define SWIGTYPE_p_f_p_iBase__p_iDynamicsMoveCallback swig_types[282] -#define SWIGTYPE_p_f_p_iBase__p_iDynamicsSystemCollider swig_types[283] -#define SWIGTYPE_p_f_p_iBase__p_iEngine swig_types[284] -#define SWIGTYPE_p_f_p_iBase__p_iEngineFrameCallback swig_types[285] -#define SWIGTYPE_p_f_p_iBase__p_iEngineSectorCallback swig_types[286] -#define SWIGTYPE_p_f_p_iBase__p_iEngineSequenceManager swig_types[287] -#define SWIGTYPE_p_f_p_iBase__p_iEngineSequenceParameters swig_types[288] -#define SWIGTYPE_p_f_p_iBase__p_iEvent swig_types[289] -#define SWIGTYPE_p_f_p_iBase__p_iEventAttributeIterator swig_types[290] -#define SWIGTYPE_p_f_p_iBase__p_iEventCord swig_types[291] -#define SWIGTYPE_p_f_p_iBase__p_iEventHandler swig_types[292] -#define SWIGTYPE_p_f_p_iBase__p_iEventNameRegistry swig_types[293] -#define SWIGTYPE_p_f_p_iBase__p_iEventOutlet swig_types[294] -#define SWIGTYPE_p_f_p_iBase__p_iEventPlug swig_types[295] -#define SWIGTYPE_p_f_p_iBase__p_iEventQueue swig_types[296] -#define SWIGTYPE_p_f_p_iBase__p_iFactory swig_types[297] -#define SWIGTYPE_p_f_p_iBase__p_iFile swig_types[298] -#define SWIGTYPE_p_f_p_iBase__p_iFont swig_types[299] -#define SWIGTYPE_p_f_p_iBase__p_iFontDeleteNotify swig_types[300] -#define SWIGTYPE_p_f_p_iBase__p_iFontServer swig_types[301] -#define SWIGTYPE_p_f_p_iBase__p_iFrustumView swig_types[302] -#define SWIGTYPE_p_f_p_iBase__p_iFrustumViewUserdata swig_types[303] -#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControl swig_types[304] -#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControlFactory swig_types[305] -#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControlType swig_types[306] -#define SWIGTYPE_p_f_p_iBase__p_iGeneralFactoryState swig_types[307] -#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshCommonState swig_types[308] -#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshState swig_types[309] -#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshSubMesh swig_types[310] -#define SWIGTYPE_p_f_p_iBase__p_iGraphics2D swig_types[311] -#define SWIGTYPE_p_f_p_iBase__p_iGraphics3D swig_types[312] -#define SWIGTYPE_p_f_p_iBase__p_iHalo swig_types[313] -#define SWIGTYPE_p_f_p_iBase__p_iImage swig_types[314] -#define SWIGTYPE_p_f_p_iBase__p_iImageIO swig_types[315] -#define SWIGTYPE_p_f_p_iBase__p_iJoint swig_types[316] -#define SWIGTYPE_p_f_p_iBase__p_iJoystickDriver swig_types[317] -#define SWIGTYPE_p_f_p_iBase__p_iKeyComposer swig_types[318] -#define SWIGTYPE_p_f_p_iBase__p_iKeyboardDriver swig_types[319] -#define SWIGTYPE_p_f_p_iBase__p_iLight swig_types[320] -#define SWIGTYPE_p_f_p_iBase__p_iLightCallback swig_types[321] -#define SWIGTYPE_p_f_p_iBase__p_iLightIterator swig_types[322] -#define SWIGTYPE_p_f_p_iBase__p_iLightList swig_types[323] -#define SWIGTYPE_p_f_p_iBase__p_iLightVisibleCallback swig_types[324] -#define SWIGTYPE_p_f_p_iBase__p_iLightingProcessData swig_types[325] -#define SWIGTYPE_p_f_p_iBase__p_iLightingProcessInfo swig_types[326] -#define SWIGTYPE_p_f_p_iBase__p_iLoader swig_types[327] -#define SWIGTYPE_p_f_p_iBase__p_iLoaderPlugin swig_types[328] -#define SWIGTYPE_p_f_p_iBase__p_iLoaderStatus swig_types[329] -#define SWIGTYPE_p_f_p_iBase__p_iMapNode swig_types[330] -#define SWIGTYPE_p_f_p_iBase__p_iMaterial swig_types[331] -#define SWIGTYPE_p_f_p_iBase__p_iMaterialEngine swig_types[332] -#define SWIGTYPE_p_f_p_iBase__p_iMaterialList swig_types[333] -#define SWIGTYPE_p_f_p_iBase__p_iMaterialWrapper swig_types[334] -#define SWIGTYPE_p_f_p_iBase__p_iMeshDrawCallback swig_types[335] -#define SWIGTYPE_p_f_p_iBase__p_iMeshFactoryList swig_types[336] -#define SWIGTYPE_p_f_p_iBase__p_iMeshFactoryWrapper swig_types[337] -#define SWIGTYPE_p_f_p_iBase__p_iMeshList swig_types[338] -#define SWIGTYPE_p_f_p_iBase__p_iMeshObject swig_types[339] -#define SWIGTYPE_p_f_p_iBase__p_iMeshObjectDrawCallback swig_types[340] -#define SWIGTYPE_p_f_p_iBase__p_iMeshObjectFactory swig_types[341] -#define SWIGTYPE_p_f_p_iBase__p_iMeshObjectType swig_types[342] -#define SWIGTYPE_p_f_p_iBase__p_iMeshWrapper swig_types[343] -#define SWIGTYPE_p_f_p_iBase__p_iMeshWrapperIterator swig_types[344] -#define SWIGTYPE_p_f_p_iBase__p_iMissingLoaderData swig_types[345] -#define SWIGTYPE_p_f_p_iBase__p_iMouseDriver swig_types[346] -#define SWIGTYPE_p_f_p_iBase__p_iMovable swig_types[347] -#define SWIGTYPE_p_f_p_iBase__p_iMovableListener swig_types[348] -#define SWIGTYPE_p_f_p_iBase__p_iMovieRecorder swig_types[349] -#define SWIGTYPE_p_f_p_iBase__p_iNativeWindow swig_types[350] -#define SWIGTYPE_p_f_p_iBase__p_iNativeWindowManager swig_types[351] -#define SWIGTYPE_p_f_p_iBase__p_iODEAMotorJoint swig_types[352] -#define SWIGTYPE_p_f_p_iBase__p_iODEBallJoint swig_types[353] -#define SWIGTYPE_p_f_p_iBase__p_iODEDynamicState swig_types[354] -#define SWIGTYPE_p_f_p_iBase__p_iODEDynamicSystemState swig_types[355] -#define SWIGTYPE_p_f_p_iBase__p_iODEFrameUpdateCallback swig_types[356] -#define SWIGTYPE_p_f_p_iBase__p_iODEGeneralJointState swig_types[357] -#define SWIGTYPE_p_f_p_iBase__p_iODEHinge2Joint swig_types[358] -#define SWIGTYPE_p_f_p_iBase__p_iODEHingeJoint swig_types[359] -#define SWIGTYPE_p_f_p_iBase__p_iODEJointState swig_types[360] -#define SWIGTYPE_p_f_p_iBase__p_iODESliderJoint swig_types[361] -#define SWIGTYPE_p_f_p_iBase__p_iODEUniversalJoint swig_types[362] -#define SWIGTYPE_p_f_p_iBase__p_iObject swig_types[363] -#define SWIGTYPE_p_f_p_iBase__p_iObjectIterator swig_types[364] -#define SWIGTYPE_p_f_p_iBase__p_iObjectModel swig_types[365] -#define SWIGTYPE_p_f_p_iBase__p_iObjectModelListener swig_types[366] -#define SWIGTYPE_p_f_p_iBase__p_iObjectNameChangeListener swig_types[367] -#define SWIGTYPE_p_f_p_iBase__p_iObjectRegistry swig_types[368] -#define SWIGTYPE_p_f_p_iBase__p_iObjectRegistryIterator swig_types[369] -#define SWIGTYPE_p_f_p_iBase__p_iOffscreenCanvasCallback swig_types[370] -#define SWIGTYPE_p_f_p_iBase__p_iParameterESM swig_types[371] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEffectorFactory swig_types[372] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEffectorForce swig_types[373] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEffectorLinColor swig_types[374] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterBase swig_types[375] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterBox swig_types[376] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterCone swig_types[377] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterCylinder swig_types[378] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterFactory swig_types[379] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterSphere swig_types[380] -#define SWIGTYPE_p_f_p_iBase__p_iParticleEffector swig_types[381] -#define SWIGTYPE_p_f_p_iBase__p_iParticleEmitter swig_types[382] -#define SWIGTYPE_p_f_p_iBase__p_iParticleSystem swig_types[383] -#define SWIGTYPE_p_f_p_iBase__p_iParticleSystemBase swig_types[384] -#define SWIGTYPE_p_f_p_iBase__p_iParticleSystemFactory swig_types[385] -#define SWIGTYPE_p_f_p_iBase__p_iPath swig_types[386] -#define SWIGTYPE_p_f_p_iBase__p_iPluginIterator swig_types[387] -#define SWIGTYPE_p_f_p_iBase__p_iPluginManager swig_types[388] -#define SWIGTYPE_p_f_p_iBase__p_iPolygonHandle swig_types[389] -#define SWIGTYPE_p_f_p_iBase__p_iPolygonMesh swig_types[390] -#define SWIGTYPE_p_f_p_iBase__p_iPortal swig_types[391] -#define SWIGTYPE_p_f_p_iBase__p_iPortalCallback swig_types[392] -#define SWIGTYPE_p_f_p_iBase__p_iPortalContainer swig_types[393] -#define SWIGTYPE_p_f_p_iBase__p_iRegion swig_types[394] -#define SWIGTYPE_p_f_p_iBase__p_iRegionList swig_types[395] -#define SWIGTYPE_p_f_p_iBase__p_iRendererLightmap swig_types[396] -#define SWIGTYPE_p_f_p_iBase__p_iReporter swig_types[397] -#define SWIGTYPE_p_f_p_iBase__p_iReporterIterator swig_types[398] -#define SWIGTYPE_p_f_p_iBase__p_iReporterListener swig_types[399] -#define SWIGTYPE_p_f_p_iBase__p_iRigidBody swig_types[400] -#define SWIGTYPE_p_f_p_iBase__p_iSCF swig_types[401] -#define SWIGTYPE_p_f_p_iBase__p_iSaver swig_types[402] -#define SWIGTYPE_p_f_p_iBase__p_iSceneNode swig_types[403] -#define SWIGTYPE_p_f_p_iBase__p_iScript swig_types[404] -#define SWIGTYPE_p_f_p_iBase__p_iScriptObject swig_types[405] -#define SWIGTYPE_p_f_p_iBase__p_iSector swig_types[406] -#define SWIGTYPE_p_f_p_iBase__p_iSectorCallback swig_types[407] -#define SWIGTYPE_p_f_p_iBase__p_iSectorIterator swig_types[408] -#define SWIGTYPE_p_f_p_iBase__p_iSectorList swig_types[409] -#define SWIGTYPE_p_f_p_iBase__p_iSectorMeshCallback swig_types[410] -#define SWIGTYPE_p_f_p_iBase__p_iSequenceTimedOperation swig_types[411] -#define SWIGTYPE_p_f_p_iBase__p_iSequenceTrigger swig_types[412] -#define SWIGTYPE_p_f_p_iBase__p_iSequenceWrapper swig_types[413] -#define SWIGTYPE_p_f_p_iBase__p_iShader swig_types[414] -#define SWIGTYPE_p_f_p_iBase__p_iShaderCompiler swig_types[415] -#define SWIGTYPE_p_f_p_iBase__p_iShaderManager swig_types[416] -#define SWIGTYPE_p_f_p_iBase__p_iShaderPriorityList swig_types[417] -#define SWIGTYPE_p_f_p_iBase__p_iShaderVarStack swig_types[418] -#define SWIGTYPE_p_f_p_iBase__p_iShaderVariableAccessor swig_types[419] -#define SWIGTYPE_p_f_p_iBase__p_iShaderVariableContext swig_types[420] -#define SWIGTYPE_p_f_p_iBase__p_iSimpleFormerState swig_types[421] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysData swig_types[422] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysListener swig_types[423] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysLoader swig_types[424] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysManager swig_types[425] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysRenderer swig_types[426] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysRendererCallback swig_types[427] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysRendererSoftware swig_types[428] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSoftwareDriver swig_types[429] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSoftwareFilter3D swig_types[430] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSoftwareOutputFilter swig_types[431] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSource swig_types[432] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSourceSoftware swig_types[433] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSourceSoftware3D swig_types[434] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysStream swig_types[435] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysStreamCallback swig_types[436] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysWrapper swig_types[437] -#define SWIGTYPE_p_f_p_iBase__p_iSprite2DFactoryState swig_types[438] -#define SWIGTYPE_p_f_p_iBase__p_iSprite2DState swig_types[439] -#define SWIGTYPE_p_f_p_iBase__p_iSprite2DUVAnimation swig_types[440] -#define SWIGTYPE_p_f_p_iBase__p_iSprite2DUVAnimationFrame swig_types[441] -#define SWIGTYPE_p_f_p_iBase__p_iSprite3DFactoryState swig_types[442] -#define SWIGTYPE_p_f_p_iBase__p_iSprite3DState swig_types[443] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteAction swig_types[444] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteCal3DFactoryState swig_types[445] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteCal3DSocket swig_types[446] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteCal3DState swig_types[447] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteFrame swig_types[448] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteSocket swig_types[449] -#define SWIGTYPE_p_f_p_iBase__p_iStandardReporterListener swig_types[450] -#define SWIGTYPE_p_f_p_iBase__p_iString swig_types[451] -#define SWIGTYPE_p_f_p_iBase__p_iStringArray swig_types[452] -#define SWIGTYPE_p_f_p_iBase__p_iStringSet swig_types[453] -#define SWIGTYPE_p_f_p_iBase__p_iSuperLightmap swig_types[454] -#define SWIGTYPE_p_f_p_iBase__p_iTerraFormer swig_types[455] -#define SWIGTYPE_p_f_p_iBase__p_iTerraSampler swig_types[456] -#define SWIGTYPE_p_f_p_iBase__p_iTerrainFactoryState swig_types[457] -#define SWIGTYPE_p_f_p_iBase__p_iTerrainObjectState swig_types[458] -#define SWIGTYPE_p_f_p_iBase__p_iTextureCallback swig_types[459] -#define SWIGTYPE_p_f_p_iBase__p_iTextureHandle swig_types[460] -#define SWIGTYPE_p_f_p_iBase__p_iTextureList swig_types[461] -#define SWIGTYPE_p_f_p_iBase__p_iTextureManager swig_types[462] -#define SWIGTYPE_p_f_p_iBase__p_iTextureWrapper swig_types[463] -#define SWIGTYPE_p_f_p_iBase__p_iThingEnvironment swig_types[464] -#define SWIGTYPE_p_f_p_iBase__p_iThingFactoryState swig_types[465] -#define SWIGTYPE_p_f_p_iBase__p_iThingState swig_types[466] -#define SWIGTYPE_p_f_p_iBase__p_iVFS swig_types[467] -#define SWIGTYPE_p_f_p_iBase__p_iView swig_types[468] -#define SWIGTYPE_p_f_p_iBase__p_iVirtualClock swig_types[469] -#define SWIGTYPE_p_f_p_iBase__p_iVisibilityCuller swig_types[470] -#define SWIGTYPE_p_f_p_iBase__p_iVisibilityCullerListener swig_types[471] -#define SWIGTYPE_p_f_p_iBase__p_iVisibilityObject swig_types[472] -#define SWIGTYPE_p_f_p_iBase__p_iVisibilityObjectIterator swig_types[473] -#define SWIGTYPE_p_f_p_iBase__p_scfImplementation1TcsPath_iPath_t swig_types[474] -#define SWIGTYPE_p_f_p_iMeshWrapper_p_iFrustumView_bool__void swig_types[475] -#define SWIGTYPE_p_f_unsigned_long_int_p_iAwsSource__void swig_types[476] -#define SWIGTYPE_p_f_unsigned_long_p_void_p_iAwsSource__void swig_types[477] -#define SWIGTYPE_p_float swig_types[478] -#define SWIGTYPE_p_iAnimTimeUpdateHandler swig_types[479] -#define SWIGTYPE_p_iArrayChangeAllTcsShaderVariable_p_t swig_types[480] -#define SWIGTYPE_p_iArrayChangeAllTcsSprite2DVertex_t swig_types[481] -#define SWIGTYPE_p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[482] -#define SWIGTYPE_p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[483] -#define SWIGTYPE_p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[484] -#define SWIGTYPE_p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[485] -#define SWIGTYPE_p_iAws swig_types[486] -#define SWIGTYPE_p_iAwsCanvas swig_types[487] -#define SWIGTYPE_p_iAwsComponent swig_types[488] -#define SWIGTYPE_p_iAwsComponentFactory swig_types[489] -#define SWIGTYPE_p_iAwsComponentNode swig_types[490] -#define SWIGTYPE_p_iAwsConnectionKey swig_types[491] -#define SWIGTYPE_p_iAwsConnectionNodeFactory swig_types[492] -#define SWIGTYPE_p_iAwsFloatKey swig_types[493] -#define SWIGTYPE_p_iAwsIntKey swig_types[494] -#define SWIGTYPE_p_iAwsKey swig_types[495] -#define SWIGTYPE_p_iAwsKeyContainer swig_types[496] -#define SWIGTYPE_p_iAwsKeyFactory swig_types[497] -#define SWIGTYPE_p_iAwsLayoutManager swig_types[498] -#define SWIGTYPE_p_iAwsParmList swig_types[499] -#define SWIGTYPE_p_iAwsPointKey swig_types[500] -#define SWIGTYPE_p_iAwsPrefManager swig_types[501] -#define SWIGTYPE_p_iAwsRGBKey swig_types[502] -#define SWIGTYPE_p_iAwsRGBKey__RGB swig_types[503] -#define SWIGTYPE_p_iAwsRectKey swig_types[504] -#define SWIGTYPE_p_iAwsSink swig_types[505] -#define SWIGTYPE_p_iAwsSinkManager swig_types[506] -#define SWIGTYPE_p_iAwsSlot swig_types[507] -#define SWIGTYPE_p_iAwsSource swig_types[508] -#define SWIGTYPE_p_iAwsStringKey swig_types[509] -#define SWIGTYPE_p_iBase swig_types[510] -#define SWIGTYPE_p_iBaseHalo swig_types[511] -#define SWIGTYPE_p_iBinaryLoaderPlugin swig_types[512] -#define SWIGTYPE_p_iBodyGroup swig_types[513] -#define SWIGTYPE_p_iCacheManager swig_types[514] -#define SWIGTYPE_p_iCamera swig_types[515] -#define SWIGTYPE_p_iCameraPosition swig_types[516] -#define SWIGTYPE_p_iCameraPositionList swig_types[517] -#define SWIGTYPE_p_iCameraSectorListener swig_types[518] -#define SWIGTYPE_p_iClipper2D swig_types[519] -#define SWIGTYPE_p_iCollection swig_types[520] -#define SWIGTYPE_p_iCollectionList swig_types[521] -#define SWIGTYPE_p_iCollideSystem swig_types[522] -#define SWIGTYPE_p_iCollider swig_types[523] -#define SWIGTYPE_p_iColoredVertices swig_types[524] -#define SWIGTYPE_p_iCommandLineParser swig_types[525] -#define SWIGTYPE_p_iComponent swig_types[526] -#define SWIGTYPE_p_iConfigFile swig_types[527] -#define SWIGTYPE_p_iConfigIterator swig_types[528] -#define SWIGTYPE_p_iConfigManager swig_types[529] -#define SWIGTYPE_p_iConsoleOutput swig_types[530] -#define SWIGTYPE_p_iConsoleWatcher swig_types[531] -#define SWIGTYPE_p_iCrossHalo swig_types[532] -#define SWIGTYPE_p_iDataBuffer swig_types[533] -#define SWIGTYPE_p_iDebugHelper swig_types[534] -#define SWIGTYPE_p_iDocument swig_types[535] -#define SWIGTYPE_p_iDocumentAttribute swig_types[536] -#define SWIGTYPE_p_iDocumentAttributeIterator swig_types[537] -#define SWIGTYPE_p_iDocumentNode swig_types[538] -#define SWIGTYPE_p_iDocumentNodeIterator swig_types[539] -#define SWIGTYPE_p_iDocumentSystem swig_types[540] -#define SWIGTYPE_p_iDynamicSystem swig_types[541] -#define SWIGTYPE_p_iDynamics swig_types[542] -#define SWIGTYPE_p_iDynamicsColliderCollisionCallback swig_types[543] -#define SWIGTYPE_p_iDynamicsCollisionCallback swig_types[544] -#define SWIGTYPE_p_iDynamicsMoveCallback swig_types[545] -#define SWIGTYPE_p_iDynamicsSystemCollider swig_types[546] -#define SWIGTYPE_p_iEngine swig_types[547] -#define SWIGTYPE_p_iEngineFrameCallback swig_types[548] -#define SWIGTYPE_p_iEngineSectorCallback swig_types[549] -#define SWIGTYPE_p_iEngineSequenceManager swig_types[550] -#define SWIGTYPE_p_iEngineSequenceParameters swig_types[551] -#define SWIGTYPE_p_iEvent swig_types[552] -#define SWIGTYPE_p_iEventAttributeIterator swig_types[553] -#define SWIGTYPE_p_iEventCord swig_types[554] -#define SWIGTYPE_p_iEventHandler swig_types[555] -#define SWIGTYPE_p_iEventNameRegistry swig_types[556] -#define SWIGTYPE_p_iEventOutlet swig_types[557] -#define SWIGTYPE_p_iEventPlug swig_types[558] -#define SWIGTYPE_p_iEventQueue swig_types[559] -#define SWIGTYPE_p_iFactory swig_types[560] -#define SWIGTYPE_p_iFile swig_types[561] -#define SWIGTYPE_p_iFlareHalo swig_types[562] -#define SWIGTYPE_p_iFont swig_types[563] -#define SWIGTYPE_p_iFontDeleteNotify swig_types[564] -#define SWIGTYPE_p_iFontServer swig_types[565] -#define SWIGTYPE_p_iFrustumView swig_types[566] -#define SWIGTYPE_p_iFrustumViewUserdata swig_types[567] -#define SWIGTYPE_p_iGenMeshAnimationControl swig_types[568] -#define SWIGTYPE_p_iGenMeshAnimationControlFactory swig_types[569] -#define SWIGTYPE_p_iGenMeshAnimationControlType swig_types[570] -#define SWIGTYPE_p_iGeneralFactoryState swig_types[571] -#define SWIGTYPE_p_iGeneralMeshCommonState swig_types[572] -#define SWIGTYPE_p_iGeneralMeshState swig_types[573] -#define SWIGTYPE_p_iGeneralMeshSubMesh swig_types[574] -#define SWIGTYPE_p_iGraphics2D swig_types[575] -#define SWIGTYPE_p_iGraphics3D swig_types[576] -#define SWIGTYPE_p_iHalo swig_types[577] -#define SWIGTYPE_p_iImage swig_types[578] -#define SWIGTYPE_p_iImageIO swig_types[579] -#define SWIGTYPE_p_iJoint swig_types[580] -#define SWIGTYPE_p_iJoystickDriver swig_types[581] -#define SWIGTYPE_p_iKeyComposer swig_types[582] -#define SWIGTYPE_p_iKeyboardDriver swig_types[583] -#define SWIGTYPE_p_iLODControl swig_types[584] -#define SWIGTYPE_p_iLight swig_types[585] -#define SWIGTYPE_p_iLightCallback swig_types[586] -#define SWIGTYPE_p_iLightIterator swig_types[587] -#define SWIGTYPE_p_iLightList swig_types[588] -#define SWIGTYPE_p_iLightVisibleCallback swig_types[589] -#define SWIGTYPE_p_iLightingInfo swig_types[590] -#define SWIGTYPE_p_iLightingProcessData swig_types[591] -#define SWIGTYPE_p_iLightingProcessInfo swig_types[592] -#define SWIGTYPE_p_iLoader swig_types[593] -#define SWIGTYPE_p_iLoaderContext swig_types[594] -#define SWIGTYPE_p_iLoaderPlugin swig_types[595] -#define SWIGTYPE_p_iLoaderStatus swig_types[596] -#define SWIGTYPE_p_iMapNode swig_types[597] -#define SWIGTYPE_p_iMaterial swig_types[598] -#define SWIGTYPE_p_iMaterialEngine swig_types[599] -#define SWIGTYPE_p_iMaterialList swig_types[600] -#define SWIGTYPE_p_iMaterialWrapper swig_types[601] -#define SWIGTYPE_p_iMeshDrawCallback swig_types[602] -#define SWIGTYPE_p_iMeshFactoryList swig_types[603] -#define SWIGTYPE_p_iMeshFactoryWrapper swig_types[604] -#define SWIGTYPE_p_iMeshGenerator swig_types[605] -#define SWIGTYPE_p_iMeshList swig_types[606] -#define SWIGTYPE_p_iMeshObject swig_types[607] -#define SWIGTYPE_p_iMeshObjectDrawCallback swig_types[608] -#define SWIGTYPE_p_iMeshObjectFactory swig_types[609] -#define SWIGTYPE_p_iMeshObjectType swig_types[610] -#define SWIGTYPE_p_iMeshWrapper swig_types[611] -#define SWIGTYPE_p_iMeshWrapperIterator swig_types[612] -#define SWIGTYPE_p_iMissingLoaderData swig_types[613] -#define SWIGTYPE_p_iMouseDriver swig_types[614] -#define SWIGTYPE_p_iMovable swig_types[615] -#define SWIGTYPE_p_iMovableListener swig_types[616] -#define SWIGTYPE_p_iMovieRecorder swig_types[617] -#define SWIGTYPE_p_iNativeWindow swig_types[618] -#define SWIGTYPE_p_iNativeWindowManager swig_types[619] -#define SWIGTYPE_p_iNovaHalo swig_types[620] -#define SWIGTYPE_p_iODEAMotorJoint swig_types[621] -#define SWIGTYPE_p_iODEBallJoint swig_types[622] -#define SWIGTYPE_p_iODEDynamicState swig_types[623] -#define SWIGTYPE_p_iODEDynamicSystemState swig_types[624] -#define SWIGTYPE_p_iODEFrameUpdateCallback swig_types[625] -#define SWIGTYPE_p_iODEGeneralJointState swig_types[626] -#define SWIGTYPE_p_iODEHinge2Joint swig_types[627] -#define SWIGTYPE_p_iODEHingeJoint swig_types[628] -#define SWIGTYPE_p_iODEJointState swig_types[629] -#define SWIGTYPE_p_iODESliderJoint swig_types[630] -#define SWIGTYPE_p_iODEUniversalJoint swig_types[631] -#define SWIGTYPE_p_iObject swig_types[632] -#define SWIGTYPE_p_iObjectIterator swig_types[633] -#define SWIGTYPE_p_iObjectModel swig_types[634] -#define SWIGTYPE_p_iObjectModelListener swig_types[635] -#define SWIGTYPE_p_iObjectNameChangeListener swig_types[636] -#define SWIGTYPE_p_iObjectRegistry swig_types[637] -#define SWIGTYPE_p_iObjectRegistryIterator swig_types[638] -#define SWIGTYPE_p_iOffscreenCanvasCallback swig_types[639] -#define SWIGTYPE_p_iParameterESM swig_types[640] -#define SWIGTYPE_p_iParticleBuiltinEffectorFactory swig_types[641] -#define SWIGTYPE_p_iParticleBuiltinEffectorForce swig_types[642] -#define SWIGTYPE_p_iParticleBuiltinEffectorLinColor swig_types[643] -#define SWIGTYPE_p_iParticleBuiltinEmitterBase swig_types[644] -#define SWIGTYPE_p_iParticleBuiltinEmitterBox swig_types[645] -#define SWIGTYPE_p_iParticleBuiltinEmitterCone swig_types[646] -#define SWIGTYPE_p_iParticleBuiltinEmitterCylinder swig_types[647] -#define SWIGTYPE_p_iParticleBuiltinEmitterFactory swig_types[648] -#define SWIGTYPE_p_iParticleBuiltinEmitterSphere swig_types[649] -#define SWIGTYPE_p_iParticleEffector swig_types[650] -#define SWIGTYPE_p_iParticleEmitter swig_types[651] -#define SWIGTYPE_p_iParticleSystem swig_types[652] -#define SWIGTYPE_p_iParticleSystemBase swig_types[653] -#define SWIGTYPE_p_iParticleSystemFactory swig_types[654] -#define SWIGTYPE_p_iPath swig_types[655] -#define SWIGTYPE_p_iPluginIterator swig_types[656] -#define SWIGTYPE_p_iPluginManager swig_types[657] -#define SWIGTYPE_p_iPolygonHandle swig_types[658] -#define SWIGTYPE_p_iPolygonMesh swig_types[659] -#define SWIGTYPE_p_iPortal swig_types[660] -#define SWIGTYPE_p_iPortalCallback swig_types[661] -#define SWIGTYPE_p_iPortalContainer swig_types[662] -#define SWIGTYPE_p_iProgressMeter swig_types[663] -#define SWIGTYPE_p_iRegion swig_types[664] -#define SWIGTYPE_p_iRegionList swig_types[665] -#define SWIGTYPE_p_iRenderBuffer swig_types[666] -#define SWIGTYPE_p_iRenderLoop swig_types[667] -#define SWIGTYPE_p_iRenderLoopManager swig_types[668] -#define SWIGTYPE_p_iRenderView swig_types[669] -#define SWIGTYPE_p_iRendererLightmap swig_types[670] -#define SWIGTYPE_p_iReporter swig_types[671] -#define SWIGTYPE_p_iReporterIterator swig_types[672] -#define SWIGTYPE_p_iReporterListener swig_types[673] -#define SWIGTYPE_p_iRigidBody swig_types[674] -#define SWIGTYPE_p_iSCF swig_types[675] -#define SWIGTYPE_p_iSaver swig_types[676] -#define SWIGTYPE_p_iSceneNode swig_types[677] -#define SWIGTYPE_p_iSceneNodeArray swig_types[678] -#define SWIGTYPE_p_iScript swig_types[679] -#define SWIGTYPE_p_iScriptObject swig_types[680] -#define SWIGTYPE_p_iSector swig_types[681] -#define SWIGTYPE_p_iSectorCallback swig_types[682] -#define SWIGTYPE_p_iSectorIterator swig_types[683] -#define SWIGTYPE_p_iSectorList swig_types[684] -#define SWIGTYPE_p_iSectorMeshCallback swig_types[685] -#define SWIGTYPE_p_iSequence swig_types[686] -#define SWIGTYPE_p_iSequenceManager swig_types[687] -#define SWIGTYPE_p_iSequenceTimedOperation swig_types[688] -#define SWIGTYPE_p_iSequenceTrigger swig_types[689] -#define SWIGTYPE_p_iSequenceWrapper swig_types[690] -#define SWIGTYPE_p_iShader swig_types[691] -#define SWIGTYPE_p_iShaderCompiler swig_types[692] -#define SWIGTYPE_p_iShaderManager swig_types[693] -#define SWIGTYPE_p_iShaderPriorityList swig_types[694] -#define SWIGTYPE_p_iShaderVarStack swig_types[695] -#define SWIGTYPE_p_iShaderVariableAccessor swig_types[696] -#define SWIGTYPE_p_iShaderVariableContext swig_types[697] -#define SWIGTYPE_p_iShadowBlockList swig_types[698] -#define SWIGTYPE_p_iShadowCaster swig_types[699] -#define SWIGTYPE_p_iShadowReceiver swig_types[700] -#define SWIGTYPE_p_iSharedVariable swig_types[701] -#define SWIGTYPE_p_iSharedVariableList swig_types[702] -#define SWIGTYPE_p_iSimpleFormerState swig_types[703] -#define SWIGTYPE_p_iSndSysData swig_types[704] -#define SWIGTYPE_p_iSndSysListener swig_types[705] -#define SWIGTYPE_p_iSndSysLoader swig_types[706] -#define SWIGTYPE_p_iSndSysManager swig_types[707] -#define SWIGTYPE_p_iSndSysRenderer swig_types[708] -#define SWIGTYPE_p_iSndSysRendererCallback swig_types[709] -#define SWIGTYPE_p_iSndSysRendererSoftware swig_types[710] -#define SWIGTYPE_p_iSndSysSoftwareDriver swig_types[711] -#define SWIGTYPE_p_iSndSysSoftwareFilter3D swig_types[712] -#define SWIGTYPE_p_iSndSysSoftwareFilter3DProperties swig_types[713] -#define SWIGTYPE_p_iSndSysSoftwareOutputFilter swig_types[714] -#define SWIGTYPE_p_iSndSysSource swig_types[715] -#define SWIGTYPE_p_iSndSysSourceSoftware swig_types[716] -#define SWIGTYPE_p_iSndSysSourceSoftware3D swig_types[717] -#define SWIGTYPE_p_iSndSysStream swig_types[718] -#define SWIGTYPE_p_iSndSysStreamCallback swig_types[719] -#define SWIGTYPE_p_iSndSysWrapper swig_types[720] -#define SWIGTYPE_p_iSprite2DFactoryState swig_types[721] -#define SWIGTYPE_p_iSprite2DState swig_types[722] -#define SWIGTYPE_p_iSprite2DUVAnimation swig_types[723] -#define SWIGTYPE_p_iSprite2DUVAnimationFrame swig_types[724] -#define SWIGTYPE_p_iSprite3DFactoryState swig_types[725] -#define SWIGTYPE_p_iSprite3DState swig_types[726] -#define SWIGTYPE_p_iSpriteAction swig_types[727] -#define SWIGTYPE_p_iSpriteCal3DFactoryState swig_types[728] -#define SWIGTYPE_p_iSpriteCal3DSocket swig_types[729] -#define SWIGTYPE_p_iSpriteCal3DState swig_types[730] -#define SWIGTYPE_p_iSpriteFrame swig_types[731] -#define SWIGTYPE_p_iSpriteSocket swig_types[732] -#define SWIGTYPE_p_iStandardReporterListener swig_types[733] -#define SWIGTYPE_p_iStreamSource swig_types[734] -#define SWIGTYPE_p_iString swig_types[735] -#define SWIGTYPE_p_iStringArray swig_types[736] -#define SWIGTYPE_p_iStringSet swig_types[737] -#define SWIGTYPE_p_iSuperLightmap swig_types[738] -#define SWIGTYPE_p_iTerraFormer swig_types[739] -#define SWIGTYPE_p_iTerraSampler swig_types[740] -#define SWIGTYPE_p_iTerrainFactoryState swig_types[741] -#define SWIGTYPE_p_iTerrainObjectState swig_types[742] -#define SWIGTYPE_p_iTextureCallback swig_types[743] -#define SWIGTYPE_p_iTextureHandle swig_types[744] -#define SWIGTYPE_p_iTextureList swig_types[745] -#define SWIGTYPE_p_iTextureManager swig_types[746] -#define SWIGTYPE_p_iTextureWrapper swig_types[747] -#define SWIGTYPE_p_iThingEnvironment swig_types[748] -#define SWIGTYPE_p_iThingFactoryState swig_types[749] -#define SWIGTYPE_p_iThingState swig_types[750] -#define SWIGTYPE_p_iVFS swig_types[751] -#define SWIGTYPE_p_iVerbosityManager swig_types[752] -#define SWIGTYPE_p_iView swig_types[753] -#define SWIGTYPE_p_iVirtualClock swig_types[754] -#define SWIGTYPE_p_iVisibilityCuller swig_types[755] -#define SWIGTYPE_p_iVisibilityCullerListener swig_types[756] -#define SWIGTYPE_p_iVisibilityObject swig_types[757] -#define SWIGTYPE_p_iVisibilityObjectIterator swig_types[758] -#define SWIGTYPE_p_int swig_types[759] -#define SWIGTYPE_p_int16_t swig_types[760] -#define SWIGTYPE_p_int32_t swig_types[761] -#define SWIGTYPE_p_int64_t swig_types[762] -#define SWIGTYPE_p_int8_t swig_types[763] -#define SWIGTYPE_p_int_least64_t swig_types[764] -#define SWIGTYPE_p_p__csPyEventHandler swig_types[765] -#define SWIGTYPE_p_p_char swig_types[766] -#define SWIGTYPE_p_p_csImageIOFileFormatDescription swig_types[767] -#define SWIGTYPE_p_p_csOrthoTransform swig_types[768] -#define SWIGTYPE_p_p_csPath swig_types[769] -#define SWIGTYPE_p_p_csRenderMesh swig_types[770] -#define SWIGTYPE_p_p_csReversibleTransform swig_types[771] -#define SWIGTYPE_p_p_csShaderVariable swig_types[772] -#define SWIGTYPE_p_p_csVector3 swig_types[773] -#define SWIGTYPE_p_p_iAnimTimeUpdateHandler swig_types[774] -#define SWIGTYPE_p_p_iArrayChangeAllTcsShaderVariable_p_t swig_types[775] -#define SWIGTYPE_p_p_iArrayChangeAllTcsSprite2DVertex_t swig_types[776] -#define SWIGTYPE_p_p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[777] -#define SWIGTYPE_p_p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[778] -#define SWIGTYPE_p_p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[779] -#define SWIGTYPE_p_p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[780] -#define SWIGTYPE_p_p_iAws swig_types[781] -#define SWIGTYPE_p_p_iAwsComponent swig_types[782] -#define SWIGTYPE_p_p_iAwsComponentFactory swig_types[783] -#define SWIGTYPE_p_p_iAwsComponentNode swig_types[784] -#define SWIGTYPE_p_p_iAwsConnectionKey swig_types[785] -#define SWIGTYPE_p_p_iAwsConnectionNodeFactory swig_types[786] -#define SWIGTYPE_p_p_iAwsFloatKey swig_types[787] -#define SWIGTYPE_p_p_iAwsIntKey swig_types[788] -#define SWIGTYPE_p_p_iAwsKey swig_types[789] -#define SWIGTYPE_p_p_iAwsKeyContainer swig_types[790] -#define SWIGTYPE_p_p_iAwsKeyFactory swig_types[791] -#define SWIGTYPE_p_p_iAwsLayoutManager swig_types[792] -#define SWIGTYPE_p_p_iAwsPointKey swig_types[793] -#define SWIGTYPE_p_p_iAwsPrefManager swig_types[794] -#define SWIGTYPE_p_p_iAwsRGBKey swig_types[795] -#define SWIGTYPE_p_p_iAwsRectKey swig_types[796] -#define SWIGTYPE_p_p_iAwsSink swig_types[797] -#define SWIGTYPE_p_p_iAwsSinkManager swig_types[798] -#define SWIGTYPE_p_p_iAwsSlot swig_types[799] -#define SWIGTYPE_p_p_iAwsSource swig_types[800] -#define SWIGTYPE_p_p_iAwsStringKey swig_types[801] -#define SWIGTYPE_p_p_iBase swig_types[802] -#define SWIGTYPE_p_p_iBinaryLoaderPlugin swig_types[803] -#define SWIGTYPE_p_p_iBodyGroup swig_types[804] -#define SWIGTYPE_p_p_iCacheManager swig_types[805] -#define SWIGTYPE_p_p_iCamera swig_types[806] -#define SWIGTYPE_p_p_iCameraPosition swig_types[807] -#define SWIGTYPE_p_p_iCameraPositionList swig_types[808] -#define SWIGTYPE_p_p_iCameraSectorListener swig_types[809] -#define SWIGTYPE_p_p_iClipper2D swig_types[810] -#define SWIGTYPE_p_p_iCollideSystem swig_types[811] -#define SWIGTYPE_p_p_iCollider swig_types[812] -#define SWIGTYPE_p_p_iColoredVertices swig_types[813] -#define SWIGTYPE_p_p_iCommandLineParser swig_types[814] -#define SWIGTYPE_p_p_iComponent swig_types[815] -#define SWIGTYPE_p_p_iConfigFile swig_types[816] -#define SWIGTYPE_p_p_iConfigIterator swig_types[817] -#define SWIGTYPE_p_p_iConfigManager swig_types[818] -#define SWIGTYPE_p_p_iConsoleOutput swig_types[819] -#define SWIGTYPE_p_p_iConsoleWatcher swig_types[820] -#define SWIGTYPE_p_p_iDataBuffer swig_types[821] -#define SWIGTYPE_p_p_iDebugHelper swig_types[822] -#define SWIGTYPE_p_p_iDocument swig_types[823] -#define SWIGTYPE_p_p_iDocumentAttribute swig_types[824] -#define SWIGTYPE_p_p_iDocumentAttributeIterator swig_types[825] -#define SWIGTYPE_p_p_iDocumentNode swig_types[826] -#define SWIGTYPE_p_p_iDocumentNodeIterator swig_types[827] -#define SWIGTYPE_p_p_iDocumentSystem swig_types[828] -#define SWIGTYPE_p_p_iDynamicSystem swig_types[829] -#define SWIGTYPE_p_p_iDynamics swig_types[830] -#define SWIGTYPE_p_p_iDynamicsColliderCollisionCallback swig_types[831] -#define SWIGTYPE_p_p_iDynamicsCollisionCallback swig_types[832] -#define SWIGTYPE_p_p_iDynamicsMoveCallback swig_types[833] -#define SWIGTYPE_p_p_iDynamicsSystemCollider swig_types[834] -#define SWIGTYPE_p_p_iEngine swig_types[835] -#define SWIGTYPE_p_p_iEngineFrameCallback swig_types[836] -#define SWIGTYPE_p_p_iEngineSectorCallback swig_types[837] -#define SWIGTYPE_p_p_iEngineSequenceManager swig_types[838] -#define SWIGTYPE_p_p_iEngineSequenceParameters swig_types[839] -#define SWIGTYPE_p_p_iEvent swig_types[840] -#define SWIGTYPE_p_p_iEventAttributeIterator swig_types[841] -#define SWIGTYPE_p_p_iEventCord swig_types[842] -#define SWIGTYPE_p_p_iEventHandler swig_types[843] -#define SWIGTYPE_p_p_iEventNameRegistry swig_types[844] -#define SWIGTYPE_p_p_iEventOutlet swig_types[845] -#define SWIGTYPE_p_p_iEventPlug swig_types[846] -#define SWIGTYPE_p_p_iEventQueue swig_types[847] -#define SWIGTYPE_p_p_iFactory swig_types[848] -#define SWIGTYPE_p_p_iFile swig_types[849] -#define SWIGTYPE_p_p_iFont swig_types[850] -#define SWIGTYPE_p_p_iFontDeleteNotify swig_types[851] -#define SWIGTYPE_p_p_iFontServer swig_types[852] -#define SWIGTYPE_p_p_iFrustumView swig_types[853] -#define SWIGTYPE_p_p_iFrustumViewUserdata swig_types[854] -#define SWIGTYPE_p_p_iGenMeshAnimationControl swig_types[855] -#define SWIGTYPE_p_p_iGenMeshAnimationControlFactory swig_types[856] -#define SWIGTYPE_p_p_iGenMeshAnimationControlType swig_types[857] -#define SWIGTYPE_p_p_iGeneralFactoryState swig_types[858] -#define SWIGTYPE_p_p_iGeneralMeshCommonState swig_types[859] -#define SWIGTYPE_p_p_iGeneralMeshState swig_types[860] -#define SWIGTYPE_p_p_iGeneralMeshSubMesh swig_types[861] -#define SWIGTYPE_p_p_iGraphics2D swig_types[862] -#define SWIGTYPE_p_p_iGraphics3D swig_types[863] -#define SWIGTYPE_p_p_iHalo swig_types[864] -#define SWIGTYPE_p_p_iImage swig_types[865] -#define SWIGTYPE_p_p_iImageIO swig_types[866] -#define SWIGTYPE_p_p_iJoint swig_types[867] -#define SWIGTYPE_p_p_iJoystickDriver swig_types[868] -#define SWIGTYPE_p_p_iKeyComposer swig_types[869] -#define SWIGTYPE_p_p_iKeyboardDriver swig_types[870] -#define SWIGTYPE_p_p_iLight swig_types[871] -#define SWIGTYPE_p_p_iLightCallback swig_types[872] -#define SWIGTYPE_p_p_iLightIterator swig_types[873] -#define SWIGTYPE_p_p_iLightList swig_types[874] -#define SWIGTYPE_p_p_iLightVisibleCallback swig_types[875] -#define SWIGTYPE_p_p_iLightingProcessData swig_types[876] -#define SWIGTYPE_p_p_iLightingProcessInfo swig_types[877] -#define SWIGTYPE_p_p_iLoader swig_types[878] -#define SWIGTYPE_p_p_iLoaderPlugin swig_types[879] -#define SWIGTYPE_p_p_iLoaderStatus swig_types[880] -#define SWIGTYPE_p_p_iMapNode swig_types[881] -#define SWIGTYPE_p_p_iMaterial swig_types[882] -#define SWIGTYPE_p_p_iMaterialEngine swig_types[883] -#define SWIGTYPE_p_p_iMaterialList swig_types[884] -#define SWIGTYPE_p_p_iMaterialWrapper swig_types[885] -#define SWIGTYPE_p_p_iMeshDrawCallback swig_types[886] -#define SWIGTYPE_p_p_iMeshFactoryList swig_types[887] -#define SWIGTYPE_p_p_iMeshFactoryWrapper swig_types[888] -#define SWIGTYPE_p_p_iMeshList swig_types[889] -#define SWIGTYPE_p_p_iMeshObject swig_types[890] -#define SWIGTYPE_p_p_iMeshObjectDrawCallback swig_types[891] -#define SWIGTYPE_p_p_iMeshObjectFactory swig_types[892] -#define SWIGTYPE_p_p_iMeshObjectType swig_types[893] -#define SWIGTYPE_p_p_iMeshWrapper swig_types[894] -#define SWIGTYPE_p_p_iMeshWrapperIterator swig_types[895] -#define SWIGTYPE_p_p_iMissingLoaderData swig_types[896] -#define SWIGTYPE_p_p_iMouseDriver swig_types[897] -#define SWIGTYPE_p_p_iMovable swig_types[898] -#define SWIGTYPE_p_p_iMovableListener swig_types[899] -#define SWIGTYPE_p_p_iMovieRecorder swig_types[900] -#define SWIGTYPE_p_p_iNativeWindow swig_types[901] -#define SWIGTYPE_p_p_iNativeWindowManager swig_types[902] -#define SWIGTYPE_p_p_iODEAMotorJoint swig_types[903] -#define SWIGTYPE_p_p_iODEBallJoint swig_types[904] -#define SWIGTYPE_p_p_iODEDynamicState swig_types[905] -#define SWIGTYPE_p_p_iODEDynamicSystemState swig_types[906] -#define SWIGTYPE_p_p_iODEFrameUpdateCallback swig_types[907] -#define SWIGTYPE_p_p_iODEGeneralJointState swig_types[908] -#define SWIGTYPE_p_p_iODEHinge2Joint swig_types[909] -#define SWIGTYPE_p_p_iODEHingeJoint swig_types[910] -#define SWIGTYPE_p_p_iODEJointState swig_types[911] -#define SWIGTYPE_p_p_iODESliderJoint swig_types[912] -#define SWIGTYPE_p_p_iODEUniversalJoint swig_types[913] -#define SWIGTYPE_p_p_iObject swig_types[914] -#define SWIGTYPE_p_p_iObjectIterator swig_types[915] -#define SWIGTYPE_p_p_iObjectModel swig_types[916] -#define SWIGTYPE_p_p_iObjectModelListener swig_types[917] -#define SWIGTYPE_p_p_iObjectNameChangeListener swig_types[918] -#define SWIGTYPE_p_p_iObjectRegistry swig_types[919] -#define SWIGTYPE_p_p_iObjectRegistryIterator swig_types[920] -#define SWIGTYPE_p_p_iOffscreenCanvasCallback swig_types[921] -#define SWIGTYPE_p_p_iParameterESM swig_types[922] -#define SWIGTYPE_p_p_iParticleBuiltinEffectorFactory swig_types[923] -#define SWIGTYPE_p_p_iParticleBuiltinEffectorForce swig_types[924] -#define SWIGTYPE_p_p_iParticleBuiltinEffectorLinColor swig_types[925] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterBase swig_types[926] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterBox swig_types[927] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterCone swig_types[928] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterCylinder swig_types[929] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterFactory swig_types[930] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterSphere swig_types[931] -#define SWIGTYPE_p_p_iParticleEffector swig_types[932] -#define SWIGTYPE_p_p_iParticleEmitter swig_types[933] -#define SWIGTYPE_p_p_iParticleSystem swig_types[934] -#define SWIGTYPE_p_p_iParticleSystemBase swig_types[935] -#define SWIGTYPE_p_p_iParticleSystemFactory swig_types[936] -#define SWIGTYPE_p_p_iPath swig_types[937] -#define SWIGTYPE_p_p_iPluginIterator swig_types[938] -#define SWIGTYPE_p_p_iPluginManager swig_types[939] -#define SWIGTYPE_p_p_iPolygonHandle swig_types[940] -#define SWIGTYPE_p_p_iPolygonMesh swig_types[941] -#define SWIGTYPE_p_p_iPortal swig_types[942] -#define SWIGTYPE_p_p_iPortalCallback swig_types[943] -#define SWIGTYPE_p_p_iPortalContainer swig_types[944] -#define SWIGTYPE_p_p_iRegion swig_types[945] -#define SWIGTYPE_p_p_iRegionList swig_types[946] -#define SWIGTYPE_p_p_iRenderBuffer swig_types[947] -#define SWIGTYPE_p_p_iRendererLightmap swig_types[948] -#define SWIGTYPE_p_p_iReporter swig_types[949] -#define SWIGTYPE_p_p_iReporterIterator swig_types[950] -#define SWIGTYPE_p_p_iReporterListener swig_types[951] -#define SWIGTYPE_p_p_iRigidBody swig_types[952] -#define SWIGTYPE_p_p_iSCF swig_types[953] -#define SWIGTYPE_p_p_iSaver swig_types[954] -#define SWIGTYPE_p_p_iSceneNode swig_types[955] -#define SWIGTYPE_p_p_iScript swig_types[956] -#define SWIGTYPE_p_p_iScriptObject swig_types[957] -#define SWIGTYPE_p_p_iSector swig_types[958] -#define SWIGTYPE_p_p_iSectorCallback swig_types[959] -#define SWIGTYPE_p_p_iSectorIterator swig_types[960] -#define SWIGTYPE_p_p_iSectorList swig_types[961] -#define SWIGTYPE_p_p_iSectorMeshCallback swig_types[962] -#define SWIGTYPE_p_p_iSequenceTimedOperation swig_types[963] -#define SWIGTYPE_p_p_iSequenceTrigger swig_types[964] -#define SWIGTYPE_p_p_iSequenceWrapper swig_types[965] -#define SWIGTYPE_p_p_iShader swig_types[966] -#define SWIGTYPE_p_p_iShaderCompiler swig_types[967] -#define SWIGTYPE_p_p_iShaderManager swig_types[968] -#define SWIGTYPE_p_p_iShaderPriorityList swig_types[969] -#define SWIGTYPE_p_p_iShaderVarStack swig_types[970] -#define SWIGTYPE_p_p_iShaderVariableAccessor swig_types[971] -#define SWIGTYPE_p_p_iShaderVariableContext swig_types[972] -#define SWIGTYPE_p_p_iSimpleFormerState swig_types[973] -#define SWIGTYPE_p_p_iSndSysData swig_types[974] -#define SWIGTYPE_p_p_iSndSysListener swig_types[975] -#define SWIGTYPE_p_p_iSndSysLoader swig_types[976] -#define SWIGTYPE_p_p_iSndSysManager swig_types[977] -#define SWIGTYPE_p_p_iSndSysRenderer swig_types[978] -#define SWIGTYPE_p_p_iSndSysRendererCallback swig_types[979] -#define SWIGTYPE_p_p_iSndSysRendererSoftware swig_types[980] -#define SWIGTYPE_p_p_iSndSysSoftwareDriver swig_types[981] -#define SWIGTYPE_p_p_iSndSysSoftwareFilter3D swig_types[982] -#define SWIGTYPE_p_p_iSndSysSoftwareOutputFilter swig_types[983] -#define SWIGTYPE_p_p_iSndSysSource swig_types[984] -#define SWIGTYPE_p_p_iSndSysSourceSoftware swig_types[985] -#define SWIGTYPE_p_p_iSndSysSourceSoftware3D swig_types[986] -#define SWIGTYPE_p_p_iSndSysStream swig_types[987] -#define SWIGTYPE_p_p_iSndSysStreamCallback swig_types[988] -#define SWIGTYPE_p_p_iSndSysWrapper swig_types[989] -#define SWIGTYPE_p_p_iSprite2DFactoryState swig_types[990] -#define SWIGTYPE_p_p_iSprite2DState swig_types[991] -#define SWIGTYPE_p_p_iSprite2DUVAnimation swig_types[992] -#define SWIGTYPE_p_p_iSprite2DUVAnimationFrame swig_types[993] -#define SWIGTYPE_p_p_iSprite3DFactoryState swig_types[994] -#define SWIGTYPE_p_p_iSprite3DState swig_types[995] -#define SWIGTYPE_p_p_iSpriteAction swig_types[996] -#define SWIGTYPE_p_p_iSpriteCal3DFactoryState swig_types[997] -#define SWIGTYPE_p_p_iSpriteCal3DSocket swig_types[998] -#define SWIGTYPE_p_p_iSpriteCal3DState swig_types[999] -#define SWIGTYPE_p_p_iSpriteFrame swig_types[1000] -#define SWIGTYPE_p_p_iSpriteSocket swig_types[1001] -#define SWIGTYPE_p_p_iStandardReporterListener swig_types[1002] -#define SWIGTYPE_p_p_iString swig_types[1003] -#define SWIGTYPE_p_p_iStringArray swig_types[1004] -#define SWIGTYPE_p_p_iStringSet swig_types[1005] -#define SWIGTYPE_p_p_iSuperLightmap swig_types[1006] -#define SWIGTYPE_p_p_iTerraFormer swig_types[1007] -#define SWIGTYPE_p_p_iTerraSampler swig_types[1008] -#define SWIGTYPE_p_p_iTerrainFactoryState swig_types[1009] -#define SWIGTYPE_p_p_iTerrainObjectState swig_types[1010] -#define SWIGTYPE_p_p_iTextureCallback swig_types[1011] -#define SWIGTYPE_p_p_iTextureHandle swig_types[1012] -#define SWIGTYPE_p_p_iTextureList swig_types[1013] -#define SWIGTYPE_p_p_iTextureManager swig_types[1014] -#define SWIGTYPE_p_p_iTextureWrapper swig_types[1015] -#define SWIGTYPE_p_p_iThingEnvironment swig_types[1016] -#define SWIGTYPE_p_p_iThingFactoryState swig_types[1017] -#define SWIGTYPE_p_p_iThingState swig_types[1018] -#define SWIGTYPE_p_p_iVFS swig_types[1019] -#define SWIGTYPE_p_p_iView swig_types[1020] -#define SWIGTYPE_p_p_iVirtualClock swig_types[1021] -#define SWIGTYPE_p_p_iVisibilityCuller swig_types[1022] -#define SWIGTYPE_p_p_iVisibilityCullerListener swig_types[1023] -#define SWIGTYPE_p_p_iVisibilityObject swig_types[1024] -#define SWIGTYPE_p_p_iVisibilityObjectIterator swig_types[1025] -#define SWIGTYPE_p_p_scfImplementation1TcsPath_iPath_t swig_types[1026] -#define SWIGTYPE_p_p_void swig_types[1027] -#define SWIGTYPE_p_scfImplementation1TcsPath_iPath_t swig_types[1028] -#define SWIGTYPE_p_size_t swig_types[1029] -#define SWIGTYPE_p_uint16_t swig_types[1030] -#define SWIGTYPE_p_uint32_t swig_types[1031] -#define SWIGTYPE_p_uint64_t swig_types[1032] -#define SWIGTYPE_p_uint8_t swig_types[1033] -#define SWIGTYPE_p_uint_least64_t swig_types[1034] -#define SWIGTYPE_p_unsigned_char swig_types[1035] -#define SWIGTYPE_p_unsigned_int swig_types[1036] -#define SWIGTYPE_p_unsigned_long swig_types[1037] -#define SWIGTYPE_p_utf32_char swig_types[1038] -#define SWIGTYPE_p_void swig_types[1039] -#define SWIGTYPE_p_wchar_t swig_types[1040] -static swig_type_info *swig_types[1042]; -static swig_module_info swig_module = {swig_types, 1041, 0, 0, 0, 0}; +#define SWIGTYPE_p_csRefTiStringArray_t swig_types[169] +#define SWIGTYPE_p_csRefTiString_t swig_types[170] +#define SWIGTYPE_p_csRenderBufferHolder swig_types[171] +#define SWIGTYPE_p_csRenderBufferName swig_types[172] +#define SWIGTYPE_p_csRenderMesh swig_types[173] +#define SWIGTYPE_p_csRenderMeshList swig_types[174] +#define SWIGTYPE_p_csRenderMeshModes swig_types[175] +#define SWIGTYPE_p_csReporterHelper swig_types[176] +#define SWIGTYPE_p_csReversibleTransform swig_types[177] +#define SWIGTYPE_p_csScreenBoxResult swig_types[178] +#define SWIGTYPE_p_csSectorHitBeamResult swig_types[179] +#define SWIGTYPE_p_csSegment2 swig_types[180] +#define SWIGTYPE_p_csSegment3 swig_types[181] +#define SWIGTYPE_p_csSetTcsPtrKeyTiMeshWrapper_t_CS__Memory__AllocatorMalloc_t swig_types[182] +#define SWIGTYPE_p_csSetTunsigned_long_CS__Memory__AllocatorMalloc_t swig_types[183] +#define SWIGTYPE_p_csShaderMetadata swig_types[184] +#define SWIGTYPE_p_csShaderTagPresence swig_types[185] +#define SWIGTYPE_p_csShaderVariable swig_types[186] +#define SWIGTYPE_p_csSimplePixmap swig_types[187] +#define SWIGTYPE_p_csSimpleRenderMesh swig_types[188] +#define SWIGTYPE_p_csSndSysRendererSoftware swig_types[189] +#define SWIGTYPE_p_csSndSysSoundFormat swig_types[190] +#define SWIGTYPE_p_csSourceParameters3D swig_types[191] +#define SWIGTYPE_p_csSphere swig_types[192] +#define SWIGTYPE_p_csSpline swig_types[193] +#define SWIGTYPE_p_csSprite2DVertex swig_types[194] +#define SWIGTYPE_p_csSpriteCal3DActiveAnim swig_types[195] +#define SWIGTYPE_p_csSquaredDist swig_types[196] +#define SWIGTYPE_p_csStrKey swig_types[197] +#define SWIGTYPE_p_csString swig_types[198] +#define SWIGTYPE_p_csStringArray swig_types[199] +#define SWIGTYPE_p_csStringBase swig_types[200] +#define SWIGTYPE_p_csStringFastT36_t swig_types[201] +#define SWIGTYPE_p_csStringSet swig_types[202] +#define SWIGTYPE_p_csTinyDocumentSystem swig_types[203] +#define SWIGTYPE_p_csTraceBeamResult swig_types[204] +#define SWIGTYPE_p_csTransform swig_types[205] +#define SWIGTYPE_p_csTriangle swig_types[206] +#define SWIGTYPE_p_csVector2 swig_types[207] +#define SWIGTYPE_p_csVector3 swig_types[208] +#define SWIGTYPE_p_csVector3Array swig_types[209] +#define SWIGTYPE_p_csVector4 swig_types[210] +#define SWIGTYPE_p_csVertexAttrib swig_types[211] +#define SWIGTYPE_p_csVertexStatus swig_types[212] +#define SWIGTYPE_p_csView swig_types[213] +#define SWIGTYPE_p_csWrapPtr swig_types[214] +#define SWIGTYPE_p_csXRotMatrix3 swig_types[215] +#define SWIGTYPE_p_csXScaleMatrix3 swig_types[216] +#define SWIGTYPE_p_csYRotMatrix3 swig_types[217] +#define SWIGTYPE_p_csYScaleMatrix3 swig_types[218] +#define SWIGTYPE_p_csZRotMatrix3 swig_types[219] +#define SWIGTYPE_p_csZScaleMatrix3 swig_types[220] +#define SWIGTYPE_p_double swig_types[221] +#define SWIGTYPE_p_f_p_iBase__p__csPyEventHandler swig_types[222] +#define SWIGTYPE_p_f_p_iBase__p_csPath swig_types[223] +#define SWIGTYPE_p_f_p_iBase__p_iAnimTimeUpdateHandler swig_types[224] +#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsShaderVariable_p_t swig_types[225] +#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsSprite2DVertex_t swig_types[226] +#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[227] +#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[228] +#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[229] +#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[230] +#define SWIGTYPE_p_f_p_iBase__p_iAws swig_types[231] +#define SWIGTYPE_p_f_p_iBase__p_iAwsComponent swig_types[232] +#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentFactory swig_types[233] +#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentNode swig_types[234] +#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionKey swig_types[235] +#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionNodeFactory swig_types[236] +#define SWIGTYPE_p_f_p_iBase__p_iAwsFloatKey swig_types[237] +#define SWIGTYPE_p_f_p_iBase__p_iAwsIntKey swig_types[238] +#define SWIGTYPE_p_f_p_iBase__p_iAwsKey swig_types[239] +#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyContainer swig_types[240] +#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyFactory swig_types[241] +#define SWIGTYPE_p_f_p_iBase__p_iAwsLayoutManager swig_types[242] +#define SWIGTYPE_p_f_p_iBase__p_iAwsPointKey swig_types[243] +#define SWIGTYPE_p_f_p_iBase__p_iAwsPrefManager swig_types[244] +#define SWIGTYPE_p_f_p_iBase__p_iAwsRGBKey swig_types[245] +#define SWIGTYPE_p_f_p_iBase__p_iAwsRectKey swig_types[246] +#define SWIGTYPE_p_f_p_iBase__p_iAwsSink swig_types[247] +#define SWIGTYPE_p_f_p_iBase__p_iAwsSinkManager swig_types[248] +#define SWIGTYPE_p_f_p_iBase__p_iAwsSlot swig_types[249] +#define SWIGTYPE_p_f_p_iBase__p_iAwsSource swig_types[250] +#define SWIGTYPE_p_f_p_iBase__p_iAwsStringKey swig_types[251] +#define SWIGTYPE_p_f_p_iBase__p_iBase swig_types[252] +#define SWIGTYPE_p_f_p_iBase__p_iBinaryLoaderPlugin swig_types[253] +#define SWIGTYPE_p_f_p_iBase__p_iBodyGroup swig_types[254] +#define SWIGTYPE_p_f_p_iBase__p_iCacheManager swig_types[255] +#define SWIGTYPE_p_f_p_iBase__p_iCamera swig_types[256] +#define SWIGTYPE_p_f_p_iBase__p_iCameraPosition swig_types[257] +#define SWIGTYPE_p_f_p_iBase__p_iCameraPositionList swig_types[258] +#define SWIGTYPE_p_f_p_iBase__p_iCameraSectorListener swig_types[259] +#define SWIGTYPE_p_f_p_iBase__p_iClipper2D swig_types[260] +#define SWIGTYPE_p_f_p_iBase__p_iCollideSystem swig_types[261] +#define SWIGTYPE_p_f_p_iBase__p_iCollider swig_types[262] +#define SWIGTYPE_p_f_p_iBase__p_iColoredVertices swig_types[263] +#define SWIGTYPE_p_f_p_iBase__p_iCommandLineParser swig_types[264] +#define SWIGTYPE_p_f_p_iBase__p_iComponent swig_types[265] +#define SWIGTYPE_p_f_p_iBase__p_iConfigFile swig_types[266] +#define SWIGTYPE_p_f_p_iBase__p_iConfigIterator swig_types[267] +#define SWIGTYPE_p_f_p_iBase__p_iConfigManager swig_types[268] +#define SWIGTYPE_p_f_p_iBase__p_iConsoleOutput swig_types[269] +#define SWIGTYPE_p_f_p_iBase__p_iConsoleWatcher swig_types[270] +#define SWIGTYPE_p_f_p_iBase__p_iDataBuffer swig_types[271] +#define SWIGTYPE_p_f_p_iBase__p_iDebugHelper swig_types[272] +#define SWIGTYPE_p_f_p_iBase__p_iDocument swig_types[273] +#define SWIGTYPE_p_f_p_iBase__p_iDocumentAttribute swig_types[274] +#define SWIGTYPE_p_f_p_iBase__p_iDocumentAttributeIterator swig_types[275] +#define SWIGTYPE_p_f_p_iBase__p_iDocumentNode swig_types[276] +#define SWIGTYPE_p_f_p_iBase__p_iDocumentNodeIterator swig_types[277] +#define SWIGTYPE_p_f_p_iBase__p_iDocumentSystem swig_types[278] +#define SWIGTYPE_p_f_p_iBase__p_iDynamicSystem swig_types[279] +#define SWIGTYPE_p_f_p_iBase__p_iDynamics swig_types[280] +#define SWIGTYPE_p_f_p_iBase__p_iDynamicsColliderCollisionCallback swig_types[281] +#define SWIGTYPE_p_f_p_iBase__p_iDynamicsCollisionCallback swig_types[282] +#define SWIGTYPE_p_f_p_iBase__p_iDynamicsMoveCallback swig_types[283] +#define SWIGTYPE_p_f_p_iBase__p_iDynamicsSystemCollider swig_types[284] +#define SWIGTYPE_p_f_p_iBase__p_iEngine swig_types[285] +#define SWIGTYPE_p_f_p_iBase__p_iEngineFrameCallback swig_types[286] +#define SWIGTYPE_p_f_p_iBase__p_iEngineSectorCallback swig_types[287] +#define SWIGTYPE_p_f_p_iBase__p_iEngineSequenceManager swig_types[288] +#define SWIGTYPE_p_f_p_iBase__p_iEngineSequenceParameters swig_types[289] +#define SWIGTYPE_p_f_p_iBase__p_iEvent swig_types[290] +#define SWIGTYPE_p_f_p_iBase__p_iEventAttributeIterator swig_types[291] +#define SWIGTYPE_p_f_p_iBase__p_iEventCord swig_types[292] +#define SWIGTYPE_p_f_p_iBase__p_iEventHandler swig_types[293] +#define SWIGTYPE_p_f_p_iBase__p_iEventNameRegistry swig_types[294] +#define SWIGTYPE_p_f_p_iBase__p_iEventOutlet swig_types[295] +#define SWIGTYPE_p_f_p_iBase__p_iEventPlug swig_types[296] +#define SWIGTYPE_p_f_p_iBase__p_iEventQueue swig_types[297] +#define SWIGTYPE_p_f_p_iBase__p_iFactory swig_types[298] +#define SWIGTYPE_p_f_p_iBase__p_iFile swig_types[299] +#define SWIGTYPE_p_f_p_iBase__p_iFont swig_types[300] +#define SWIGTYPE_p_f_p_iBase__p_iFontDeleteNotify swig_types[301] +#define SWIGTYPE_p_f_p_iBase__p_iFontServer swig_types[302] +#define SWIGTYPE_p_f_p_iBase__p_iFrustumView swig_types[303] +#define SWIGTYPE_p_f_p_iBase__p_iFrustumViewUserdata swig_types[304] +#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControl swig_types[305] +#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControlFactory swig_types[306] +#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControlType swig_types[307] +#define SWIGTYPE_p_f_p_iBase__p_iGeneralFactoryState swig_types[308] +#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshCommonState swig_types[309] +#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshState swig_types[310] +#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshSubMesh swig_types[311] +#define SWIGTYPE_p_f_p_iBase__p_iGraphics2D swig_types[312] +#define SWIGTYPE_p_f_p_iBase__p_iGraphics3D swig_types[313] +#define SWIGTYPE_p_f_p_iBase__p_iHalo swig_types[314] +#define SWIGTYPE_p_f_p_iBase__p_iImage swig_types[315] +#define SWIGTYPE_p_f_p_iBase__p_iImageIO swig_types[316] +#define SWIGTYPE_p_f_p_iBase__p_iJoint swig_types[317] +#define SWIGTYPE_p_f_p_iBase__p_iJoystickDriver swig_types[318] +#define SWIGTYPE_p_f_p_iBase__p_iKeyComposer swig_types[319] +#define SWIGTYPE_p_f_p_iBase__p_iKeyboardDriver swig_types[320] +#define SWIGTYPE_p_f_p_iBase__p_iLight swig_types[321] ... [truncated message content] |
From: <jo...@us...> - 2006-09-15 07:41:08
|
Revision: 25339 http://svn.sourceforge.net/crystal/?rev=25339&view=rev Author: jorrit Date: 2006-09-15 00:40:57 -0700 (Fri, 15 Sep 2006) Log Message: ----------- - Jorrit fixed viewmesh so that it starts at the current dir instead of an internal CEGUI directory. Modified Paths: -------------- CS/trunk/apps/tools/viewmesh/viewmesh.cpp CS/trunk/docs/history.txt Modified: CS/trunk/apps/tools/viewmesh/viewmesh.cpp =================================================================== --- CS/trunk/apps/tools/viewmesh/viewmesh.cpp 2006-09-15 00:27:21 UTC (rev 25338) +++ CS/trunk/apps/tools/viewmesh/viewmesh.cpp 2006-09-15 07:40:57 UTC (rev 25339) @@ -635,6 +635,7 @@ // ------------------------------------------------------------------------ + vfs->ChDir ("/this/"); btn = winMgr->getWindow("StdDlg/Path"); btn->setProperty("Text", vfs->GetCwd()); StdDlgUpdateLists(vfs->GetCwd()); Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-15 00:27:21 UTC (rev 25338) +++ CS/trunk/docs/history.txt 2006-09-15 07:40:57 UTC (rev 25339) @@ -6,6 +6,9 @@ individual changes for each given day, however, are in normal (ascending) chronological order. +15-Sep-2006 + - Jorrit fixed viewmesh so that it starts at the current dir instead + of an internal CEGUI directory. 14-Sep-2006 - Genjix added iConfigFile GetTuple() and SetTuple(), for storing and getting a list of variable objects in config files. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2006-09-15 17:24:59
|
Revision: 25346 http://svn.sourceforge.net/crystal/?rev=25346&view=rev Author: res2002 Date: 2006-09-15 10:24:39 -0700 (Fri, 15 Sep 2006) Log Message: ----------- Fix MSVC issues introduced by r25337 Modified Paths: -------------- CS/trunk/include/csutil/cfgdoc.h CS/trunk/include/csutil/cfgfile.h CS/trunk/include/csutil/csprocessorcap.h CS/trunk/include/iutil/cfgfile.h CS/trunk/libs/csutil/cfgdoc.cpp CS/trunk/libs/csutil/cfgfile.cpp CS/trunk/libs/csutil/cfgmgr.cpp Modified: CS/trunk/include/csutil/cfgdoc.h =================================================================== --- CS/trunk/include/csutil/cfgdoc.h 2006-09-15 14:25:56 UTC (rev 25345) +++ CS/trunk/include/csutil/cfgdoc.h 2006-09-15 17:24:39 UTC (rev 25346) @@ -67,7 +67,7 @@ delete[] originalKey; } }; - csHash<KeyInfo, csStrKey> keys; + csHash<KeyInfo, csString> keys; void ParseDocument (iDocument* doc, bool Merge = false, bool NewWins = true); @@ -113,7 +113,7 @@ virtual void SetInt (const char *Key, int Value); virtual void SetFloat (const char *Key, float Value); virtual void SetBool (const char *Key, bool Value); - virtual void SetTuple (const char *Key, csRef<iStringArray> Value); + virtual void SetTuple (const char *Key, iStringArray* Value); virtual bool SetComment (const char *Key, const char *Text); virtual void DeleteKey (const char *Key); virtual const char *GetEOFComment () const; Modified: CS/trunk/include/csutil/cfgfile.h =================================================================== --- CS/trunk/include/csutil/cfgfile.h 2006-09-15 14:25:56 UTC (rev 25345) +++ CS/trunk/include/csutil/cfgfile.h 2006-09-15 17:24:39 UTC (rev 25346) @@ -135,7 +135,7 @@ /// Set a boolean value. virtual void SetBool (const char *Key, bool Value); /// Set a tuple value. - virtual void SetTuple (const char *Key, csRef<iStringArray> Value); + virtual void SetTuple (const char *Key, iStringArray* Value); /** * Set the comment for given key. In addition to an actual comment, you can * use "" for Text to place an empty comment line before this key, or 0 to Modified: CS/trunk/include/csutil/csprocessorcap.h =================================================================== --- CS/trunk/include/csutil/csprocessorcap.h 2006-09-15 14:25:56 UTC (rev 25345) +++ CS/trunk/include/csutil/csprocessorcap.h 2006-09-15 17:24:39 UTC (rev 25346) @@ -27,95 +27,61 @@ /** * This class is used to identify capabilities in the processor such as - * support for MMX and SSE + * support for MMX and SSE. */ -class CS_CRYSTALSPACE_EXPORT csProcessorCapability +class csProcessorCapability { public: /** - * Constructor. Does nothing + * Constructor. */ csProcessorCapability () { - } - - /** - * Destructor. Does nothing - */ - ~csProcessorCapability () - { - } - - /** - * Initialize the internal data. Query the processor and see what we get - */ - static inline void Initialize () - { - if (isInitialized) - return; - #ifdef CS_PROCESSOR_X86 CheckX86Processor (); #else mmxSupported = false; sseSupported = false; - processorName[0] = 0; #endif } - static inline bool HasMMX () + /** + * Destructor. Does nothing + */ + ~csProcessorCapability () { - Initialize (); - - return mmxSupported; } - static inline bool HasSSE () - { - Initialize (); + /// Returns whether MMX is supported. + inline bool HasMMX () { return mmxSupported; } + /// Returns whether SSE is supported. + inline bool HasSSE () { return sseSupported; } + /// Returns the processor's vendor name (e.g. GenuineIntel or AuthenticAMD) + inline const char* GetVendorName () { return processorName; } - return sseSupported; - } - - static inline const char* GetProcessorName () - { - Initialize (); - - return processorName; - } - private: - - /// Have we been initialized yet - static bool isInitialized; - /// Is mmx supported - static bool mmxSupported; - + bool mmxSupported; /// Is SSE supported - static bool sseSupported; - - /// Is 3dNow! supported - static bool AMD3dnowSupported; - + bool sseSupported; /// The name of the processor - static char processorName[16]; + char processorName[16]; #if defined(CS_PROCESSOR_X86) && (CS_PROCESSOR_SIZE == 32) /** - * Check for x86 features. This function is written twice due to different - * syntax for inline assembly on MSVC and GCC - */ - static inline void CheckX86Processor () + * Check for x86 features. This function is written twice due to different + * syntax for inline assembly on MSVC and GCC + */ + inline void CheckX86Processor () { int32 capFlags = 0; int CPUnum; int maxEax = 0; - const char* procName = processorName; + char* procName = processorName; bool have_cpuid; - + #if defined(CS_COMPILER_MSVC) __asm { @@ -238,7 +204,7 @@ //AMD3dnowSupported = capFlags & (1<<31); } #else //CS_PROCESSOR_X86 - static inline void CheckX86Processor() {} + inline void CheckX86Processor() {} #endif //CS_PROCESSOR_X86 }; Modified: CS/trunk/include/iutil/cfgfile.h =================================================================== --- CS/trunk/include/iutil/cfgfile.h 2006-09-15 14:25:56 UTC (rev 25345) +++ CS/trunk/include/iutil/cfgfile.h 2006-09-15 17:24:39 UTC (rev 25346) @@ -26,10 +26,10 @@ * @{ */ #include "csutil/scf_interface.h" #include "csutil/ref.h" + struct iConfigIterator; struct iVFS; - /** * Configuration file interface. */ @@ -133,7 +133,7 @@ /// Set a boolean value. virtual void SetBool (const char *Key, bool Value) = 0; /// Set a tuple value. - virtual void SetTuple (const char *Key, csRef<iStringArray> Value) = 0; + virtual void SetTuple (const char *Key, iStringArray* Value) = 0; /** * Set the comment for given key. In addition to an actual comment, you can * use "" for Text to place an empty comment line before this key, or 0 to Modified: CS/trunk/libs/csutil/cfgdoc.cpp =================================================================== --- CS/trunk/libs/csutil/cfgdoc.cpp 2006-09-15 14:25:56 UTC (rev 25345) +++ CS/trunk/libs/csutil/cfgdoc.cpp 2006-09-15 17:24:39 UTC (rev 25346) @@ -19,18 +19,18 @@ #include "cssysdef.h" #include "iutil/vfs.h" +#include "csutil/cfgdoc.h" #include "csutil/physfile.h" #include "csutil/util.h" #include "csutil/scf.h" #include "csutil/scf_implementation.h" #include "csutil/xmltiny.h" -#include "csutil/cfgdoc.h" class csConfigDocumentIterator : public scfImplementation1< csConfigDocumentIterator, iConfigIterator> { csRef<csConfigDocument> doc; - csHash<csConfigDocument::KeyInfo, csStrKey>::GlobalIterator* iterator; + csHash<csConfigDocument::KeyInfo, csString>::GlobalIterator* iterator; char* subsection; size_t subsectionLen; const csConfigDocument::KeyInfo* currentKey; @@ -62,7 +62,7 @@ subsection = csStrNew (Subsection); subsectionLen = subsection ? strlen (subsection) : 0; iterator = new csHash<csConfigDocument::KeyInfo, - csStrKey>::GlobalIterator (doc->keys.GetIterator ()); + csString>::GlobalIterator (doc->keys.GetIterator ()); } csConfigDocumentIterator::~csConfigDocumentIterator() @@ -84,7 +84,7 @@ void csConfigDocumentIterator::Rewind () { currentKey = 0; - currentKeyName = csStrKey (0); + currentKeyName = 0; iterator->Reset(); } @@ -400,7 +400,7 @@ { } -void csConfigDocument::SetTuple (const char * /*Key*/, csRef<iStringArray> /*Value*/) +void csConfigDocument::SetTuple (const char * /*Key*/, iStringArray* /*Value*/) { } Modified: CS/trunk/libs/csutil/cfgfile.cpp =================================================================== --- CS/trunk/libs/csutil/cfgfile.cpp 2006-09-15 14:25:56 UTC (rev 25345) +++ CS/trunk/libs/csutil/cfgfile.cpp 2006-09-15 17:24:39 UTC (rev 25346) @@ -52,7 +52,7 @@ void SetInt(int); void SetFloat(float); void SetBool(bool); - void SetTuple (csRef<iStringArray> Value); + void SetTuple (iStringArray* Value); void SetComment(const char*); // get data const char *GetStr() const; @@ -153,7 +153,7 @@ SetStr(b ? "true" : "false"); } -void csConfigNode::SetTuple (csRef<iStringArray> Value) +void csConfigNode::SetTuple (iStringArray* Value) { // this should output a string like // abc, def, ghi @@ -208,7 +208,7 @@ char *sinp = Data; char *comp; - int len; + size_t len; bool finished = false; while (!finished) @@ -705,7 +705,7 @@ } } -void csConfigFile::SetTuple (const char *Key, csRef<iStringArray> Value) +void csConfigFile::SetTuple (const char *Key, iStringArray* Value) { csConfigNode *Node = FindNode(Key); bool const Create = !Node; Modified: CS/trunk/libs/csutil/cfgmgr.cpp =================================================================== --- CS/trunk/libs/csutil/cfgmgr.cpp 2006-09-15 14:25:56 UTC (rev 25345) +++ CS/trunk/libs/csutil/cfgmgr.cpp 2006-09-15 17:24:39 UTC (rev 25346) @@ -479,7 +479,7 @@ ClearKeyAboveDynamic(Key); } -void csConfigManager::SetTuple (const char *Key, csRef<iStringArray> Value) +void csConfigManager::SetTuple (const char *Key, iStringArray* Value) { DynamicDomain->Cfg->SetTuple(Key, Value); ClearKeyAboveDynamic(Key); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2006-09-15 17:32:59
|
Revision: 25348 http://svn.sourceforge.net/crystal/?rev=25348&view=rev Author: res2002 Date: 2006-09-15 10:32:49 -0700 (Fri, 15 Sep 2006) Log Message: ----------- res changed CS_DEPRECATED_TYPE to be useable on MSVC as well. Modified Paths: -------------- CS/trunk/docs/history.txt CS/trunk/include/cssysdef.h Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-15 17:31:17 UTC (rev 25347) +++ CS/trunk/docs/history.txt 2006-09-15 17:32:49 UTC (rev 25348) @@ -24,7 +24,7 @@ character_bump2.xml.The new shaders provides 4 bones per vertex mapping and software animation using vproc_std. The old shaders will be removed after improving of the new ones. - + - res changed CS_DEPRECATED_TYPE to be useable on MSVC as well. 14-Sep-2006 - Genjix added iConfigFile GetTuple() and SetTuple(), for storing and getting a list of variable objects in config files. Modified: CS/trunk/include/cssysdef.h =================================================================== --- CS/trunk/include/cssysdef.h 2006-09-15 17:31:17 UTC (rev 25347) +++ CS/trunk/include/cssysdef.h 2006-09-15 17:32:49 UTC (rev 25348) @@ -893,14 +893,15 @@ * Use the CS_DEPRECATED_TYPE macro after type declarations to * indicate that they are deprecated. Example: * \code - * typedef csFoo csBar CS_DEPRECATED_TYPE; + * typedef CS_DEPRECATED_TYPE csFoo csBar; + * class CS_DEPRECATED_TYPE csBaz { }; * \endcode * Compilers which are capable of flagging deprecation will exhibit a warning * when it encounters client code using types so tagged. */ #if !defined(CS_DEPRECATED_TYPE) || defined(DOXYGEN_RUN) # if defined(CS_COMPILER_MSVC) -# define CS_DEPRECATED_TYPE +# define CS_DEPRECATED_TYPE __declspec(deprecated) # else # define CS_DEPRECATED_TYPE # endif @@ -911,7 +912,11 @@ * on compilers that support it. */ #if !defined(CS_DEPRECATED_TYPE_MSG) || defined(DOXYGEN_RUN) -# define CS_DEPRECATED_TYPE_MSG(msg) CS_DEPRECATED_TYPE +# if defined(CS_COMPILER_MSVC) && _MSC_VER >= 1400 +# define CS_DEPRECATED_TYPE_MSG(msg) __declspec(deprecated(msg)) +# else +# define CS_DEPRECATED_TYPE_MSG(msg) CS_DEPRECATED_TYPE +# endif #endif /**\def CS_CONST_METHOD This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2006-09-15 17:46:27
|
Revision: 25351 http://svn.sourceforge.net/crystal/?rev=25351&view=rev Author: res2002 Date: 2006-09-15 10:43:50 -0700 (Fri, 15 Sep 2006) Log Message: ----------- res marked some types and methods that were deprecated as per the API docs with the deprecation macros. Also changed some instances to use the _MSG variant. Lastly, fixed some deprecation warnings. Modified Paths: -------------- CS/trunk/apps/demo/demo.cpp CS/trunk/apps/demo/demoldr.cpp CS/trunk/apps/demo/demoseq.cpp CS/trunk/docs/history.txt CS/trunk/include/csgeom/cspoint.h CS/trunk/include/csgeom/csrect.h CS/trunk/include/csgeom/fastsqrt.h CS/trunk/include/csgeom/path.h CS/trunk/include/csgeom/subrec2.h CS/trunk/include/csplugincommon/particlesys/partgen.h CS/trunk/include/csplugincommon/win32/customcursor.h CS/trunk/include/csqint.h CS/trunk/include/cstool/keyval.h CS/trunk/include/cstool/meshobjtmpl.h CS/trunk/include/csutil/archive.h CS/trunk/include/csutil/array.h CS/trunk/include/csutil/bitarray.h CS/trunk/include/csutil/csstring.h CS/trunk/include/csutil/hash.h CS/trunk/include/csutil/partialorder.h CS/trunk/include/csutil/scfarray.h CS/trunk/include/csutil/scfstr.h CS/trunk/include/csutil/scfstringarray.h CS/trunk/include/csutil/strhash.h CS/trunk/include/csutil/strset.h CS/trunk/include/csutil/syspath.h CS/trunk/include/csutil/util.h CS/trunk/include/csutil/verbosity.h CS/trunk/include/iaws/aws.h CS/trunk/include/iengine/mesh.h CS/trunk/include/iengine/sector.h CS/trunk/include/imesh/objmodel.h CS/trunk/include/iutil/array.h CS/trunk/include/iutil/stringarray.h CS/trunk/include/iutil/strset.h CS/trunk/include/iutil/verbositymanager.h CS/trunk/include/ivideo/graph2d.h CS/trunk/libs/csplugincommon/opengl/driverdb.cpp CS/trunk/libs/csplugincommon/win32/customcursor.cpp CS/trunk/libs/cstool/keyval.cpp CS/trunk/libs/csutil/archive.cpp CS/trunk/libs/csutil/win32/win32.cpp CS/trunk/plugins/engine/3d/light.h CS/trunk/plugins/engine/3d/material.h CS/trunk/plugins/engine/3d/meshobj.cpp CS/trunk/plugins/engine/3d/meshobj.h CS/trunk/plugins/engine/3d/sector.h CS/trunk/plugins/font/server/csfont/csfont.h CS/trunk/plugins/font/server/fontplex/fontplex.cpp CS/trunk/plugins/font/server/fontplex/fontplex.h CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp CS/trunk/plugins/mesh/genmesh/skelanim/gmeshskelanim.cpp CS/trunk/plugins/video/cursor/cursor.cpp CS/trunk/plugins/video/cursor/cursor.h CS/trunk/plugins/video/render3d/opengl/gl_render3d.cpp CS/trunk/plugins/video/render3d/opengl/gl_txtmgr.h CS/trunk/plugins/video/render3d/shader/shadermgr/shadermgr.cpp CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_ffp.cpp CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_ffp.h Modified: CS/trunk/apps/demo/demo.cpp =================================================================== --- CS/trunk/apps/demo/demo.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/apps/demo/demo.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -533,8 +533,8 @@ csNamedPath* np = seqmgr->GetSelectedPath (map_selpath, start, total); if (np) { - float r = np->GetTimeValue (map_selpoint); - np->Calculate (r); + float r = np->GetTime (map_selpoint); + np->CalculateAtTime (r); debug_time = csTicks (start + total * r); } else @@ -547,8 +547,8 @@ csNamedPath* np = seqmgr->GetSelectedPath (map_selpath); if (np) { - float r = np->GetTimeValue (map_selpoint); - np->Calculate (r); + float r = np->GetTime (map_selpoint); + np->CalculateAtTime (r); csVector3 pos, up, forward; np->GetInterpolatedPosition (pos); np->GetInterpolatedUp (up); @@ -649,7 +649,7 @@ fwd.x, fwd.y, fwd.z); hh += fh; GfxWrite (ww, hh, col_black, col_white, "U(%.2g,%.2g,%.2g)", up.x, up.y, up.z); hh += fh; - float t = np->GetTimeValue (map_selpoint); + float t = np->GetTime (map_selpoint); csTicks tms = csTicks (t*total); GfxWrite (ww, hh, col_black, col_white, "tot time %d ms", total); hh += fh; GfxWrite (ww, hh, col_black, col_white, "rel time %d ms", tms); hh += fh; @@ -659,7 +659,7 @@ csVector3 v1; np->GetPositionVector (map_selpoint-1, v1); float d = csQsqrt (csSquaredDist::PointPoint (v, v1)); - float t1 = np->GetTimeValue (map_selpoint-1); + float t1 = np->GetTime (map_selpoint-1); float dr = t-t1; float speed = (float) fabs (dr) / d; csTicks tms1 = csTicks (t1*total); @@ -674,7 +674,7 @@ { csVector3 v1; np->GetPositionVector (map_selpoint+1, v1); - float t1 = np->GetTimeValue (map_selpoint+1); + float t1 = np->GetTime (map_selpoint+1); float dr = t1-t; float d = csQsqrt (csSquaredDist::PointPoint (v, v1)); float speed = (float) fabs (dr) / d; @@ -823,7 +823,7 @@ case '=': // Make the forward vector look along the path. i.e. let it look // to an average direction as specified by next and previous point. - if (map_selpoint <= 0 || map_selpoint >= np->GetPointCount ()-1) + if (map_selpoint <= 0 || map_selpoint >= np->Length ()-1) { ShowMessage ("The '=' operation can't work on this point!\n"); } @@ -874,7 +874,7 @@ case '+': // Make the forward vector look along the path. i.e. let it look // to the next point in the path if there is one. - if (map_selpoint >= np->GetPointCount ()-1) + if (map_selpoint >= np->Length ()-1) { csVector3 v1, v2; np->GetPositionVector (map_selpoint-1, v1); @@ -1007,9 +1007,9 @@ csRef<iFile> fp (myVFS->Open (buf, VFS_FILE_WRITE)); if (fp) { - int i, num = np->GetPointCount (); + int i, num = np->Length (); FileWrite (fp, " NUM (%d)\n", num); - const float* t = np->GetTimeValues (); + const float* t = np->GetTimes (); FileWrite (fp, " TIMES (%g", t[0]); for (i = 1 ; i < num ; i++) FileWrite (fp, ",%g", t[i]); @@ -1049,7 +1049,7 @@ { np->InsertPoint (map_selpoint); map_selpoint++; - if (map_selpoint == np->GetPointCount ()-1) + if (map_selpoint == np->Length ()-1) { csVector3 v; np->GetPositionVector (map_selpoint-1, v); @@ -1082,18 +1082,18 @@ if (np) { np->RemovePoint (map_selpoint); - if (map_selpoint >= np->GetPointCount ()) + if (map_selpoint >= np->Length ()) map_selpoint--; } break; case ',': if (np) { - if (map_selpoint > 0 && map_selpoint < np->GetPointCount ()-1) + if (map_selpoint > 0 && map_selpoint < np->Length ()-1) { - float t = np->GetTimeValue (map_selpoint); - float t1 = np->GetTimeValue (map_selpoint-1); - float t2 = np->GetTimeValue (map_selpoint+1); + float t = np->GetTime (map_selpoint); + float t1 = np->GetTime (map_selpoint-1); + float t2 = np->GetTime (map_selpoint+1); float dt = (t2-t1); if (shift) dt /= 5.; else if (ctrl) dt /= 500.; @@ -1107,33 +1107,33 @@ case '.': if (np) { - if (map_selpoint > 0 && map_selpoint < np->GetPointCount ()-1) + if (map_selpoint > 0 && map_selpoint < np->Length ()-1) { - float t = np->GetTimeValue (map_selpoint); - float t1 = np->GetTimeValue (map_selpoint-1); - float t2 = np->GetTimeValue (map_selpoint+1); + float t = np->GetTime (map_selpoint); + float t1 = np->GetTime (map_selpoint-1); + float t2 = np->GetTime (map_selpoint+1); float dt = (t2-t1); if (shift) dt /= 5.; else if (ctrl) dt /= 500.; else dt /= 50.; t += dt; if (t > t2) t = t2; - np->SetTimeValue (map_selpoint, t); + np->SetTime (map_selpoint, t); } } break; case '/': - if (np && map_selpoint > 0 && map_selpoint < np->GetPointCount ()-1) + if (np && map_selpoint > 0 && map_selpoint < np->Length ()-1) { - float t1 = np->GetTimeValue (map_selpoint - 1); - float t2 = np->GetTimeValue (map_selpoint + 1); - np->SetTimeValue (map_selpoint, (t1+t2) / 2.0f); + float t1 = np->GetTime (map_selpoint - 1); + float t2 = np->GetTime (map_selpoint + 1); + np->SetTime (map_selpoint, (t1+t2) / 2.0f); } break; case '?': if (np) { - int num = np->GetPointCount (); + int num = np->Length (); const float* xv, * yv, * zv; xv = np->GetDimensionValues (0); yv = np->GetDimensionValues (1); @@ -1164,14 +1164,14 @@ list[i] = tot / totlen; v0 = v1; } - np->SetTimeValues (list); + np->SetTimes (list); } break; case '>': if (np) { map_selpoint++; - if (map_selpoint >= np->GetPointCount ()) + if (map_selpoint >= np->Length ()) map_selpoint = 0; } break; @@ -1180,7 +1180,7 @@ { map_selpoint--; if (map_selpoint < 0) - map_selpoint = np->GetPointCount ()-1; + map_selpoint = np->Length ()-1; } break; case 'c': @@ -1220,8 +1220,8 @@ np = seqmgr->GetSelectedPath (map_selpath); if (np) { - if (map_selpoint >= np->GetPointCount ()) - map_selpoint = np->GetPointCount ()-1; + if (map_selpoint >= np->Length ()) + map_selpoint = np->Length ()-1; } break; case ']': @@ -1229,8 +1229,8 @@ np = seqmgr->GetSelectedPath (map_selpath); if (np) { - if (map_selpoint >= np->GetPointCount ()) - map_selpoint = np->GetPointCount ()-1; + if (map_selpoint >= np->Length ()) + map_selpoint = np->Length ()-1; } break; } Modified: CS/trunk/apps/demo/demoldr.cpp =================================================================== --- CS/trunk/apps/demo/demoldr.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/apps/demo/demoldr.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -607,7 +607,7 @@ float correct = 1.0f / tot; for (i = 1 ; i < num ; i++) list[i] *= correct; - np->SetTimeValues (list); + np->SetTimes (list); delete[] list; break; } @@ -651,7 +651,7 @@ list[i] = tot / totlen; v0 = v1; } - np->SetTimeValues (list); + np->SetTimes (list); delete[] list; break; } @@ -686,7 +686,7 @@ "TIMES should use %d entries in path '%s'!", num, pName); exit (0); } - np->SetTimeValues (list); + np->SetTimes (list); delete[] list; break; } Modified: CS/trunk/apps/demo/demoseq.cpp =================================================================== --- CS/trunk/apps/demo/demoseq.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/apps/demo/demoseq.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -262,7 +262,7 @@ r = 1; do_path = false; } - pfm->path->Calculate (r); + pfm->path->CalculateAtTime (r); csVector3 oldpos; iSector* oldsector; csVector3 pos, up, forward; @@ -346,7 +346,7 @@ / float (pfm->total_path_time); if (r >= 0 && r <= 1) { - pfm->path->Calculate (r); + pfm->path->CalculateAtTime (r); csVector3 pos, up, forward; pfm->path->GetInterpolatedPosition (pos); pfm->path->GetInterpolatedUp (up); @@ -378,7 +378,7 @@ csVector3 p; for (r = 0 ; r <= 1 ; r += 0.001f) { - np->Calculate (r); + np->CalculateAtTime (r); np->GetInterpolatedPosition (p); int x = int ((p.x-tl.x)*dim / (br.x-tl.x)); int y = int ((p.z-tl.y)*dim / (br.y-tl.y)); @@ -478,7 +478,7 @@ if (selnp) { // Calculate where we are in time on the selected path. - float t = selnp->GetTimeValue (selpoint); + float t = selnp->GetTime (selpoint); seltime = csTicks (start + total*t); } @@ -513,7 +513,7 @@ float r = float (ct - pfm->start_path_time) / float (pfm->total_path_time); if (r >= 1) r = 1; - pfm->path->Calculate (r); + pfm->path->CalculateAtTime (r); // We are going to show both the position as the forward vector. csVector3 pos, forward; pfm->path->GetInterpolatedPosition (pos); @@ -529,7 +529,7 @@ / float (pfm->total_path_time); if (r >= 0 && r <= 1) { - pfm->path->Calculate (r); + pfm->path->CalculateAtTime (r); pfm->path->GetInterpolatedPosition (pos); pfm->path->GetInterpolatedForward (forward); DrawSelPoint (pos, forward, tl, br, dim, demo->col_cyan, 10); Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/docs/history.txt 2006-09-15 17:43:50 UTC (rev 25351) @@ -27,6 +27,9 @@ - res changed CS_DEPRECATED_TYPE to be useable on MSVC as well. - res fixed the doxygen settings to correctly handle the CS_DEPRECATED_..._MSG macros. + - res marked some types and methods that were deprecated as per the + API docs with the deprecation macros. Also changed some instances + to use the _MSG variant. Lastly, fixed some deprecation warnings. 14-Sep-2006 - Genjix added iConfigFile GetTuple() and SetTuple(), for storing and getting a list of variable objects in config files. Modified: CS/trunk/include/csgeom/cspoint.h =================================================================== --- CS/trunk/include/csgeom/cspoint.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csgeom/cspoint.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -40,9 +40,9 @@ /** * A 2D point object - * Deprecated! Use csVector2 instead + * \deprecated Use csVector2 instead */ -typedef csVector2 csPoint; +typedef CS_DEPRECATED_TYPE_MSG("Use csVector2 instead") csVector2 csPoint; /** @} */ Modified: CS/trunk/include/csgeom/csrect.h =================================================================== --- CS/trunk/include/csgeom/csrect.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csgeom/csrect.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -193,7 +193,8 @@ void AddAdjacent (const csRect &rect); ///\deprecated Misspelling; use AddAdjacent() instead - CS_DEPRECATED_METHOD void AddAdjanced (const csRect &rect) + CS_DEPRECATED_METHOD_MSG("Misspelling; use AddAdjacent() instead") + void AddAdjanced (const csRect &rect) { AddAdjacent (rect); } /// Test equality of two rectangles. Modified: CS/trunk/include/csgeom/fastsqrt.h =================================================================== --- CS/trunk/include/csgeom/fastsqrt.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csgeom/fastsqrt.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -36,11 +36,10 @@ #pragma message ("FastSqrt is deprecated. Use sqrtf instead.") #endif -/// declare table of square roots -CS_CRYSTALSPACE_EXPORT void BuildSqrtTable () -{} -/// fast square root, looks up table build by BuildSqrtTable(). -CS_CRYSTALSPACE_EXPORT float FastSqrt (float n) +///\deprecated Use sqrtf instead +static CS_DEPRECATED_METHOD void BuildSqrtTable () {} +///\deprecated Use sqrtf instead +static CS_DEPRECATED_METHOD float FastSqrt (float n) { return sqrtf(n); } Modified: CS/trunk/include/csgeom/path.h =================================================================== --- CS/trunk/include/csgeom/path.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csgeom/path.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -89,6 +89,7 @@ * Get the number of vector points in this spline. * \deprecated Use Length() instead. */ + CS_DEPRECATED_METHOD_MSG("Use Length() instead.") int GetPointCount() { return Length(); @@ -102,6 +103,7 @@ * Calculate internal values for this spline given some time value. * \deprecated Use CalculateAtTime() instead. */ + CS_DEPRECATED_METHOD_MSG("Use CalculateAtTime() instead.") virtual void Calculate (float time) { CalculateAtTime(time); @@ -120,6 +122,7 @@ * Get one time point. * \deprecated Use GetTime() instead. */ + CS_DEPRECATED_METHOD_MSG("Use GetTime() instead.") float GetTimeValue (int idx) const { return spline.GetTimeValue(idx); @@ -133,6 +136,7 @@ * Set one time point. * \deprecated Use SetTime() instead. */ + CS_DEPRECATED_METHOD_MSG("Use SetTime() instead.") virtual void SetTimeValue (int idx, float t) { SetTime(idx, t); @@ -151,6 +155,7 @@ * Set the time values. * \deprecated Use SetTimes() instead. */ + CS_DEPRECATED_METHOD_MSG("Use SetTimes() instead.") void SetTimeValues (float const* t) { SetTimes(t); @@ -164,6 +169,7 @@ * Get the time values. * \deprecated Use GetTimes() instead. */ + CS_DEPRECATED_METHOD_MSG("Use GetTimes() instead.") float const* GetTimeValues () const { return GetTimes(); Modified: CS/trunk/include/csgeom/subrec2.h =================================================================== --- CS/trunk/include/csgeom/subrec2.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csgeom/subrec2.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -25,5 +25,5 @@ #endif #include "subrec.h" -typedef csSubRect csSubRect2; -typedef csSubRectangles csSubRectangles2; +typedef CS_DEPRECATED_TYPE csSubRect csSubRect2; +typedef CS_DEPRECATED_TYPE csSubRectangles csSubRectangles2; Modified: CS/trunk/include/csplugincommon/particlesys/partgen.h =================================================================== --- CS/trunk/include/csplugincommon/particlesys/partgen.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csplugincommon/particlesys/partgen.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -53,6 +53,8 @@ struct iEngine; struct iMeshWrapper; +#include "csutil/win32/msvc_deprecated_warn_off.h" + /** * This class represents a particle system. It is a set of iParticles. * Subclasses of this class may be of more interest to users. @@ -422,6 +424,8 @@ { part_accel[idx] = acl; } }; +#include "csutil/win32/msvc_deprecated_warn_on.h" + /** @} */ #endif // __CS_CSPLUGINCOMMON_PARTICLESYS_PARTGEN_H__ Modified: CS/trunk/include/csplugincommon/win32/customcursor.h =================================================================== --- CS/trunk/include/csplugincommon/win32/customcursor.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csplugincommon/win32/customcursor.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -25,6 +25,7 @@ */ #include "csextern_win.h" +#include "csutil/csstring.h" #include "csutil/hash.h" #include "csgfx/rgbpixel.h" @@ -48,7 +49,7 @@ } CachedCursor (HCURSOR h, bool b) : cursor (h), destroyAsIcon (b) {} }; - csHash<CachedCursor, csStrKey> cachedCursors; + csHash<CachedCursor, csString> cachedCursors; csArray<CachedCursor> blindCursors; CachedCursor CreateMonoCursor (iImage* image, const csRGBcolor* keycolor, Modified: CS/trunk/include/csqint.h =================================================================== --- CS/trunk/include/csqint.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csqint.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -61,11 +61,11 @@ /** @} */ // Backward compatibility. Use csQfixedn() instead. -CS_DEPRECATED_METHOD +CS_DEPRECATED_METHOD_MSG("Use csQfixed8() instead") static inline long csQint8 (float n) { return csQfixed8 (n); } -CS_DEPRECATED_METHOD +CS_DEPRECATED_METHOD_MSG("Use csQfixed16() instead") static inline long csQint16(float n) { return csQfixed16(n); } -CS_DEPRECATED_METHOD +CS_DEPRECATED_METHOD_MSG("Use csQfixed24() instead") static inline long csQint24(float n) { return csQfixed24(n); } #endif // __CS_CSQINT_H__ Modified: CS/trunk/include/cstool/keyval.h =================================================================== --- CS/trunk/include/cstool/keyval.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/cstool/keyval.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -26,6 +26,7 @@ #include "csextern.h" #include "csutil/csobject.h" +#include "csutil/csstring.h" #include "csutil/hash.h" #include "csutil/scf_implementation.h" #include "csutil/set.h" @@ -44,8 +45,8 @@ { private: const char *m_Value; // Points to a string in the hash below. - csHash<csStrKey, csStrKey> values; - csSet<csStrKey> names; + csHash<csString, csString> values; + csSet<csString> names; public: /// The constructor. Requires both key and value. Data is being copied! Modified: CS/trunk/include/cstool/meshobjtmpl.h =================================================================== --- CS/trunk/include/cstool/meshobjtmpl.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/cstool/meshobjtmpl.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -59,6 +59,8 @@ { return new factclass (Engine, object_reg, this); } \ }; +#include "csutil/win32/msvc_deprecated_warn_off.h" + /** * This is an abstract implementation of iMeshObject. It can be used to * write custom mesh object implementations more easily. Currently it @@ -265,6 +267,8 @@ }; +#include "csutil/win32/msvc_deprecated_warn_on.h" + /** * This is the abstract implementation of iMeshObjectFactory. Like * csMeshObject, it stores a pointer to the "logical parent". Modified: CS/trunk/include/csutil/archive.h =================================================================== --- CS/trunk/include/csutil/archive.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/archive.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -26,6 +26,7 @@ #include "csextern.h" +#include "csutil/csstring.h" #include "csutil/parray.h" #include "csutil/stringarray.h" #include "csutil/zip.h" Modified: CS/trunk/include/csutil/array.h =================================================================== --- CS/trunk/include/csutil/array.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/array.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -583,6 +583,7 @@ * Return the number of elements in the array. * \deprecated Use GetSize() instead. */ + /*CS_DEPRECATED_METHOD_MSG("Use GetSize() instead.")*/ size_t Length () const { return GetSize(); @@ -664,7 +665,9 @@ * Set the actual number of items in this array. * \deprecated Use SetSize() instead. */ + /*CS_DEPRECATED_METHOD_MSG("Use SetSize() instead.")*/ void SetLength (size_t n, T const& what) { SetSize(n, what); } + /*CS_DEPRECATED_METHOD_MSG("Use SetSize() instead.")*/ void SetLength (size_t n) { SetSize(n); } /** @} */ @@ -1130,6 +1133,7 @@ * faster to keep the array sorted, search for \c item using * FindSortedKey(), and then remove it using the plain DeleteIndex(). */ + CS_DEPRECATED_METHOD_MSG("'Fast' is illusory. See documentation") bool DeleteFast (T const& item) { size_t const n = Find (item); Modified: CS/trunk/include/csutil/bitarray.h =================================================================== --- CS/trunk/include/csutil/bitarray.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/bitarray.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -289,6 +289,7 @@ * Return the number of stored bits. * \deprecated Use GetSize() instead. */ + /*CS_DEPRECATED_METHOD_MSG("Use GetSize() instead.")*/ size_t Length () const { return GetSize(); @@ -298,6 +299,7 @@ * Set the number of stored bits. * \deprecated Use SetSize() instead. */ + /*CS_DEPRECATED_METHOD_MSG("Use SetSize() instead.")*/ void SetLength (size_t newSize) { SetSize (newSize); Modified: CS/trunk/include/csutil/csstring.h =================================================================== --- CS/trunk/include/csutil/csstring.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/csstring.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -288,14 +288,16 @@ * Tell the string to re-size its buffer exponentially as needed. * \deprecated Use SetGrowsBy(0) instead. */ - CS_DEPRECATED_METHOD void SetGrowsExponentially(bool b) + CS_DEPRECATED_METHOD_MSG("Use SetGrowsBy(0) instead.") + void SetGrowsExponentially(bool b) { SetGrowsBy(b ? 0 : DEFAULT_GROW_BY); } /** * Returns true if exponential growth is enabled. * \deprecated Use GetGrowsBy() instead. */ - CS_DEPRECATED_METHOD bool GetGrowsExponentially() const + CS_DEPRECATED_METHOD_MSG("Use GetGrowsBy() instead.") + bool GetGrowsExponentially() const { return GetGrowsBy() == 0; } /** @@ -545,7 +547,7 @@ * \return First position of \p search, or (size_t)-1 if not found. * \deprecated Use Find() instead. */ - /* CS_DEPRECATED_METHOD */ + /* CS_DEPRECATED_METHOD_MSG("Use Find() instead.") */ size_t FindStr (const char* search, size_t pos = 0) const { return Find(search, pos); } @@ -560,7 +562,7 @@ * \p replacement. * \deprecated Use ReplaceAll() instead. */ - /* CS_DEPRECATED_METHOD */ + /* CS_DEPRECATED_METHOD_MSG("Use ReplaceAll() instead.") */ void FindReplace (const char* search, const char* replacement) { ReplaceAll(search, replacement); } Modified: CS/trunk/include/csutil/hash.h =================================================================== --- CS/trunk/include/csutil/hash.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/hash.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -207,12 +207,15 @@ } }; +#include "csutil/win32/msvc_deprecated_warn_off.h" + /** * This is a simple helper class to make a copy of a const char*. * This can be used to have a hash that makes copies of the keys. * \deprecated csString can also be used for hash keys. */ -class csStrKey +class CS_DEPRECATED_TYPE_MSG("csString can also be used for hash keys") + csStrKey { private: char* str; @@ -237,6 +240,8 @@ CS_SPECIALIZE_TEMPLATE class csComparator<csStrKey, csStrKey> : public csComparatorString<csStrKey> {}; +#include "csutil/win32/msvc_deprecated_warn_on.h" + /** * A generic hash table class, * which grows dynamically and whose buckets are unsorted arrays. @@ -406,7 +411,8 @@ * Add an element to the hash table, overwriting if the key already exists. * \deprecated Use PutUnique() instead. */ - CS_DEPRECATED_METHOD void PutFirst (const K& key, const T &value) + CS_DEPRECATED_METHOD_MSG("Use PutUnique() instead.") + void PutFirst (const K& key, const T &value) { PutUnique(key, value); } Modified: CS/trunk/include/csutil/partialorder.h =================================================================== --- CS/trunk/include/csutil/partialorder.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/partialorder.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -171,14 +171,14 @@ // delete all posts pointing to node for (size_t iter=0 ; iter<Nodes[p].pre.Length() ; iter++) { - Nodes[Nodes[p].pre[iter]].post.DeleteFast(p); + Nodes[Nodes[p].pre[iter]].post.Delete(p); } // delete node's pre's Nodes[p].pre.DeleteAll(); // delete all pres pointing to node for (size_t iter=0 ; iter<Nodes[p].post.Length() ; iter++) { - Nodes[Nodes[p].post[iter]].pre.DeleteFast(p); + Nodes[Nodes[p].post[iter]].pre.Delete(p); } // delete node's post's Nodes[p].post.DeleteAll(); Modified: CS/trunk/include/csutil/scfarray.h =================================================================== --- CS/trunk/include/csutil/scfarray.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/scfarray.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -29,6 +29,8 @@ #include "csutil/array.h" #include "csutil/scf_implementation.h" +#include "csutil/win32/msvc_deprecated_warn_off.h" + /**\addtogroup util_containers * @{ */ @@ -280,6 +282,8 @@ /** @} */ }; +#include "csutil/win32/msvc_deprecated_warn_on.h" + /** @} */ #endif // __CS_CSUTIL_SCFARRAY_H__ Modified: CS/trunk/include/csutil/scfstr.h =================================================================== --- CS/trunk/include/csutil/scfstr.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/scfstr.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -89,7 +89,8 @@ * Set string maximal capacity to current string length. * \deprecated Use ShrinkBestFit() instead. */ - CS_DEPRECATED_METHOD virtual void Reclaim () + CS_DEPRECATED_METHOD_MSG("Use ShrinkBestFit() instead.") + virtual void Reclaim () { ShrinkBestFit(); } /// Clear the string (so that it contains only ending 0 character). @@ -99,7 +100,8 @@ * Clear the string (so that it contains only ending 0 character). * \deprecated Use Empty() instead. */ - /* CS_DEPRECATED_METHOD */ virtual void Clear () + /* CS_DEPRECATED_METHOD_MSG("Use Empty() instead.") */ + virtual void Clear () { Empty(); } /// Get a copy of this string Modified: CS/trunk/include/csutil/scfstringarray.h =================================================================== --- CS/trunk/include/csutil/scfstringarray.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/scfstringarray.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -56,6 +56,7 @@ * Get array length. * \deprecated Use GetSize() instead. */ + /*CS_DEPRECATED_METHOD_MSG("Use GetSize() instead.")*/ virtual size_t Length () const { return GetSize (); @@ -163,6 +164,7 @@ * Remove all strings from array. * \deprecated Use Empty() instead. */ + CS_DEPRECATED_METHOD_MSG("Use Empty() instead.") virtual void DeleteAll () { Empty(); Modified: CS/trunk/include/csutil/strhash.h =================================================================== --- CS/trunk/include/csutil/strhash.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/strhash.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -139,7 +139,8 @@ * Delete all stored strings. * \deprecated Use Empty() instead. */ - /*CS_DEPRECATED_METHOD*/ void Clear () + /*CS_DEPRECATED_METHOD("Use Empty() instead.")*/ + void Clear () { Empty(); } /// Get the number of elements in the hash. Modified: CS/trunk/include/csutil/strset.h =================================================================== --- CS/trunk/include/csutil/strset.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/strset.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -108,7 +108,8 @@ * Remove all stored strings. * \deprecated Use Empty() instead. */ - /*CS_DEPRECATED_METHOD*/ void Clear () + /*CS_DEPRECATED_METHOD("Use Empty() instead.")*/ + void Clear () { Empty(); } /// Get the number of elements in the hash. Modified: CS/trunk/include/csutil/syspath.h =================================================================== --- CS/trunk/include/csutil/syspath.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/syspath.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -180,7 +180,8 @@ size_t Length () const { return paths.Length(); } size_t GetSize () const { return paths.Length(); } //@} - CS_DEPRECATED_METHOD size_t GetCount () const { return Length(); } + CS_DEPRECATED_METHOD_MSG("Use Length() instead") + size_t GetCount () const { return Length(); } //@{ /// Retrieve the n'th path record. Entry const& operator [] (size_t n) const { return paths[n]; } Modified: CS/trunk/include/csutil/util.h =================================================================== --- CS/trunk/include/csutil/util.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/util.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -207,7 +207,7 @@ * string. \p max is size in bytes of \p dest. * \deprecated Use csReplaceAll() instead. */ -CS_DEPRECATED_METHOD +CS_DEPRECATED_METHOD_MSG("Use csReplaceAll() instead.") inline void csFindReplace (char *dest, const char *src, const char *search, const char *replace, int max) { csReplaceAll(dest, src, search, replace, max); } Modified: CS/trunk/include/csutil/verbosity.h =================================================================== --- CS/trunk/include/csutil/verbosity.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/csutil/verbosity.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -189,7 +189,7 @@ * \deprecated Use instead the more generic Enabled() method, which accepts * any granularity of class breakdown; not just major and minor components. */ - CS_DEPRECATED_METHOD + CS_DEPRECATED_METHOD_MSG("Use Enabled() instead") bool CheckFlag(char const* major, char const* minor) const { Str flag; flag << major << '.' << minor; @@ -302,7 +302,7 @@ * \deprecated Use instead the more generic Enabled() method, which accepts * any granularity of class breakdown; not just major and minor components. */ - CS_DEPRECATED_METHOD + CS_DEPRECATED_METHOD_MSG("Use Enabled() instead") virtual bool CheckFlag(char const* major, char const* minor) const { csStringFast<128> flag; flag << major << '.' << minor; Modified: CS/trunk/include/iaws/aws.h =================================================================== --- CS/trunk/include/iaws/aws.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/iaws/aws.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -87,7 +87,9 @@ #define AWS_VOIDP_IS_ERROR #endif #ifdef AWS_DEPRECATE_VOIDP -#define AWS_VOIDP_IS_WARNING CS_DEPRECATED_METHOD +#define AWS_VOIDP_IS_WARNING \ +CS_DEPRECATED_METHOD_MSG("For proper 64-bit platform support, use the intptr_t \ +version") #else #define AWS_VOIDP_IS_WARNING #endif Modified: CS/trunk/include/iengine/mesh.h =================================================================== --- CS/trunk/include/iengine/mesh.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/iengine/mesh.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -374,7 +374,8 @@ * grid structures. * \deprecated Use HitBeamBBox() with csHitBeamResult instead. */ - CS_DEPRECATED_METHOD virtual int HitBeamBBox (const csVector3& start, + CS_DEPRECATED_METHOD_MSG("Use HitBeamBBox() with csHitBeamResult instead.") + virtual int HitBeamBBox (const csVector3& start, const csVector3& end, csVector3& isect, float* pr) = 0; /** @@ -382,7 +383,8 @@ * Outline check. * \deprecated Use HitBeamOutline() with csHitBeamResult instead. */ - CS_DEPRECATED_METHOD virtual bool HitBeamOutline (const csVector3& start, + CS_DEPRECATED_METHOD_MSG("Use HitBeamOutline() with csHitBeamResult instead.") + virtual bool HitBeamOutline (const csVector3& start, const csVector3& end, csVector3& isect, float* pr) = 0; /** @@ -391,7 +393,8 @@ * is more accurate than HitBeamOutline. * \deprecated Use HitBeamObject() with csHitBeamResult instead. */ - CS_DEPRECATED_METHOD virtual bool HitBeamObject (const csVector3& start, + CS_DEPRECATED_METHOD_MSG("Use HitBeamObject() with csHitBeamResult instead.") + virtual bool HitBeamObject (const csVector3& start, const csVector3& end, csVector3& isect, float* pr, int* polygon_idx = 0) = 0; @@ -400,7 +403,8 @@ * Return the collision point in world space coordinates. * \deprecated Use HitBeamObject() with csHitBeamResult instead. */ - CS_DEPRECATED_METHOD virtual bool HitBeam (const csVector3& start, + CS_DEPRECATED_METHOD_MSG("Use HitBeamObject() with csHitBeamResult instead.") + virtual bool HitBeam (const csVector3& start, const csVector3& end, csVector3& isect, float* pr, iMaterialWrapper** material = 0) = 0; Modified: CS/trunk/include/iengine/sector.h =================================================================== --- CS/trunk/include/iengine/sector.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/iengine/sector.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -386,8 +386,10 @@ * containing the 'start' point. 'isect' will be the intersection point * if a polygon is returned. This function returns -1 if no polygon * was hit or the polygon index otherwise. + * \deprecated Use the csSectorHitBeamResult version instead */ - CS_DEPRECATED_METHOD virtual iMeshWrapper* HitBeamPortals ( + CS_DEPRECATED_METHOD_MSG("Use the csSectorHitBeamResult version instead") + virtual iMeshWrapper* HitBeamPortals ( const csVector3& start, const csVector3& end, csVector3& isect, int* polygon_idx, iSector** final_sector = 0) = 0; @@ -397,8 +399,10 @@ * filled with the indices of the polygon that was hit. * If polygon_idx is null then the polygon will not be filled in. * This function doesn't support portals. + * \deprecated Use the csSectorHitBeamResult version instead */ - CS_DEPRECATED_METHOD virtual iMeshWrapper* HitBeam (const csVector3& start, + CS_DEPRECATED_METHOD_MSG("Use the csSectorHitBeamResult version instead") + virtual iMeshWrapper* HitBeam (const csVector3& start, const csVector3& end, csVector3& intersect, int* polygon_idx, bool accurate = false) = 0; Modified: CS/trunk/include/imesh/objmodel.h =================================================================== --- CS/trunk/include/imesh/objmodel.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/imesh/objmodel.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -161,6 +161,8 @@ * Get the bounding box in object space for this mesh object. * \deprecated Use GetObjectBoundingBox() (without parameters) instead. */ + CS_DEPRECATED_METHOD_MSG("Use GetObjectBoundingBox() (without parameters) " + "instead.") virtual void GetObjectBoundingBox (csBox3& bbox) = 0; /** Modified: CS/trunk/include/iutil/array.h =================================================================== --- CS/trunk/include/iutil/array.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/iutil/array.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -248,6 +248,7 @@ * faster to keep the array sorted, search for \c item using * FindSortedKey(), and then remove it using the plain DeleteIndex(). */ + CS_DEPRECATED_METHOD_MSG("'Fast' is illusional; see documentation") virtual bool DeleteFast (T const& item) = 0; }; Modified: CS/trunk/include/iutil/stringarray.h =================================================================== --- CS/trunk/include/iutil/stringarray.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/iutil/stringarray.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -40,6 +40,7 @@ * Get array length. * \deprecated Use GetSize() instead. */ + /*CS_DEPRECATED_METHOD_MSG("Use GetSize() instead.")*/ virtual size_t Length () const = 0; /// Push a string onto the stack. @@ -111,6 +112,7 @@ * Remove all strings from array. * \deprecated Use Empty() instead. */ + /*CS_DEPRECATED_METHOD_MSG("Use Empty() instead.")*/ virtual void DeleteAll () = 0; /** Modified: CS/trunk/include/iutil/strset.h =================================================================== --- CS/trunk/include/iutil/strset.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/iutil/strset.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -111,7 +111,8 @@ * Remove all stored strings. * \deprecated Use Empty() instead. */ - /*CS_DEPRECATED_METHOD*/ virtual void Clear() = 0; + /*CS_DEPRECATED_METHOD_MSG("Use Empty() instead.")*/ + virtual void Clear() = 0; /// Get the number of elements in the hash. virtual size_t GetSize () const = 0; Modified: CS/trunk/include/iutil/verbositymanager.h =================================================================== --- CS/trunk/include/iutil/verbositymanager.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/iutil/verbositymanager.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -73,7 +73,7 @@ * \deprecated Use instead the more generic Enabled() method, which accepts * any granularity of class breakdown; not just major and minor components. */ - CS_DEPRECATED_METHOD + CS_DEPRECATED_METHOD_MSG("Use Enabled() instead") virtual bool CheckFlag(char const* major, char const* minor) const = 0; }; Modified: CS/trunk/include/ivideo/graph2d.h =================================================================== --- CS/trunk/include/ivideo/graph2d.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/include/ivideo/graph2d.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -337,7 +337,8 @@ * \deprecated * Instead, use Write() with the #CS_WRITE_BASELINE flag set. */ - CS_DEPRECATED_METHOD virtual void WriteBaseline (iFont *font, + CS_DEPRECATED_METHOD_MSG("Use Write() with CS_WRITE_BASELINE flag instead") + virtual void WriteBaseline (iFont *font, int x, int y, int fg, int bg, const char *str) = 0; /// Enable/disable canvas resizing Modified: CS/trunk/libs/csplugincommon/opengl/driverdb.cpp =================================================================== --- CS/trunk/libs/csplugincommon/opengl/driverdb.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/libs/csplugincommon/opengl/driverdb.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -50,7 +50,7 @@ One }; - csHash<csRef<csConfigDocument>, csStrKey> configs; + csHash<csRef<csConfigDocument>, csString> configs; public: CS_LEAKGUARD_DECLARE (csDriverDBReader); Modified: CS/trunk/libs/csplugincommon/win32/customcursor.cpp =================================================================== --- CS/trunk/libs/csplugincommon/win32/customcursor.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/libs/csplugincommon/win32/customcursor.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -30,7 +30,7 @@ csWin32CustomCursors::~csWin32CustomCursors () { - csHash<CachedCursor, csStrKey>::GlobalIterator it = + csHash<CachedCursor, csString>::GlobalIterator it = cachedCursors.GetIterator(); while (it.HasNext()) Modified: CS/trunk/libs/cstool/keyval.cpp =================================================================== --- CS/trunk/libs/cstool/keyval.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/libs/cstool/keyval.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -51,7 +51,8 @@ const char *csKeyValuePair::GetValue (const char* vname) const { - return values.Get (vname, 0); + const csString* val = values.GetElementPointer (vname); + return val ? val->GetData() : 0; } const char *csKeyValuePair::GetValue () const @@ -63,7 +64,8 @@ { values.PutUnique ("value", value); names.Add ("value"); - m_Value = values.Get ("value", 0); + const csString* val = values.GetElementPointer ("value"); + m_Value = val ? val->GetData() : 0; } void csKeyValuePair::SetValue (const char* vname, const char* value) @@ -81,7 +83,7 @@ { csRef<iStringArray> ret; ret.AttachNew (new scfStringArray ()); - csSet<csStrKey>::GlobalIterator it = names.GetIterator (); + csSet<csString>::GlobalIterator it = names.GetIterator (); while (it.HasNext ()) { ret->Push (it.Next ()); Modified: CS/trunk/libs/csutil/archive.cpp =================================================================== --- CS/trunk/libs/csutil/archive.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/libs/csutil/archive.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -23,7 +23,6 @@ #include "csutil/archive.h" #include "csutil/csendian.h" -#include "csutil/csstring.h" #include "csutil/set.h" #include "csutil/snprintf.h" #include "csutil/sysfunc.h" @@ -142,7 +141,7 @@ // First, make a list of all possible directory components. csString filename, slice; - csSet<csStrKey> dset; + csSet<csString> dset; for (size_t i = 0, n = dir.Length(); i < n; i++) { ArchiveEntry const* e = dir.Get (i); @@ -158,13 +157,13 @@ { filename.SubString (slice, 0, ++sep); if (!dset.In (slice.GetData())) - dset.AddNoTest (csStrKey (slice)); + dset.AddNoTest (slice); } } } // Now, iterate over `dset' and create fake directory components. - csSet<csStrKey>::GlobalIterator it = dset.GetIterator(); + csSet<csString>::GlobalIterator it = dset.GetIterator(); while (it.HasNext()) { csString dname (it.Next()); Modified: CS/trunk/libs/csutil/win32/win32.cpp =================================================================== --- CS/trunk/libs/csutil/win32/win32.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/libs/csutil/win32/win32.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -309,7 +309,7 @@ r->Unregister(assi, "iWin32Assistant"); Win32Assistant* a = (Win32Assistant*)((iWin32Assistant*)assi); a->Shutdown(); - assistants.DeleteFast (a); + assistants.Delete (a); return true; } return false; Modified: CS/trunk/plugins/engine/3d/light.h =================================================================== --- CS/trunk/plugins/engine/3d/light.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/engine/3d/light.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -639,7 +639,7 @@ { private: csRefArrayObject<iLight> list; - csHash<iLight*,csStrKey> lights_hash; + csHash<iLight*, csString> lights_hash; class NameChangeListener : public scfImplementation1<NameChangeListener, iObjectNameChangeListener> Modified: CS/trunk/plugins/engine/3d/material.h =================================================================== --- CS/trunk/plugins/engine/3d/material.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/engine/3d/material.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -188,7 +188,7 @@ { private: csRefArrayObject<iMaterialWrapper> list; - csHash<iMaterialWrapper*,csStrKey> mat_hash; + csHash<iMaterialWrapper*, csString> mat_hash; class NameChangeListener : public scfImplementation1<NameChangeListener, iObjectNameChangeListener> Modified: CS/trunk/plugins/engine/3d/meshobj.cpp =================================================================== --- CS/trunk/plugins/engine/3d/meshobj.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/engine/3d/meshobj.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -1487,7 +1487,7 @@ csString firstName; firstName.Append (Name, firstsize); - iMeshWrapper* m = meshes_hash.Get (csStrKey (firstName), 0); + iMeshWrapper* m = meshes_hash.Get (firstName, 0); if (!m) return 0; return m->FindChildByName (p+1); } Modified: CS/trunk/plugins/engine/3d/meshobj.h =================================================================== --- CS/trunk/plugins/engine/3d/meshobj.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/engine/3d/meshobj.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -62,7 +62,7 @@ { private: csRefArrayObject<iMeshWrapper> list; - csHash<iMeshWrapper*,csStrKey> meshes_hash; + csHash<iMeshWrapper*, csString> meshes_hash; class NameChangeListener : public scfImplementation1<NameChangeListener, iObjectNameChangeListener> @@ -121,7 +121,7 @@ { private: csRefArrayObject<iMeshFactoryWrapper> list; - csHash<iMeshFactoryWrapper*,csStrKey> + csHash<iMeshFactoryWrapper*, csString> factories_hash; class NameChangeListener : public scfImplementation1<NameChangeListener, Modified: CS/trunk/plugins/engine/3d/sector.h =================================================================== --- CS/trunk/plugins/engine/3d/sector.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/engine/3d/sector.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -547,7 +547,7 @@ { private: csRefArrayObject<iSector> list; - csHash<iSector*,csStrKey> sectors_hash; + csHash<iSector*, csString> sectors_hash; class NameChangeListener : public scfImplementation1<NameChangeListener, iObjectNameChangeListener> Modified: CS/trunk/plugins/font/server/csfont/csfont.h =================================================================== --- CS/trunk/plugins/font/server/csfont/csfont.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/font/server/csfont/csfont.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -212,7 +212,7 @@ // A list of csDefaultFont pointers. //csRefArray<csDefaultFont> fonts; - csHash<csDefaultFont*, csStrKey> fonts; + csHash<csDefaultFont*, csString> fonts; bool emitErrors; /// read a font file from vfs Modified: CS/trunk/plugins/font/server/fontplex/fontplex.cpp =================================================================== --- CS/trunk/plugins/font/server/fontplex/fontplex.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/font/server/fontplex/fontplex.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -373,7 +373,7 @@ } if (fs == 0) { - csHash<FontServerMapEntry, csStrKey>::Iterator it = + csHash<FontServerMapEntry, csString>::Iterator it = fontServerMap.GetIterator (name); while (it.HasNext ()) Modified: CS/trunk/plugins/font/server/fontplex/fontplex.h =================================================================== --- CS/trunk/plugins/font/server/fontplex/fontplex.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/font/server/fontplex/fontplex.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -146,7 +146,7 @@ FontServerMapEntry (const FontServerMapEntry& source); ~FontServerMapEntry (); }; - csHash<FontServerMapEntry, csStrKey> fontServerMap; + csHash<FontServerMapEntry, csString> fontServerMap; csHash<iFont*, csString> loadedFonts; csFontLoaderOrder fallbackOrder; Modified: CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp =================================================================== --- CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -1500,7 +1500,7 @@ csStringID bufID = factory->GetStrings()->Request (name); if (userBuffers.RemoveRenderBuffer (bufID)) { - user_buffer_names.DeleteFast (bufID); + user_buffer_names.Delete (bufID); return true; } return false; @@ -2035,7 +2035,7 @@ csStringID bufID = strings->Request (name); if (userBuffers.RemoveRenderBuffer (bufID)) { - user_buffer_names.DeleteFast (bufID); + user_buffer_names.Delete (bufID); return true; } return false; Modified: CS/trunk/plugins/mesh/genmesh/skelanim/gmeshskelanim.cpp =================================================================== --- CS/trunk/plugins/mesh/genmesh/skelanim/gmeshskelanim.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/mesh/genmesh/skelanim/gmeshskelanim.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -1127,7 +1127,7 @@ void csGenmeshSkelAnimationControl::Stop (iGenMeshSkeletonScript *script) { - running_scripts.DeleteFast ( (csSkelAnimControlRunnable *)script); + running_scripts.Delete ( (csSkelAnimControlRunnable *)script); } size_t csGenmeshSkelAnimationControl::GetScriptsCount () Modified: CS/trunk/plugins/video/cursor/cursor.cpp =================================================================== --- CS/trunk/plugins/video/cursor/cursor.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/video/cursor/cursor.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -348,7 +348,7 @@ // Add to hashlist { - csHash<CursorInfo*, csStrKey>::Iterator it = + csHash<CursorInfo*, csString>::Iterator it = cursors.GetIterator (name); while (it.HasNext ()) { @@ -466,7 +466,7 @@ void csCursor::RemoveAllCursors () { - csHash<CursorInfo*, csStrKey>::GlobalIterator it = cursors.GetIterator (); + csHash<CursorInfo*, csString>::GlobalIterator it = cursors.GetIterator (); while (it.HasNext ()) { CursorInfo* ci = it.Next (); Modified: CS/trunk/plugins/video/cursor/cursor.h =================================================================== --- CS/trunk/plugins/video/cursor/cursor.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/video/cursor/cursor.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -71,7 +71,7 @@ csWeakRef<iGraphics3D> g3d; iTextureManager* txtmgr; csRef<iImageIO> io; - csHash<CursorInfo *, csStrKey> cursors; + csHash<CursorInfo *, csString> cursors; /// The currently selected cursor csString current; Modified: CS/trunk/plugins/video/render3d/opengl/gl_render3d.cpp =================================================================== --- CS/trunk/plugins/video/render3d/opengl/gl_render3d.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/video/render3d/opengl/gl_render3d.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -3413,7 +3413,7 @@ void csGLGraphics3D::RemoveHalo (csOpenGLHalo* halo) { - halos.DeleteFast (halo); + halos.Delete (halo); } float csGLGraphics3D::GetZBuffValue (int x, int y) Modified: CS/trunk/plugins/video/render3d/opengl/gl_txtmgr.h =================================================================== --- CS/trunk/plugins/video/render3d/opengl/gl_txtmgr.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/video/render3d/opengl/gl_txtmgr.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -417,7 +417,7 @@ TextureFormat (GLenum fmt, bool supp) : format (fmt), supported (supp) {} }; - csHash<TextureFormat, csStrKey> textureFormats; + csHash<TextureFormat, csString> textureFormats; GLenum ParseTextureFormat (const char* formatName, GLenum defaultFormat); void ReadTextureClasses (iConfigFile* config); Modified: CS/trunk/plugins/video/render3d/shader/shadermgr/shadermgr.cpp =================================================================== --- CS/trunk/plugins/video/render3d/shader/shadermgr/shadermgr.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/video/render3d/shader/shadermgr/shadermgr.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -167,7 +167,7 @@ csString cfgKey; const csString keyPrefix ("Video.ShaderManager.Tags."); - csSet<csStrKey> knownKeys; + csSet<csString> knownKeys; csRef<iConfigIterator> it (config->Enumerate (keyPrefix)); while (it->Next ()) { Modified: CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_ffp.cpp =================================================================== --- CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_ffp.cpp 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_ffp.cpp 2006-09-15 17:43:50 UTC (rev 25351) @@ -540,11 +540,11 @@ } } - csHash<int, csStrKey>::GlobalIterator layerNameIt + csHash<int, csString>::GlobalIterator layerNameIt = layerNames.GetIterator(); while (layerNameIt.HasNext()) { - csStrKey key; + csString key; int layerNum = layerNameIt.Next (key); layerNames.PutUnique (key, layerMap[layerNum]); } Modified: CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_ffp.h =================================================================== --- CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_ffp.h 2006-09-15 17:36:24 UTC (rev 25350) +++ CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_ffp.h 2006-09-15 17:43:50 UTC (rev 25351) @@ -108,7 +108,7 @@ //maximum number of layers int maxlayers; - csHash<int, csStrKey> layerNames; + csHash<int, csString> layerNames; void Report (int severity, const char* msg, ...); void Report (int severity, iDocumentNode* node, const char* msg, ...); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2006-09-15 17:50:59
|
Revision: 25352 http://svn.sourceforge.net/crystal/?rev=25352&view=rev Author: res2002 Date: 2006-09-15 10:50:44 -0700 (Fri, 15 Sep 2006) Log Message: ----------- res removed some unneeded members from csGraphics3DCaps. Modified Paths: -------------- CS/trunk/docs/history.txt CS/trunk/include/ivideo/graph3d.h CS/trunk/plugins/video/render3d/null/null_render3d.cpp CS/trunk/plugins/video/render3d/software/sft3dcom.cpp Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-15 17:43:50 UTC (rev 25351) +++ CS/trunk/docs/history.txt 2006-09-15 17:50:44 UTC (rev 25352) @@ -30,6 +30,7 @@ - res marked some types and methods that were deprecated as per the API docs with the deprecation macros. Also changed some instances to use the _MSG variant. Lastly, fixed some deprecation warnings. + - res removed some unneeded members from csGraphics3DCaps. 14-Sep-2006 - Genjix added iConfigFile GetTuple() and SetTuple(), for storing and getting a list of variable objects in config files. Modified: CS/trunk/include/ivideo/graph3d.h =================================================================== --- CS/trunk/include/ivideo/graph3d.h 2006-09-15 17:43:50 UTC (rev 25351) +++ CS/trunk/include/ivideo/graph3d.h 2006-09-15 17:50:44 UTC (rev 25352) @@ -505,14 +505,10 @@ /// Information about 3d renderer capabilities. struct csGraphics3DCaps { - bool CanClip; + /// Minimum texture dimensions int minTexHeight, minTexWidth; + /// Maximum texture dimensions int maxTexHeight, maxTexWidth; - bool NeedsPO2Maps; - int MaxAspectRatio; - - // The following caps are only used by NR - /** * Whether point sprites are supported. If \a true, geometry of the type * CS_MESHTYPE_POINT_SPRITES can be drawn. Modified: CS/trunk/plugins/video/render3d/null/null_render3d.cpp =================================================================== --- CS/trunk/plugins/video/render3d/null/null_render3d.cpp 2006-09-15 17:43:50 UTC (rev 25351) +++ CS/trunk/plugins/video/render3d/null/null_render3d.cpp 2006-09-15 17:50:44 UTC (rev 25352) @@ -50,13 +50,10 @@ scfiEventHandler = 0; txtmgr = 0; - Caps.CanClip = false; Caps.minTexHeight = 2; Caps.minTexWidth = 2; Caps.maxTexHeight = 1024; Caps.maxTexWidth = 1024; - Caps.MaxAspectRatio = 32768; - Caps.NeedsPO2Maps = false; Caps.SupportsPointSprites = false; Caps.DestinationAlpha = false; Caps.StencilShadows = false; Modified: CS/trunk/plugins/video/render3d/software/sft3dcom.cpp =================================================================== --- CS/trunk/plugins/video/render3d/software/sft3dcom.cpp 2006-09-15 17:43:50 UTC (rev 25351) +++ CS/trunk/plugins/video/render3d/software/sft3dcom.cpp 2006-09-15 17:50:44 UTC (rev 25352) @@ -83,13 +83,10 @@ z_buffer = 0; line_table = 0; - Caps.CanClip = true; Caps.minTexHeight = 2; Caps.minTexWidth = 2; Caps.maxTexHeight = 1024; Caps.maxTexWidth = 1024; - Caps.MaxAspectRatio = 32768; - Caps.NeedsPO2Maps = true; Caps.SupportsPointSprites = false; Caps.DestinationAlpha = false; Caps.StencilShadows = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2006-09-15 22:17:25
|
Revision: 25357 http://svn.sourceforge.net/crystal/?rev=25357&view=rev Author: res2002 Date: 2006-09-15 15:17:09 -0700 (Fri, 15 Sep 2006) Log Message: ----------- res added -mno-cygwin support to configure. Modified Paths: -------------- CS/trunk/configure.ac CS/trunk/docs/history.txt CS/trunk/mk/autoconf/checkcommon.m4 CS/trunk/mk/autoconf/checkcswin32libs.m4 CS/trunk/mk/autoconf/compiler.m4 Modified: CS/trunk/configure.ac =================================================================== --- CS/trunk/configure.ac 2006-09-15 22:07:20 UTC (rev 25356) +++ CS/trunk/configure.ac 2006-09-15 22:17:09 UTC (rev 25357) @@ -27,6 +27,7 @@ AC_CONFIG_SRCDIR([libs/Jamfile]) AC_CONFIG_AUX_DIR([mk/autoconf]) AC_CANONICAL_HOST +CS_CHECK_MNO_CYGWIN @@ -702,7 +703,7 @@ AS_IF([test -n "$cs_cv_prog_cc_visibility_hidden"], [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$cs_cv_prog_cc_visibility_hidden], [+])]) - + CS_CHECK_BUILD_FLAGS([for "default" symbol visibility flag], [cs_cv_prog_cc_visibility_default], [CS_CREATE_TUPLE([-fvisibility=default])]) Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-09-15 22:07:20 UTC (rev 25356) +++ CS/trunk/docs/history.txt 2006-09-15 22:17:09 UTC (rev 25357) @@ -33,6 +33,7 @@ - res removed some unneeded members from csGraphics3DCaps. - res noted some compiler versions on the requirements manual page. - res updated the docs for the new cs-win32libs version. + - res added -mno-cygwin support to configure. 14-Sep-2006 - Genjix added iConfigFile GetTuple() and SetTuple(), for storing and getting a list of variable objects in config files. Modified: CS/trunk/mk/autoconf/checkcommon.m4 =================================================================== --- CS/trunk/mk/autoconf/checkcommon.m4 2006-09-15 22:07:20 UTC (rev 25356) +++ CS/trunk/mk/autoconf/checkcommon.m4 2006-09-15 22:17:09 UTC (rev 25357) @@ -33,7 +33,9 @@ CS_CHECK_TOOLS([DLLTOOL], [dlltool]) CS_EMIT_BUILD_PROPERTY([CMD.DLLTOOL], [$DLLTOOL]) - CS_CHECK_TOOLS([DLLWRAP], [dllwrap]) + AS_IF([test "$cs_mno_cygwin" = "yes"], + [CS_CHECK_TOOLS([DLLWRAP], [dllwrap --mno-cygwin])], + [CS_CHECK_TOOLS([DLLWRAP], [dllwrap])]) CS_EMIT_BUILD_PROPERTY([CMD.DLLWRAP], [$DLLWRAP]) CS_CHECK_TOOLS([WINDRES], [windres]) Modified: CS/trunk/mk/autoconf/checkcswin32libs.m4 =================================================================== --- CS/trunk/mk/autoconf/checkcswin32libs.m4 2006-09-15 22:07:20 UTC (rev 25356) +++ CS/trunk/mk/autoconf/checkcswin32libs.m4 2006-09-15 22:17:09 UTC (rev 25357) @@ -34,6 +34,9 @@ #------------------------------------------------------------------------------ AC_DEFUN([CS_CHECK_CSWIN32LIBS], [AC_REQUIRE([AC_CANONICAL_HOST]) + # ensure PKGCONFIG is set since we may meddle with it + AC_REQUIRE([_CS_CHECK_PKG_CONFIG_PREPARE_PATH]) + AC_REQUIRE([CS_CHECK_MNO_CYGWIN]) case $host_os in mingw*|cygwin*) CS_CHECK_TOOLS([CSLIBS_CONFIG], [cslibs-config]) @@ -43,17 +46,27 @@ AC_CACHE_CHECK([for cslibs package], [cs_cv_cslibs], [AS_IF([test -n "$CSLIBS_CONFIG"], [cs_cv_cslibs=yes + AS_IF([test "x$cs_mno_cygwin" = "xyes"], + [AS_IF( + [$CSLIBS_CONFIG -mno-cygwin --cflags >/dev/null 2>&1], + [cs_cv_cslibs_compiler="-mno-cygwin $cs_cv_cslibs_compiler"])]) cs_cv_cslibs_cflags=CS_RUN_PATH_NORMALIZE( [$CSLIBS_CONFIG --cflags $cs_cv_cslibs_compiler]) cs_cv_cslibs_lflags=CS_RUN_PATH_NORMALIZE( [$CSLIBS_CONFIG --lflags $cs_cv_cslibs_compiler]) cs_cv_cslibs_binpath=CS_RUN_PATH_NORMALIZE( - [$CSLIBS_CONFIG --binpath $cs_cv_cslibs_compiler])], + [$CSLIBS_CONFIG --binpath $cs_cv_cslibs_compiler]) + AS_IF([$CSLIBS_CONFIG --pcpath >/dev/null 2>&1], + [cs_cv_cslibs_pcpath=CS_RUN_PATH_NORMALIZE( + [$CSLIBS_CONFIG --pcpath $cs_cv_cslibs_compiler])])], [cs_cv_cslibs=no])]) AS_IF([test $cs_cv_cslibs = yes], [CFLAGS="$CFLAGS $cs_cv_cslibs_cflags" CPPFLAGS="$CPPFLAGS $cs_cv_cslibs_cflags" LDFLAGS="$LDFLAGS $cs_cv_cslibs_lflags" - PATH="$cs_cv_cslibs_binpath$PATH_SEPARATOR$PATH"]) + PATH="$cs_cv_cslibs_binpath$PATH_SEPARATOR$PATH" + AS_IF([test -n "$cs_cv_cslibs_pcpath"], + [PKG_CONFIG_PATH="$cs_cv_cslibs_pcpath$PATH_SEPARATOR$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH])]) ;; esac]) Modified: CS/trunk/mk/autoconf/compiler.m4 =================================================================== --- CS/trunk/mk/autoconf/compiler.m4 2006-09-15 22:07:20 UTC (rev 25356) +++ CS/trunk/mk/autoconf/compiler.m4 2006-09-15 22:17:09 UTC (rev 25357) @@ -27,20 +27,6 @@ # CFLAGS variable because Autoconf's -g and -O defaults are not always # desired. This will also set the CMD.CC and COMPILER.CFLAGS variables # in Jamconfig -# CS_PROG_CXX -# Detects the C++ compiler. Also takes care of the CXXFLAGS, CPPFLAGS -# and CXX environment variables. This will filter out all -g and -O from -# the CXXFLAGS variable because Autoconf's -g and -O defaults are not -# always desired. This will also set the CMD.C++ and COMPILER.C++FLAGS -# variables in Jamconfig -# CS_PROG_LINK -# Tries to determine a linker. This is done by checking if a C++ or -# Objecctive-C++ compiler is available in which case it is used for -# linking; otherwise the C or Objective-C compiler is used. This also -# sets the CMD.LINK and COMPILER.LFLAGS variables in Jamconfig and -# respects the LDFLAGS environment variable. Finally, checks if linker -# recognizes -shared and sets PLUGIN.LFLAGS; and checks if linker -# recognizes -soname and sets PLUGIN.LFLAGS.USE_SONAME to "yes". # Also, it is checked whether the linker supports the --as-needed # command line option, and if so, it is employed. As some libraries # reportedly don't support that feature, you can put @@ -60,6 +46,14 @@ ]) ]) +#----------------------------------------------------------------------------- +# CS_PROG_CXX +# Detects the C++ compiler. Also takes care of the CXXFLAGS, CPPFLAGS +# and CXX environment variables. This will filter out all -g and -O from +# the CXXFLAGS variable because Autoconf's -g and -O defaults are not +# always desired. This will also set the CMD.C++ and COMPILER.C++FLAGS +# variables in Jamconfig +#----------------------------------------------------------------------------- AC_DEFUN([CS_PROG_CXX],[ CXXFLAGS="$CXXFLAGS" # Filter undesired flags AC_PROG_CXX @@ -77,6 +71,16 @@ ]) ]) +#----------------------------------------------------------------------------- +# CS_PROG_LINK +# Tries to determine a linker. This is done by checking if a C++ or +# Objecctive-C++ compiler is available in which case it is used for +# linking; otherwise the C or Objective-C compiler is used. This also +# sets the CMD.LINK and COMPILER.LFLAGS variables in Jamconfig and +# respects the LDFLAGS environment variable. Finally, checks if linker +# recognizes -shared and sets PLUGIN.LFLAGS; and checks if linker +# recognizes -soname and sets PLUGIN.LFLAGS.USE_SONAME to "yes". +#----------------------------------------------------------------------------- AC_DEFUN([CS_PROG_LINK],[ AC_REQUIRE([CS_PROG_CXX]) AS_IF([test -n "$CXX"], @@ -129,3 +133,46 @@ [cs_cv_prog_link_no_as_needed], [CS_CREATE_TUPLE([-Wl,--no-as-needed])], [C++])])]) ]) + +#----------------------------------------------------------------------------- +# CS_CHECK_MNO_CYGWIN +# Check whether the -mno-cygwin flag should be passed to the compiler. +# If so, adjust the compiler env vars accordingly. +# +# Peter Amstutz explains: "Because "gcc -mno-cygwin" is quite literally +# another compiler (it actually invokes /usr/lib/gcc/mingw-3.4.4/cc1.exe +# instead of /usr/lib/cygwin-3.4.4/cc1.exe) things like the paths to +# standard libraries change (out with cygwin headers, in with windows +# headers) and generally the surface behavior of the compiler changes +# radically. As a result, simply augmenting $CXXFLAGS was problematic +# (autoconf tests that didn't have $CXXFLAGS would yield incorrect +# results) and it made more sense to have autoconf treat it as if it +# were a different compiler entirely." +#----------------------------------------------------------------------------- +AC_DEFUN([CS_CHECK_MNO_CYGWIN], + [AC_REQUIRE([AC_CANONICAL_HOST]) + AC_MSG_CHECKING([whether to enable -mno-cygwin]) + AC_ARG_ENABLE([mno-cygwin], + [AC_HELP_STRING([--enable-mno-cygwin], + [Compile with the -mno-cygwin option. (default YES)])], + [enable_m_no_cygwin=$enableval], [enable_m_no_cygwin=yes]) + AS_IF([test "$enable_m_no_cygwin" != "no"], + [case $host_os in + cygwin*) + AS_IF([test -n "$CC"], + [CC="$CC -mno-cygwin"], + [CC="gcc -mno-cygwin"]) + AS_IF([test -n "$CXX"], + [CXX="$CXX -mno-cygwin"], + [CXX="g++ -mno-cygwin"]) + CPP="$CC -E" + CXXCPP="$CXX -E" + cs_mno_cygwin=yes + ;; + *) + cs_mno_cygwin=no + ;; + esac + ], [cs_mno_cygwin=no]) + AC_MSG_RESULT([$cs_mno_cygwin]) + ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cry...@us...> - 2006-09-16 00:28:35
|
Revision: 25359 http://svn.sourceforge.net/crystal/?rev=25359&view=rev Author: crystal-manage Date: 2006-09-15 17:28:14 -0700 (Fri, 15 Sep 2006) Log Message: ----------- master header files: Automated master header file repair. Visual-C++ project files: Automated Visual-C++ project file repair. Texinfo files: Automated Texinfo @node and @menu repair. Swig Python files: Automated Swig Python file repair. Swig Perl5 files: Automated Swig Perl5 file repair. User's Manual: Automated Texinfo to HTML conversion. Modified Paths: -------------- CS/trunk/docs/html/manual/cs_2.2.html CS/trunk/docs/html/manual/cs_2.3.html CS/trunk/plugins/cscript/cspython/cs_pyth.cpp CS/trunk/scripts/perl5/cspace.pm CS/trunk/scripts/perl5/cswigpl5.inc CS/trunk/scripts/python/cspace.py Modified: CS/trunk/docs/html/manual/cs_2.2.html =================================================================== --- CS/trunk/docs/html/manual/cs_2.2.html 2006-09-15 22:21:05 UTC (rev 25358) +++ CS/trunk/docs/html/manual/cs_2.2.html 2006-09-16 00:28:14 UTC (rev 25359) @@ -75,7 +75,10 @@ may download a pre-built <small>SDK</small> package. If you are using the <small>SVN</small> version of Crystal Space, then you will need to build it yourself. To do so you will need a supported C++ compiler such as the <small>GNU</small> Compiler Collection -(<small>GCC</small>) or Microsoft Visual C++. If you plan to use the scripting +(<small>GCC</small> - versions known to work well are 3.4 and above, with the exception +of versions 4.0.0 and 4.0.1 which produce buggy code for Crystal Space) or +Microsoft Visual C++, version 7.0 (aka .net 2002) and above (version 6 is not +supported). If you plan to use the scripting capabilities of Crystal Space you will also need an interpreter for each scripting language you use. </p> Modified: CS/trunk/docs/html/manual/cs_2.3.html =================================================================== --- CS/trunk/docs/html/manual/cs_2.3.html 2006-09-15 22:21:05 UTC (rev 25358) +++ CS/trunk/docs/html/manual/cs_2.3.html 2006-09-16 00:28:14 UTC (rev 25359) @@ -111,7 +111,7 @@ libraries in pre-compiled form from the following location: </p> -<p><a href="http://www.crystalspace3d.org/downloads/cs-win32libs/cs-win32libs-0.99r0_022.exe">http://www.crystalspace3d.org/downloads/cs-win32libs/cs-win32libs-0.99r0_022.exe</a> +<p><a href="http://www.crystalspace3d.org/downloads/cs-win32libs/cs-win32libs-1.0rc1_001.exe">http://www.crystalspace3d.org/downloads/cs-win32libs/cs-win32libs-1.0rc1_001.exe</a> </p> <a name="SEC21"></a> <h3 class="subheading"> zlib </h3> Modified: CS/trunk/plugins/cscript/cspython/cs_pyth.cpp =================================================================== --- CS/trunk/plugins/cscript/cspython/cs_pyth.cpp 2006-09-15 22:21:05 UTC (rev 25358) +++ CS/trunk/plugins/cscript/cspython/cs_pyth.cpp 2006-09-16 00:28:14 UTC (rev 25359) @@ -2516,881 +2516,880 @@ #define SWIGTYPE_p_csRefTiRenderBuffer_t swig_types[166] #define SWIGTYPE_p_csRefTiRigidBody_t swig_types[167] #define SWIGTYPE_p_csRefTiScriptObject_t swig_types[168] -#define SWIGTYPE_p_csRefTiStringArray_t swig_types[169] -#define SWIGTYPE_p_csRefTiString_t swig_types[170] -#define SWIGTYPE_p_csRenderBufferHolder swig_types[171] -#define SWIGTYPE_p_csRenderBufferName swig_types[172] -#define SWIGTYPE_p_csRenderMesh swig_types[173] -#define SWIGTYPE_p_csRenderMeshList swig_types[174] -#define SWIGTYPE_p_csRenderMeshModes swig_types[175] -#define SWIGTYPE_p_csReporterHelper swig_types[176] -#define SWIGTYPE_p_csReversibleTransform swig_types[177] -#define SWIGTYPE_p_csScreenBoxResult swig_types[178] -#define SWIGTYPE_p_csSectorHitBeamResult swig_types[179] -#define SWIGTYPE_p_csSegment2 swig_types[180] -#define SWIGTYPE_p_csSegment3 swig_types[181] -#define SWIGTYPE_p_csSetTcsPtrKeyTiMeshWrapper_t_CS__Memory__AllocatorMalloc_t swig_types[182] -#define SWIGTYPE_p_csSetTunsigned_long_CS__Memory__AllocatorMalloc_t swig_types[183] -#define SWIGTYPE_p_csShaderMetadata swig_types[184] -#define SWIGTYPE_p_csShaderTagPresence swig_types[185] -#define SWIGTYPE_p_csShaderVariable swig_types[186] -#define SWIGTYPE_p_csSimplePixmap swig_types[187] -#define SWIGTYPE_p_csSimpleRenderMesh swig_types[188] -#define SWIGTYPE_p_csSndSysRendererSoftware swig_types[189] -#define SWIGTYPE_p_csSndSysSoundFormat swig_types[190] -#define SWIGTYPE_p_csSourceParameters3D swig_types[191] -#define SWIGTYPE_p_csSphere swig_types[192] -#define SWIGTYPE_p_csSpline swig_types[193] -#define SWIGTYPE_p_csSprite2DVertex swig_types[194] -#define SWIGTYPE_p_csSpriteCal3DActiveAnim swig_types[195] -#define SWIGTYPE_p_csSquaredDist swig_types[196] -#define SWIGTYPE_p_csStrKey swig_types[197] -#define SWIGTYPE_p_csString swig_types[198] -#define SWIGTYPE_p_csStringArray swig_types[199] -#define SWIGTYPE_p_csStringBase swig_types[200] -#define SWIGTYPE_p_csStringFastT36_t swig_types[201] -#define SWIGTYPE_p_csStringSet swig_types[202] -#define SWIGTYPE_p_csTinyDocumentSystem swig_types[203] -#define SWIGTYPE_p_csTraceBeamResult swig_types[204] -#define SWIGTYPE_p_csTransform swig_types[205] -#define SWIGTYPE_p_csTriangle swig_types[206] -#define SWIGTYPE_p_csVector2 swig_types[207] -#define SWIGTYPE_p_csVector3 swig_types[208] -#define SWIGTYPE_p_csVector3Array swig_types[209] -#define SWIGTYPE_p_csVector4 swig_types[210] -#define SWIGTYPE_p_csVertexAttrib swig_types[211] -#define SWIGTYPE_p_csVertexStatus swig_types[212] -#define SWIGTYPE_p_csView swig_types[213] -#define SWIGTYPE_p_csWrapPtr swig_types[214] -#define SWIGTYPE_p_csXRotMatrix3 swig_types[215] -#define SWIGTYPE_p_csXScaleMatrix3 swig_types[216] -#define SWIGTYPE_p_csYRotMatrix3 swig_types[217] -#define SWIGTYPE_p_csYScaleMatrix3 swig_types[218] -#define SWIGTYPE_p_csZRotMatrix3 swig_types[219] -#define SWIGTYPE_p_csZScaleMatrix3 swig_types[220] -#define SWIGTYPE_p_double swig_types[221] -#define SWIGTYPE_p_f_p_iBase__p__csPyEventHandler swig_types[222] -#define SWIGTYPE_p_f_p_iBase__p_csPath swig_types[223] -#define SWIGTYPE_p_f_p_iBase__p_iAnimTimeUpdateHandler swig_types[224] -#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsShaderVariable_p_t swig_types[225] -#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsSprite2DVertex_t swig_types[226] -#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[227] -#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[228] -#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[229] -#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[230] -#define SWIGTYPE_p_f_p_iBase__p_iAws swig_types[231] -#define SWIGTYPE_p_f_p_iBase__p_iAwsComponent swig_types[232] -#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentFactory swig_types[233] -#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentNode swig_types[234] -#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionKey swig_types[235] -#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionNodeFactory swig_types[236] -#define SWIGTYPE_p_f_p_iBase__p_iAwsFloatKey swig_types[237] -#define SWIGTYPE_p_f_p_iBase__p_iAwsIntKey swig_types[238] -#define SWIGTYPE_p_f_p_iBase__p_iAwsKey swig_types[239] -#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyContainer swig_types[240] -#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyFactory swig_types[241] -#define SWIGTYPE_p_f_p_iBase__p_iAwsLayoutManager swig_types[242] -#define SWIGTYPE_p_f_p_iBase__p_iAwsPointKey swig_types[243] -#define SWIGTYPE_p_f_p_iBase__p_iAwsPrefManager swig_types[244] -#define SWIGTYPE_p_f_p_iBase__p_iAwsRGBKey swig_types[245] -#define SWIGTYPE_p_f_p_iBase__p_iAwsRectKey swig_types[246] -#define SWIGTYPE_p_f_p_iBase__p_iAwsSink swig_types[247] -#define SWIGTYPE_p_f_p_iBase__p_iAwsSinkManager swig_types[248] -#define SWIGTYPE_p_f_p_iBase__p_iAwsSlot swig_types[249] -#define SWIGTYPE_p_f_p_iBase__p_iAwsSource swig_types[250] -#define SWIGTYPE_p_f_p_iBase__p_iAwsStringKey swig_types[251] -#define SWIGTYPE_p_f_p_iBase__p_iBase swig_types[252] -#define SWIGTYPE_p_f_p_iBase__p_iBinaryLoaderPlugin swig_types[253] -#define SWIGTYPE_p_f_p_iBase__p_iBodyGroup swig_types[254] -#define SWIGTYPE_p_f_p_iBase__p_iCacheManager swig_types[255] -#define SWIGTYPE_p_f_p_iBase__p_iCamera swig_types[256] -#define SWIGTYPE_p_f_p_iBase__p_iCameraPosition swig_types[257] -#define SWIGTYPE_p_f_p_iBase__p_iCameraPositionList swig_types[258] -#define SWIGTYPE_p_f_p_iBase__p_iCameraSectorListener swig_types[259] -#define SWIGTYPE_p_f_p_iBase__p_iClipper2D swig_types[260] -#define SWIGTYPE_p_f_p_iBase__p_iCollideSystem swig_types[261] -#define SWIGTYPE_p_f_p_iBase__p_iCollider swig_types[262] -#define SWIGTYPE_p_f_p_iBase__p_iColoredVertices swig_types[263] -#define SWIGTYPE_p_f_p_iBase__p_iCommandLineParser swig_types[264] -#define SWIGTYPE_p_f_p_iBase__p_iComponent swig_types[265] -#define SWIGTYPE_p_f_p_iBase__p_iConfigFile swig_types[266] -#define SWIGTYPE_p_f_p_iBase__p_iConfigIterator swig_types[267] -#define SWIGTYPE_p_f_p_iBase__p_iConfigManager swig_types[268] -#define SWIGTYPE_p_f_p_iBase__p_iConsoleOutput swig_types[269] -#define SWIGTYPE_p_f_p_iBase__p_iConsoleWatcher swig_types[270] -#define SWIGTYPE_p_f_p_iBase__p_iDataBuffer swig_types[271] -#define SWIGTYPE_p_f_p_iBase__p_iDebugHelper swig_types[272] -#define SWIGTYPE_p_f_p_iBase__p_iDocument swig_types[273] -#define SWIGTYPE_p_f_p_iBase__p_iDocumentAttribute swig_types[274] -#define SWIGTYPE_p_f_p_iBase__p_iDocumentAttributeIterator swig_types[275] -#define SWIGTYPE_p_f_p_iBase__p_iDocumentNode swig_types[276] -#define SWIGTYPE_p_f_p_iBase__p_iDocumentNodeIterator swig_types[277] -#define SWIGTYPE_p_f_p_iBase__p_iDocumentSystem swig_types[278] -#define SWIGTYPE_p_f_p_iBase__p_iDynamicSystem swig_types[279] -#define SWIGTYPE_p_f_p_iBase__p_iDynamics swig_types[280] -#define SWIGTYPE_p_f_p_iBase__p_iDynamicsColliderCollisionCallback swig_types[281] -#define SWIGTYPE_p_f_p_iBase__p_iDynamicsCollisionCallback swig_types[282] -#define SWIGTYPE_p_f_p_iBase__p_iDynamicsMoveCallback swig_types[283] -#define SWIGTYPE_p_f_p_iBase__p_iDynamicsSystemCollider swig_types[284] -#define SWIGTYPE_p_f_p_iBase__p_iEngine swig_types[285] -#define SWIGTYPE_p_f_p_iBase__p_iEngineFrameCallback swig_types[286] -#define SWIGTYPE_p_f_p_iBase__p_iEngineSectorCallback swig_types[287] -#define SWIGTYPE_p_f_p_iBase__p_iEngineSequenceManager swig_types[288] -#define SWIGTYPE_p_f_p_iBase__p_iEngineSequenceParameters swig_types[289] -#define SWIGTYPE_p_f_p_iBase__p_iEvent swig_types[290] -#define SWIGTYPE_p_f_p_iBase__p_iEventAttributeIterator swig_types[291] -#define SWIGTYPE_p_f_p_iBase__p_iEventCord swig_types[292] -#define SWIGTYPE_p_f_p_iBase__p_iEventHandler swig_types[293] -#define SWIGTYPE_p_f_p_iBase__p_iEventNameRegistry swig_types[294] -#define SWIGTYPE_p_f_p_iBase__p_iEventOutlet swig_types[295] -#define SWIGTYPE_p_f_p_iBase__p_iEventPlug swig_types[296] -#define SWIGTYPE_p_f_p_iBase__p_iEventQueue swig_types[297] -#define SWIGTYPE_p_f_p_iBase__p_iFactory swig_types[298] -#define SWIGTYPE_p_f_p_iBase__p_iFile swig_types[299] -#define SWIGTYPE_p_f_p_iBase__p_iFont swig_types[300] -#define SWIGTYPE_p_f_p_iBase__p_iFontDeleteNotify swig_types[301] -#define SWIGTYPE_p_f_p_iBase__p_iFontServer swig_types[302] -#define SWIGTYPE_p_f_p_iBase__p_iFrustumView swig_types[303] -#define SWIGTYPE_p_f_p_iBase__p_iFrustumViewUserdata swig_types[304] -#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControl swig_types[305] -#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControlFactory swig_types[306] -#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControlType swig_types[307] -#define SWIGTYPE_p_f_p_iBase__p_iGeneralFactoryState swig_types[308] -#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshCommonState swig_types[309] -#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshState swig_types[310] -#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshSubMesh swig_types[311] -#define SWIGTYPE_p_f_p_iBase__p_iGraphics2D swig_types[312] -#define SWIGTYPE_p_f_p_iBase__p_iGraphics3D swig_types[313] -#define SWIGTYPE_p_f_p_iBase__p_iHalo swig_types[314] -#define SWIGTYPE_p_f_p_iBase__p_iImage swig_types[315] -#define SWIGTYPE_p_f_p_iBase__p_iImageIO swig_types[316] -#define SWIGTYPE_p_f_p_iBase__p_iJoint swig_types[317] -#define SWIGTYPE_p_f_p_iBase__p_iJoystickDriver swig_types[318] -#define SWIGTYPE_p_f_p_iBase__p_iKeyComposer swig_types[319] -#define SWIGTYPE_p_f_p_iBase__p_iKeyboardDriver swig_types[320] -#define SWIGTYPE_p_f_p_iBase__p_iLight swig_types[321] -#define SWIGTYPE_p_f_p_iBase__p_iLightCallback swig_types[322] -#define SWIGTYPE_p_f_p_iBase__p_iLightIterator swig_types[323] -#define SWIGTYPE_p_f_p_iBase__p_iLightList swig_types[324] -#define SWIGTYPE_p_f_p_iBase__p_iLightVisibleCallback swig_types[325] -#define SWIGTYPE_p_f_p_iBase__p_iLightingProcessData swig_types[326] -#define SWIGTYPE_p_f_p_iBase__p_iLightingProcessInfo swig_types[327] -#define SWIGTYPE_p_f_p_iBase__p_iLoader swig_types[328] -#define SWIGTYPE_p_f_p_iBase__p_iLoaderPlugin swig_types[329] -#define SWIGTYPE_p_f_p_iBase__p_iLoaderStatus swig_types[330] -#define SWIGTYPE_p_f_p_iBase__p_iMapNode swig_types[331] -#define SWIGTYPE_p_f_p_iBase__p_iMaterial swig_types[332] -#define SWIGTYPE_p_f_p_iBase__p_iMaterialEngine swig_types[333] -#define SWIGTYPE_p_f_p_iBase__p_iMaterialList swig_types[334] -#define SWIGTYPE_p_f_p_iBase__p_iMaterialWrapper swig_types[335] -#define SWIGTYPE_p_f_p_iBase__p_iMeshDrawCallback swig_types[336] -#define SWIGTYPE_p_f_p_iBase__p_iMeshFactoryList swig_types[337] -#define SWIGTYPE_p_f_p_iBase__p_iMeshFactoryWrapper swig_types[338] -#define SWIGTYPE_p_f_p_iBase__p_iMeshList swig_types[339] -#define SWIGTYPE_p_f_p_iBase__p_iMeshObject swig_types[340] -#define SWIGTYPE_p_f_p_iBase__p_iMeshObjectDrawCallback swig_types[341] -#define SWIGTYPE_p_f_p_iBase__p_iMeshObjectFactory swig_types[342] -#define SWIGTYPE_p_f_p_iBase__p_iMeshObjectType swig_types[343] -#define SWIGTYPE_p_f_p_iBase__p_iMeshWrapper swig_types[344] -#define SWIGTYPE_p_f_p_iBase__p_iMeshWrapperIterator swig_types[345] -#define SWIGTYPE_p_f_p_iBase__p_iMissingLoaderData swig_types[346] -#define SWIGTYPE_p_f_p_iBase__p_iMouseDriver swig_types[347] -#define SWIGTYPE_p_f_p_iBase__p_iMovable swig_types[348] -#define SWIGTYPE_p_f_p_iBase__p_iMovableListener swig_types[349] -#define SWIGTYPE_p_f_p_iBase__p_iMovieRecorder swig_types[350] -#define SWIGTYPE_p_f_p_iBase__p_iNativeWindow swig_types[351] -#define SWIGTYPE_p_f_p_iBase__p_iNativeWindowManager swig_types[352] -#define SWIGTYPE_p_f_p_iBase__p_iODEAMotorJoint swig_types[353] -#define SWIGTYPE_p_f_p_iBase__p_iODEBallJoint swig_types[354] -#define SWIGTYPE_p_f_p_iBase__p_iODEDynamicState swig_types[355] -#define SWIGTYPE_p_f_p_iBase__p_iODEDynamicSystemState swig_types[356] -#define SWIGTYPE_p_f_p_iBase__p_iODEFrameUpdateCallback swig_types[357] -#define SWIGTYPE_p_f_p_iBase__p_iODEGeneralJointState swig_types[358] -#define SWIGTYPE_p_f_p_iBase__p_iODEHinge2Joint swig_types[359] -#define SWIGTYPE_p_f_p_iBase__p_iODEHingeJoint swig_types[360] -#define SWIGTYPE_p_f_p_iBase__p_iODEJointState swig_types[361] -#define SWIGTYPE_p_f_p_iBase__p_iODESliderJoint swig_types[362] -#define SWIGTYPE_p_f_p_iBase__p_iODEUniversalJoint swig_types[363] -#define SWIGTYPE_p_f_p_iBase__p_iObject swig_types[364] -#define SWIGTYPE_p_f_p_iBase__p_iObjectIterator swig_types[365] -#define SWIGTYPE_p_f_p_iBase__p_iObjectModel swig_types[366] -#define SWIGTYPE_p_f_p_iBase__p_iObjectModelListener swig_types[367] -#define SWIGTYPE_p_f_p_iBase__p_iObjectNameChangeListener swig_types[368] -#define SWIGTYPE_p_f_p_iBase__p_iObjectRegistry swig_types[369] -#define SWIGTYPE_p_f_p_iBase__p_iObjectRegistryIterator swig_types[370] -#define SWIGTYPE_p_f_p_iBase__p_iOffscreenCanvasCallback swig_types[371] -#define SWIGTYPE_p_f_p_iBase__p_iParameterESM swig_types[372] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEffectorFactory swig_types[373] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEffectorForce swig_types[374] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEffectorLinColor swig_types[375] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterBase swig_types[376] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterBox swig_types[377] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterCone swig_types[378] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterCylinder swig_types[379] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterFactory swig_types[380] -#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterSphere swig_types[381] -#define SWIGTYPE_p_f_p_iBase__p_iParticleEffector swig_types[382] -#define SWIGTYPE_p_f_p_iBase__p_iParticleEmitter swig_types[383] -#define SWIGTYPE_p_f_p_iBase__p_iParticleSystem swig_types[384] -#define SWIGTYPE_p_f_p_iBase__p_iParticleSystemBase swig_types[385] -#define SWIGTYPE_p_f_p_iBase__p_iParticleSystemFactory swig_types[386] -#define SWIGTYPE_p_f_p_iBase__p_iPath swig_types[387] -#define SWIGTYPE_p_f_p_iBase__p_iPluginIterator swig_types[388] -#define SWIGTYPE_p_f_p_iBase__p_iPluginManager swig_types[389] -#define SWIGTYPE_p_f_p_iBase__p_iPolygonHandle swig_types[390] -#define SWIGTYPE_p_f_p_iBase__p_iPolygonMesh swig_types[391] -#define SWIGTYPE_p_f_p_iBase__p_iPortal swig_types[392] -#define SWIGTYPE_p_f_p_iBase__p_iPortalCallback swig_types[393] -#define SWIGTYPE_p_f_p_iBase__p_iPortalContainer swig_types[394] -#define SWIGTYPE_p_f_p_iBase__p_iRegion swig_types[395] -#define SWIGTYPE_p_f_p_iBase__p_iRegionList swig_types[396] -#define SWIGTYPE_p_f_p_iBase__p_iRendererLightmap swig_types[397] -#define SWIGTYPE_p_f_p_iBase__p_iReporter swig_types[398] -#define SWIGTYPE_p_f_p_iBase__p_iReporterIterator swig_types[399] -#define SWIGTYPE_p_f_p_iBase__p_iReporterListener swig_types[400] -#define SWIGTYPE_p_f_p_iBase__p_iRigidBody swig_types[401] -#define SWIGTYPE_p_f_p_iBase__p_iSCF swig_types[402] -#define SWIGTYPE_p_f_p_iBase__p_iSaver swig_types[403] -#define SWIGTYPE_p_f_p_iBase__p_iSceneNode swig_types[404] -#define SWIGTYPE_p_f_p_iBase__p_iScript swig_types[405] -#define SWIGTYPE_p_f_p_iBase__p_iScriptObject swig_types[406] -#define SWIGTYPE_p_f_p_iBase__p_iSector swig_types[407] -#define SWIGTYPE_p_f_p_iBase__p_iSectorCallback swig_types[408] -#define SWIGTYPE_p_f_p_iBase__p_iSectorIterator swig_types[409] -#define SWIGTYPE_p_f_p_iBase__p_iSectorList swig_types[410] -#define SWIGTYPE_p_f_p_iBase__p_iSectorMeshCallback swig_types[411] -#define SWIGTYPE_p_f_p_iBase__p_iSequenceTimedOperation swig_types[412] -#define SWIGTYPE_p_f_p_iBase__p_iSequenceTrigger swig_types[413] -#define SWIGTYPE_p_f_p_iBase__p_iSequenceWrapper swig_types[414] -#define SWIGTYPE_p_f_p_iBase__p_iShader swig_types[415] -#define SWIGTYPE_p_f_p_iBase__p_iShaderCompiler swig_types[416] -#define SWIGTYPE_p_f_p_iBase__p_iShaderManager swig_types[417] -#define SWIGTYPE_p_f_p_iBase__p_iShaderPriorityList swig_types[418] -#define SWIGTYPE_p_f_p_iBase__p_iShaderVarStack swig_types[419] -#define SWIGTYPE_p_f_p_iBase__p_iShaderVariableAccessor swig_types[420] -#define SWIGTYPE_p_f_p_iBase__p_iShaderVariableContext swig_types[421] -#define SWIGTYPE_p_f_p_iBase__p_iSimpleFormerState swig_types[422] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysData swig_types[423] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysListener swig_types[424] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysLoader swig_types[425] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysManager swig_types[426] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysRenderer swig_types[427] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysRendererCallback swig_types[428] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysRendererSoftware swig_types[429] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSoftwareDriver swig_types[430] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSoftwareFilter3D swig_types[431] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSoftwareOutputFilter swig_types[432] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSource swig_types[433] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSourceSoftware swig_types[434] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysSourceSoftware3D swig_types[435] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysStream swig_types[436] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysStreamCallback swig_types[437] -#define SWIGTYPE_p_f_p_iBase__p_iSndSysWrapper swig_types[438] -#define SWIGTYPE_p_f_p_iBase__p_iSprite2DFactoryState swig_types[439] -#define SWIGTYPE_p_f_p_iBase__p_iSprite2DState swig_types[440] -#define SWIGTYPE_p_f_p_iBase__p_iSprite2DUVAnimation swig_types[441] -#define SWIGTYPE_p_f_p_iBase__p_iSprite2DUVAnimationFrame swig_types[442] -#define SWIGTYPE_p_f_p_iBase__p_iSprite3DFactoryState swig_types[443] -#define SWIGTYPE_p_f_p_iBase__p_iSprite3DState swig_types[444] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteAction swig_types[445] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteCal3DFactoryState swig_types[446] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteCal3DSocket swig_types[447] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteCal3DState swig_types[448] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteFrame swig_types[449] -#define SWIGTYPE_p_f_p_iBase__p_iSpriteSocket swig_types[450] -#define SWIGTYPE_p_f_p_iBase__p_iStandardReporterListener swig_types[451] -#define SWIGTYPE_p_f_p_iBase__p_iString swig_types[452] -#define SWIGTYPE_p_f_p_iBase__p_iStringArray swig_types[453] -#define SWIGTYPE_p_f_p_iBase__p_iStringSet swig_types[454] -#define SWIGTYPE_p_f_p_iBase__p_iSuperLightmap swig_types[455] -#define SWIGTYPE_p_f_p_iBase__p_iTerraFormer swig_types[456] -#define SWIGTYPE_p_f_p_iBase__p_iTerraSampler swig_types[457] -#define SWIGTYPE_p_f_p_iBase__p_iTerrainFactoryState swig_types[458] -#define SWIGTYPE_p_f_p_iBase__p_iTerrainObjectState swig_types[459] -#define SWIGTYPE_p_f_p_iBase__p_iTextureCallback swig_types[460] -#define SWIGTYPE_p_f_p_iBase__p_iTextureHandle swig_types[461] -#define SWIGTYPE_p_f_p_iBase__p_iTextureList swig_types[462] -#define SWIGTYPE_p_f_p_iBase__p_iTextureManager swig_types[463] -#define SWIGTYPE_p_f_p_iBase__p_iTextureWrapper swig_types[464] -#define SWIGTYPE_p_f_p_iBase__p_iThingEnvironment swig_types[465] -#define SWIGTYPE_p_f_p_iBase__p_iThingFactoryState swig_types[466] -#define SWIGTYPE_p_f_p_iBase__p_iThingState swig_types[467] -#define SWIGTYPE_p_f_p_iBase__p_iVFS swig_types[468] -#define SWIGTYPE_p_f_p_iBase__p_iView swig_types[469] -#define SWIGTYPE_p_f_p_iBase__p_iVirtualClock swig_types[470] -#define SWIGTYPE_p_f_p_iBase__p_iVisibilityCuller swig_types[471] -#define SWIGTYPE_p_f_p_iBase__p_iVisibilityCullerListener swig_types[472] -#define SWIGTYPE_p_f_p_iBase__p_iVisibilityObject swig_types[473] -#define SWIGTYPE_p_f_p_iBase__p_iVisibilityObjectIterator swig_types[474] -#define SWIGTYPE_p_f_p_iBase__p_scfImplementation1TcsPath_iPath_t swig_types[475] -#define SWIGTYPE_p_f_p_iMeshWrapper_p_iFrustumView_bool__void swig_types[476] -#define SWIGTYPE_p_f_unsigned_long_int_p_iAwsSource__void swig_types[477] -#define SWIGTYPE_p_f_unsigned_long_p_void_p_iAwsSource__void swig_types[478] -#define SWIGTYPE_p_float swig_types[479] -#define SWIGTYPE_p_iAnimTimeUpdateHandler swig_types[480] -#define SWIGTYPE_p_iArrayChangeAllTcsShaderVariable_p_t swig_types[481] -#define SWIGTYPE_p_iArrayChangeAllTcsSprite2DVertex_t swig_types[482] -#define SWIGTYPE_p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[483] -#define SWIGTYPE_p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[484] -#define SWIGTYPE_p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[485] -#define SWIGTYPE_p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[486] -#define SWIGTYPE_p_iAws swig_types[487] -#define SWIGTYPE_p_iAwsCanvas swig_types[488] -#define SWIGTYPE_p_iAwsComponent swig_types[489] -#define SWIGTYPE_p_iAwsComponentFactory swig_types[490] -#define SWIGTYPE_p_iAwsComponentNode swig_types[491] -#define SWIGTYPE_p_iAwsConnectionKey swig_types[492] -#define SWIGTYPE_p_iAwsConnectionNodeFactory swig_types[493] -#define SWIGTYPE_p_iAwsFloatKey swig_types[494] -#define SWIGTYPE_p_iAwsIntKey swig_types[495] -#define SWIGTYPE_p_iAwsKey swig_types[496] -#define SWIGTYPE_p_iAwsKeyContainer swig_types[497] -#define SWIGTYPE_p_iAwsKeyFactory swig_types[498] -#define SWIGTYPE_p_iAwsLayoutManager swig_types[499] -#define SWIGTYPE_p_iAwsParmList swig_types[500] -#define SWIGTYPE_p_iAwsPointKey swig_types[501] -#define SWIGTYPE_p_iAwsPrefManager swig_types[502] -#define SWIGTYPE_p_iAwsRGBKey swig_types[503] -#define SWIGTYPE_p_iAwsRGBKey__RGB swig_types[504] -#define SWIGTYPE_p_iAwsRectKey swig_types[505] -#define SWIGTYPE_p_iAwsSink swig_types[506] -#define SWIGTYPE_p_iAwsSinkManager swig_types[507] -#define SWIGTYPE_p_iAwsSlot swig_types[508] -#define SWIGTYPE_p_iAwsSource swig_types[509] -#define SWIGTYPE_p_iAwsStringKey swig_types[510] -#define SWIGTYPE_p_iBase swig_types[511] -#define SWIGTYPE_p_iBaseHalo swig_types[512] -#define SWIGTYPE_p_iBinaryLoaderPlugin swig_types[513] -#define SWIGTYPE_p_iBodyGroup swig_types[514] -#define SWIGTYPE_p_iCacheManager swig_types[515] -#define SWIGTYPE_p_iCamera swig_types[516] -#define SWIGTYPE_p_iCameraPosition swig_types[517] -#define SWIGTYPE_p_iCameraPositionList swig_types[518] -#define SWIGTYPE_p_iCameraSectorListener swig_types[519] -#define SWIGTYPE_p_iClipper2D swig_types[520] -#define SWIGTYPE_p_iCollection swig_types[521] -#define SWIGTYPE_p_iCollectionList swig_types[522] -#define SWIGTYPE_p_iCollideSystem swig_types[523] -#define SWIGTYPE_p_iCollider swig_types[524] -#define SWIGTYPE_p_iColoredVertices swig_types[525] -#define SWIGTYPE_p_iCommandLineParser swig_types[526] -#define SWIGTYPE_p_iComponent swig_types[527] -#define SWIGTYPE_p_iConfigFile swig_types[528] -#define SWIGTYPE_p_iConfigIterator swig_types[529] -#define SWIGTYPE_p_iConfigManager swig_types[530] -#define SWIGTYPE_p_iConsoleOutput swig_types[531] -#define SWIGTYPE_p_iConsoleWatcher swig_types[532] -#define SWIGTYPE_p_iCrossHalo swig_types[533] -#define SWIGTYPE_p_iDataBuffer swig_types[534] -#define SWIGTYPE_p_iDebugHelper swig_types[535] -#define SWIGTYPE_p_iDocument swig_types[536] -#define SWIGTYPE_p_iDocumentAttribute swig_types[537] -#define SWIGTYPE_p_iDocumentAttributeIterator swig_types[538] -#define SWIGTYPE_p_iDocumentNode swig_types[539] -#define SWIGTYPE_p_iDocumentNodeIterator swig_types[540] -#define SWIGTYPE_p_iDocumentSystem swig_types[541] -#define SWIGTYPE_p_iDynamicSystem swig_types[542] -#define SWIGTYPE_p_iDynamics swig_types[543] -#define SWIGTYPE_p_iDynamicsColliderCollisionCallback swig_types[544] -#define SWIGTYPE_p_iDynamicsCollisionCallback swig_types[545] -#define SWIGTYPE_p_iDynamicsMoveCallback swig_types[546] -#define SWIGTYPE_p_iDynamicsSystemCollider swig_types[547] -#define SWIGTYPE_p_iEngine swig_types[548] -#define SWIGTYPE_p_iEngineFrameCallback swig_types[549] -#define SWIGTYPE_p_iEngineSectorCallback swig_types[550] -#define SWIGTYPE_p_iEngineSequenceManager swig_types[551] -#define SWIGTYPE_p_iEngineSequenceParameters swig_types[552] -#define SWIGTYPE_p_iEvent swig_types[553] -#define SWIGTYPE_p_iEventAttributeIterator swig_types[554] -#define SWIGTYPE_p_iEventCord swig_types[555] -#define SWIGTYPE_p_iEventHandler swig_types[556] -#define SWIGTYPE_p_iEventNameRegistry swig_types[557] -#define SWIGTYPE_p_iEventOutlet swig_types[558] -#define SWIGTYPE_p_iEventPlug swig_types[559] -#define SWIGTYPE_p_iEventQueue swig_types[560] -#define SWIGTYPE_p_iFactory swig_types[561] -#define SWIGTYPE_p_iFile swig_types[562] -#define SWIGTYPE_p_iFlareHalo swig_types[563] -#define SWIGTYPE_p_iFont swig_types[564] -#define SWIGTYPE_p_iFontDeleteNotify swig_types[565] -#define SWIGTYPE_p_iFontServer swig_types[566] -#define SWIGTYPE_p_iFrustumView swig_types[567] -#define SWIGTYPE_p_iFrustumViewUserdata swig_types[568] -#define SWIGTYPE_p_iGenMeshAnimationControl swig_types[569] -#define SWIGTYPE_p_iGenMeshAnimationControlFactory swig_types[570] -#define SWIGTYPE_p_iGenMeshAnimationControlType swig_types[571] -#define SWIGTYPE_p_iGeneralFactoryState swig_types[572] -#define SWIGTYPE_p_iGeneralMeshCommonState swig_types[573] -#define SWIGTYPE_p_iGeneralMeshState swig_types[574] -#define SWIGTYPE_p_iGeneralMeshSubMesh swig_types[575] -#define SWIGTYPE_p_iGraphics2D swig_types[576] -#define SWIGTYPE_p_iGraphics3D swig_types[577] -#define SWIGTYPE_p_iHalo swig_types[578] -#define SWIGTYPE_p_iImage swig_types[579] -#define SWIGTYPE_p_iImageIO swig_types[580] -#define SWIGTYPE_p_iJoint swig_types[581] -#define SWIGTYPE_p_iJoystickDriver swig_types[582] -#define SWIGTYPE_p_iKeyComposer swig_types[583] -#define SWIGTYPE_p_iKeyboardDriver swig_types[584] -#define SWIGTYPE_p_iLODControl swig_types[585] -#define SWIGTYPE_p_iLight swig_types[586] -#define SWIGTYPE_p_iLightCallback swig_types[587] -#define SWIGTYPE_p_iLightIterator swig_types[588] -#define SWIGTYPE_p_iLightList swig_types[589] -#define SWIGTYPE_p_iLightVisibleCallback swig_types[590] -#define SWIGTYPE_p_iLightingInfo swig_types[591] -#define SWIGTYPE_p_iLightingProcessData swig_types[592] -#define SWIGTYPE_p_iLightingProcessInfo swig_types[593] -#define SWIGTYPE_p_iLoader swig_types[594] -#define SWIGTYPE_p_iLoaderContext swig_types[595] -#define SWIGTYPE_p_iLoaderPlugin swig_types[596] -#define SWIGTYPE_p_iLoaderStatus swig_types[597] -#define SWIGTYPE_p_iMapNode swig_types[598] -#define SWIGTYPE_p_iMaterial swig_types[599] -#define SWIGTYPE_p_iMaterialEngine swig_types[600] -#define SWIGTYPE_p_iMaterialList swig_types[601] -#define SWIGTYPE_p_iMaterialWrapper swig_types[602] -#define SWIGTYPE_p_iMeshDrawCallback swig_types[603] -#define SWIGTYPE_p_iMeshFactoryList swig_types[604] -#define SWIGTYPE_p_iMeshFactoryWrapper swig_types[605] -#define SWIGTYPE_p_iMeshGenerator swig_types[606] -#define SWIGTYPE_p_iMeshList swig_types[607] -#define SWIGTYPE_p_iMeshObject swig_types[608] -#define SWIGTYPE_p_iMeshObjectDrawCallback swig_types[609] -#define SWIGTYPE_p_iMeshObjectFactory swig_types[610] -#define SWIGTYPE_p_iMeshObjectType swig_types[611] -#define SWIGTYPE_p_iMeshWrapper swig_types[612] -#define SWIGTYPE_p_iMeshWrapperIterator swig_types[613] -#define SWIGTYPE_p_iMissingLoaderData swig_types[614] -#define SWIGTYPE_p_iMouseDriver swig_types[615] -#define SWIGTYPE_p_iMovable swig_types[616] -#define SWIGTYPE_p_iMovableListener swig_types[617] -#define SWIGTYPE_p_iMovieRecorder swig_types[618] -#define SWIGTYPE_p_iNativeWindow swig_types[619] -#define SWIGTYPE_p_iNativeWindowManager swig_types[620] -#define SWIGTYPE_p_iNovaHalo swig_types[621] -#define SWIGTYPE_p_iODEAMotorJoint swig_types[622] -#define SWIGTYPE_p_iODEBallJoint swig_types[623] -#define SWIGTYPE_p_iODEDynamicState swig_types[624] -#define SWIGTYPE_p_iODEDynamicSystemState swig_types[625] -#define SWIGTYPE_p_iODEFrameUpdateCallback swig_types[626] -#define SWIGTYPE_p_iODEGeneralJointState swig_types[627] -#define SWIGTYPE_p_iODEHinge2Joint swig_types[628] -#define SWIGTYPE_p_iODEHingeJoint swig_types[629] -#define SWIGTYPE_p_iODEJointState swig_types[630] -#define SWIGTYPE_p_iODESliderJoint swig_types[631] -#define SWIGTYPE_p_iODEUniversalJoint swig_types[632] -#define SWIGTYPE_p_iObject swig_types[633] -#define SWIGTYPE_p_iObjectIterator swig_types[634] -#define SWIGTYPE_p_iObjectModel swig_types[635] -#define SWIGTYPE_p_iObjectModelListener swig_types[636] -#define SWIGTYPE_p_iObjectNameChangeListener swig_types[637] -#define SWIGTYPE_p_iObjectRegistry swig_types[638] -#define SWIGTYPE_p_iObjectRegistryIterator swig_types[639] -#define SWIGTYPE_p_iOffscreenCanvasCallback swig_types[640] -#define SWIGTYPE_p_iParameterESM swig_types[641] -#define SWIGTYPE_p_iParticleBuiltinEffectorFactory swig_types[642] -#define SWIGTYPE_p_iParticleBuiltinEffectorForce swig_types[643] -#define SWIGTYPE_p_iParticleBuiltinEffectorLinColor swig_types[644] -#define SWIGTYPE_p_iParticleBuiltinEmitterBase swig_types[645] -#define SWIGTYPE_p_iParticleBuiltinEmitterBox swig_types[646] -#define SWIGTYPE_p_iParticleBuiltinEmitterCone swig_types[647] -#define SWIGTYPE_p_iParticleBuiltinEmitterCylinder swig_types[648] -#define SWIGTYPE_p_iParticleBuiltinEmitterFactory swig_types[649] -#define SWIGTYPE_p_iParticleBuiltinEmitterSphere swig_types[650] -#define SWIGTYPE_p_iParticleEffector swig_types[651] -#define SWIGTYPE_p_iParticleEmitter swig_types[652] -#define SWIGTYPE_p_iParticleSystem swig_types[653] -#define SWIGTYPE_p_iParticleSystemBase swig_types[654] -#define SWIGTYPE_p_iParticleSystemFactory swig_types[655] -#define SWIGTYPE_p_iPath swig_types[656] -#define SWIGTYPE_p_iPluginIterator swig_types[657] -#define SWIGTYPE_p_iPluginManager swig_types[658] -#define SWIGTYPE_p_iPolygonHandle swig_types[659] -#define SWIGTYPE_p_iPolygonMesh swig_types[660] -#define SWIGTYPE_p_iPortal swig_types[661] -#define SWIGTYPE_p_iPortalCallback swig_types[662] -#define SWIGTYPE_p_iPortalContainer swig_types[663] -#define SWIGTYPE_p_iProgressMeter swig_types[664] -#define SWIGTYPE_p_iRegion swig_types[665] -#define SWIGTYPE_p_iRegionList swig_types[666] -#define SWIGTYPE_p_iRenderBuffer swig_types[667] -#define SWIGTYPE_p_iRenderLoop swig_types[668] -#define SWIGTYPE_p_iRenderLoopManager swig_types[669] -#define SWIGTYPE_p_iRenderView swig_types[670] -#define SWIGTYPE_p_iRendererLightmap swig_types[671] -#define SWIGTYPE_p_iReporter swig_types[672] -#define SWIGTYPE_p_iReporterIterator swig_types[673] -#define SWIGTYPE_p_iReporterListener swig_types[674] -#define SWIGTYPE_p_iRigidBody swig_types[675] -#define SWIGTYPE_p_iSCF swig_types[676] -#define SWIGTYPE_p_iSaver swig_types[677] -#define SWIGTYPE_p_iSceneNode swig_types[678] -#define SWIGTYPE_p_iSceneNodeArray swig_types[679] -#define SWIGTYPE_p_iScript swig_types[680] -#define SWIGTYPE_p_iScriptObject swig_types[681] -#define SWIGTYPE_p_iSector swig_types[682] -#define SWIGTYPE_p_iSectorCallback swig_types[683] -#define SWIGTYPE_p_iSectorIterator swig_types[684] -#define SWIGTYPE_p_iSectorList swig_types[685] -#define SWIGTYPE_p_iSectorMeshCallback swig_types[686] -#define SWIGTYPE_p_iSequence swig_types[687] -#define SWIGTYPE_p_iSequenceManager swig_types[688] -#define SWIGTYPE_p_iSequenceTimedOperation swig_types[689] -#define SWIGTYPE_p_iSequenceTrigger swig_types[690] -#define SWIGTYPE_p_iSequenceWrapper swig_types[691] -#define SWIGTYPE_p_iShader swig_types[692] -#define SWIGTYPE_p_iShaderCompiler swig_types[693] -#define SWIGTYPE_p_iShaderManager swig_types[694] -#define SWIGTYPE_p_iShaderPriorityList swig_types[695] -#define SWIGTYPE_p_iShaderVarStack swig_types[696] -#define SWIGTYPE_p_iShaderVariableAccessor swig_types[697] -#define SWIGTYPE_p_iShaderVariableContext swig_types[698] -#define SWIGTYPE_p_iShadowBlockList swig_types[699] -#define SWIGTYPE_p_iShadowCaster swig_types[700] -#define SWIGTYPE_p_iShadowReceiver swig_types[701] -#define SWIGTYPE_p_iSharedVariable swig_types[702] -#define SWIGTYPE_p_iSharedVariableList swig_types[703] -#define SWIGTYPE_p_iSimpleFormerState swig_types[704] -#define SWIGTYPE_p_iSndSysData swig_types[705] -#define SWIGTYPE_p_iSndSysListener swig_types[706] -#define SWIGTYPE_p_iSndSysLoader swig_types[707] -#define SWIGTYPE_p_iSndSysManager swig_types[708] -#define SWIGTYPE_p_iSndSysRenderer swig_types[709] -#define SWIGTYPE_p_iSndSysRendererCallback swig_types[710] -#define SWIGTYPE_p_iSndSysRendererSoftware swig_types[711] -#define SWIGTYPE_p_iSndSysSoftwareDriver swig_types[712] -#define SWIGTYPE_p_iSndSysSoftwareFilter3D swig_types[713] -#define SWIGTYPE_p_iSndSysSoftwareFilter3DProperties swig_types[714] -#define SWIGTYPE_p_iSndSysSoftwareOutputFilter swig_types[715] -#define SWIGTYPE_p_iSndSysSource swig_types[716] -#define SWIGTYPE_p_iSndSysSourceSoftware swig_types[717] -#define SWIGTYPE_p_iSndSysSourceSoftware3D swig_types[718] -#define SWIGTYPE_p_iSndSysStream swig_types[719] -#define SWIGTYPE_p_iSndSysStreamCallback swig_types[720] -#define SWIGTYPE_p_iSndSysWrapper swig_types[721] -#define SWIGTYPE_p_iSprite2DFactoryState swig_types[722] -#define SWIGTYPE_p_iSprite2DState swig_types[723] -#define SWIGTYPE_p_iSprite2DUVAnimation swig_types[724] -#define SWIGTYPE_p_iSprite2DUVAnimationFrame swig_types[725] -#define SWIGTYPE_p_iSprite3DFactoryState swig_types[726] -#define SWIGTYPE_p_iSprite3DState swig_types[727] -#define SWIGTYPE_p_iSpriteAction swig_types[728] -#define SWIGTYPE_p_iSpriteCal3DFactoryState swig_types[729] -#define SWIGTYPE_p_iSpriteCal3DSocket swig_types[730] -#define SWIGTYPE_p_iSpriteCal3DState swig_types[731] -#define SWIGTYPE_p_iSpriteFrame swig_types[732] -#define SWIGTYPE_p_iSpriteSocket swig_types[733] -#define SWIGTYPE_p_iStandardReporterListener swig_types[734] -#define SWIGTYPE_p_iStreamSource swig_types[735] -#define SWIGTYPE_p_iString swig_types[736] -#define SWIGTYPE_p_iStringArray swig_types[737] -#define SWIGTYPE_p_iStringSet swig_types[738] -#define SWIGTYPE_p_iSuperLightmap swig_types[739] -#define SWIGTYPE_p_iTerraFormer swig_types[740] -#define SWIGTYPE_p_iTerraSampler swig_types[741] -#define SWIGTYPE_p_iTerrainFactoryState swig_types[742] -#define SWIGTYPE_p_iTerrainObjectState swig_types[743] -#define SWIGTYPE_p_iTextureCallback swig_types[744] -#define SWIGTYPE_p_iTextureHandle swig_types[745] -#define SWIGTYPE_p_iTextureList swig_types[746] -#define SWIGTYPE_p_iTextureManager swig_types[747] -#define SWIGTYPE_p_iTextureWrapper swig_types[748] -#define SWIGTYPE_p_iThingEnvironment swig_types[749] -#define SWIGTYPE_p_iThingFactoryState swig_types[750] -#define SWIGTYPE_p_iThingState swig_types[751] -#define SWIGTYPE_p_iVFS swig_types[752] -#define SWIGTYPE_p_iVerbosityManager swig_types[753] -#define SWIGTYPE_p_iView swig_types[754] -#define SWIGTYPE_p_iVirtualClock swig_types[755] -#define SWIGTYPE_p_iVisibilityCuller swig_types[756] -#define SWIGTYPE_p_iVisibilityCullerListener swig_types[757] -#define SWIGTYPE_p_iVisibilityObject swig_types[758] -#define SWIGTYPE_p_iVisibilityObjectIterator swig_types[759] -#define SWIGTYPE_p_int swig_types[760] -#define SWIGTYPE_p_int16_t swig_types[761] -#define SWIGTYPE_p_int32_t swig_types[762] -#define SWIGTYPE_p_int64_t swig_types[763] -#define SWIGTYPE_p_int8_t swig_types[764] -#define SWIGTYPE_p_int_least64_t swig_types[765] -#define SWIGTYPE_p_p__csPyEventHandler swig_types[766] -#define SWIGTYPE_p_p_char swig_types[767] -#define SWIGTYPE_p_p_csImageIOFileFormatDescription swig_types[768] -#define SWIGTYPE_p_p_csOrthoTransform swig_types[769] -#define SWIGTYPE_p_p_csPath swig_types[770] -#define SWIGTYPE_p_p_csRenderMesh swig_types[771] -#define SWIGTYPE_p_p_csReversibleTransform swig_types[772] -#define SWIGTYPE_p_p_csShaderVariable swig_types[773] -#define SWIGTYPE_p_p_csVector3 swig_types[774] -#define SWIGTYPE_p_p_iAnimTimeUpdateHandler swig_types[775] -#define SWIGTYPE_p_p_iArrayChangeAllTcsShaderVariable_p_t swig_types[776] -#define SWIGTYPE_p_p_iArrayChangeAllTcsSprite2DVertex_t swig_types[777] -#define SWIGTYPE_p_p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[778] -#define SWIGTYPE_p_p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[779] -#define SWIGTYPE_p_p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[780] -#define SWIGTYPE_p_p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[781] -#define SWIGTYPE_p_p_iAws swig_types[782] -#define SWIGTYPE_p_p_iAwsComponent swig_types[783] -#define SWIGTYPE_p_p_iAwsComponentFactory swig_types[784] -#define SWIGTYPE_p_p_iAwsComponentNode swig_types[785] -#define SWIGTYPE_p_p_iAwsConnectionKey swig_types[786] -#define SWIGTYPE_p_p_iAwsConnectionNodeFactory swig_types[787] -#define SWIGTYPE_p_p_iAwsFloatKey swig_types[788] -#define SWIGTYPE_p_p_iAwsIntKey swig_types[789] -#define SWIGTYPE_p_p_iAwsKey swig_types[790] -#define SWIGTYPE_p_p_iAwsKeyContainer swig_types[791] -#define SWIGTYPE_p_p_iAwsKeyFactory swig_types[792] -#define SWIGTYPE_p_p_iAwsLayoutManager swig_types[793] -#define SWIGTYPE_p_p_iAwsPointKey swig_types[794] -#define SWIGTYPE_p_p_iAwsPrefManager swig_types[795] -#define SWIGTYPE_p_p_iAwsRGBKey swig_types[796] -#define SWIGTYPE_p_p_iAwsRectKey swig_types[797] -#define SWIGTYPE_p_p_iAwsSink swig_types[798] -#define SWIGTYPE_p_p_iAwsSinkManager swig_types[799] -#define SWIGTYPE_p_p_iAwsSlot swig_types[800] -#define SWIGTYPE_p_p_iAwsSource swig_types[801] -#define SWIGTYPE_p_p_iAwsStringKey swig_types[802] -#define SWIGTYPE_p_p_iBase swig_types[803] -#define SWIGTYPE_p_p_iBinaryLoaderPlugin swig_types[804] -#define SWIGTYPE_p_p_iBodyGroup swig_types[805] -#define SWIGTYPE_p_p_iCacheManager swig_types[806] -#define SWIGTYPE_p_p_iCamera swig_types[807] -#define SWIGTYPE_p_p_iCameraPosition swig_types[808] -#define SWIGTYPE_p_p_iCameraPositionList swig_types[809] -#define SWIGTYPE_p_p_iCameraSectorListener swig_types[810] -#define SWIGTYPE_p_p_iClipper2D swig_types[811] -#define SWIGTYPE_p_p_iCollideSystem swig_types[812] -#define SWIGTYPE_p_p_iCollider swig_types[813] -#define SWIGTYPE_p_p_iColoredVertices swig_types[814] -#define SWIGTYPE_p_p_iCommandLineParser swig_types[815] -#define SWIGTYPE_p_p_iComponent swig_types[816] -#define SWIGTYPE_p_p_iConfigFile swig_types[817] -#define SWIGTYPE_p_p_iConfigIterator swig_types[818] -#define SWIGTYPE_p_p_iConfigManager swig_types[819] -#define SWIGTYPE_p_p_iConsoleOutput swig_types[820] -#define SWIGTYPE_p_p_iConsoleWatcher swig_types[821] -#define SWIGTYPE_p_p_iDataBuffer swig_types[822] -#define SWIGTYPE_p_p_iDebugHelper swig_types[823] -#define SWIGTYPE_p_p_iDocument swig_types[824] -#define SWIGTYPE_p_p_iDocumentAttribute swig_types[825] -#define SWIGTYPE_p_p_iDocumentAttributeIterator swig_types[826] -#define SWIGTYPE_p_p_iDocumentNode swig_types[827] -#define SWIGTYPE_p_p_iDocumentNodeIterator swig_types[828] -#define SWIGTYPE_p_p_iDocumentSystem swig_types[829] -#define SWIGTYPE_p_p_iDynamicSystem swig_types[830] -#define SWIGTYPE_p_p_iDynamics swig_types[831] -#define SWIGTYPE_p_p_iDynamicsColliderCollisionCallback swig_types[832] -#define SWIGTYPE_p_p_iDynamicsCollisionCallback swig_types[833] -#define SWIGTYPE_p_p_iDynamicsMoveCallback swig_types[834] -#define SWIGTYPE_p_p_iDynamicsSystemCollider swig_types[835] -#define SWIGTYPE_p_p_iEngine swig_types[836] -#define SWIGTYPE_p_p_iEngineFrameCallback swig_types[837] -#define SWIGTYPE_p_p_iEngineSectorCallback swig_types[838] -#define SWIGTYPE_p_p_iEngineSequenceManager swig_types[839] -#define SWIGTYPE_p_p_iEngineSequenceParameters swig_types[840] -#define SWIGTYPE_p_p_iEvent swig_types[841] -#define SWIGTYPE_p_p_iEventAttributeIterator swig_types[842] -#define SWIGTYPE_p_p_iEventCord swig_types[843] -#define SWIGTYPE_p_p_iEventHandler swig_types[844] -#define SWIGTYPE_p_p_iEventNameRegistry swig_types[845] -#define SWIGTYPE_p_p_iEventOutlet swig_types[846] -#define SWIGTYPE_p_p_iEventPlug swig_types[847] -#define SWIGTYPE_p_p_iEventQueue swig_types[848] -#define SWIGTYPE_p_p_iFactory swig_types[849] -#define SWIGTYPE_p_p_iFile swig_types[850] -#define SWIGTYPE_p_p_iFont swig_types[851] -#define SWIGTYPE_p_p_iFontDeleteNotify swig_types[852] -#define SWIGTYPE_p_p_iFontServer swig_types[853] -#define SWIGTYPE_p_p_iFrustumView swig_types[854] -#define SWIGTYPE_p_p_iFrustumViewUserdata swig_types[855] -#define SWIGTYPE_p_p_iGenMeshAnimationControl swig_types[856] -#define SWIGTYPE_p_p_iGenMeshAnimationControlFactory swig_types[857] -#define SWIGTYPE_p_p_iGenMeshAnimationControlType swig_types[858] -#define SWIGTYPE_p_p_iGeneralFactoryState swig_types[859] -#define SWIGTYPE_p_p_iGeneralMeshCommonState swig_types[860] -#define SWIGTYPE_p_p_iGeneralMeshState swig_types[861] -#define SWIGTYPE_p_p_iGeneralMeshSubMesh swig_types[862] -#define SWIGTYPE_p_p_iGraphics2D swig_types[863] -#define SWIGTYPE_p_p_iGraphics3D swig_types[864] -#define SWIGTYPE_p_p_iHalo swig_types[865] -#define SWIGTYPE_p_p_iImage swig_types[866] -#define SWIGTYPE_p_p_iImageIO swig_types[867] -#define SWIGTYPE_p_p_iJoint swig_types[868] -#define SWIGTYPE_p_p_iJoystickDriver swig_types[869] -#define SWIGTYPE_p_p_iKeyComposer swig_types[870] -#define SWIGTYPE_p_p_iKeyboardDriver swig_types[871] -#define SWIGTYPE_p_p_iLight swig_types[872] -#define SWIGTYPE_p_p_iLightCallback swig_types[873] -#define SWIGTYPE_p_p_iLightIterator swig_types[874] -#define SWIGTYPE_p_p_iLightList swig_types[875] -#define SWIGTYPE_p_p_iLightVisibleCallback swig_types[876] -#define SWIGTYPE_p_p_iLightingProcessData swig_types[877] -#define SWIGTYPE_p_p_iLightingProcessInfo swig_types[878] -#define SWIGTYPE_p_p_iLoader swig_types[879] -#define SWIGTYPE_p_p_iLoaderPlugin swig_types[880] -#define SWIGTYPE_p_p_iLoaderStatus swig_types[881] -#define SWIGTYPE_p_p_iMapNode swig_types[882] -#define SWIGTYPE_p_p_iMaterial swig_types[883] -#define SWIGTYPE_p_p_iMaterialEngine swig_types[884] -#define SWIGTYPE_p_p_iMaterialList swig_types[885] -#define SWIGTYPE_p_p_iMaterialWrapper swig_types[886] -#define SWIGTYPE_p_p_iMeshDrawCallback swig_types[887] -#define SWIGTYPE_p_p_iMeshFactoryList swig_types[888] -#define SWIGTYPE_p_p_iMeshFactoryWrapper swig_types[889] -#define SWIGTYPE_p_p_iMeshList swig_types[890] -#define SWIGTYPE_p_p_iMeshObject swig_types[891] -#define SWIGTYPE_p_p_iMeshObjectDrawCallback swig_types[892] -#define SWIGTYPE_p_p_iMeshObjectFactory swig_types[893] -#define SWIGTYPE_p_p_iMeshObjectType swig_types[894] -#define SWIGTYPE_p_p_iMeshWrapper swig_types[895] -#define SWIGTYPE_p_p_iMeshWrapperIterator swig_types[896] -#define SWIGTYPE_p_p_iMissingLoaderData swig_types[897] -#define SWIGTYPE_p_p_iMouseDriver swig_types[898] -#define SWIGTYPE_p_p_iMovable swig_types[899] -#define SWIGTYPE_p_p_iMovableListener swig_types[900] -#define SWIGTYPE_p_p_iMovieRecorder swig_types[901] -#define SWIGTYPE_p_p_iNativeWindow swig_types[902] -#define SWIGTYPE_p_p_iNativeWindowManager swig_types[903] -#define SWIGTYPE_p_p_iODEAMotorJoint swig_types[904] -#define SWIGTYPE_p_p_iODEBallJoint swig_types[905] -#define SWIGTYPE_p_p_iODEDynamicState swig_types[906] -#define SWIGTYPE_p_p_iODEDynamicSystemState swig_types[907] -#define SWIGTYPE_p_p_iODEFrameUpdateCallback swig_types[908] -#define SWIGTYPE_p_p_iODEGeneralJointState swig_types[909] -#define SWIGTYPE_p_p_iODEHinge2Joint swig_types[910] -#define SWIGTYPE_p_p_iODEHingeJoint swig_types[911] -#define SWIGTYPE_p_p_iODEJointState swig_types[912] -#define SWIGTYPE_p_p_iODESliderJoint swig_types[913] -#define SWIGTYPE_p_p_iODEUniversalJoint swig_types[914] -#define SWIGTYPE_p_p_iObject swig_types[915] -#define SWIGTYPE_p_p_iObjectIterator swig_types[916] -#define SWIGTYPE_p_p_iObjectModel swig_types[917] -#define SWIGTYPE_p_p_iObjectModelListener swig_types[918] -#define SWIGTYPE_p_p_iObjectNameChangeListener swig_types[919] -#define SWIGTYPE_p_p_iObjectRegistry swig_types[920] -#define SWIGTYPE_p_p_iObjectRegistryIterator swig_types[921] -#define SWIGTYPE_p_p_iOffscreenCanvasCallback swig_types[922] -#define SWIGTYPE_p_p_iParameterESM swig_types[923] -#define SWIGTYPE_p_p_iParticleBuiltinEffectorFactory swig_types[924] -#define SWIGTYPE_p_p_iParticleBuiltinEffectorForce swig_types[925] -#define SWIGTYPE_p_p_iParticleBuiltinEffectorLinColor swig_types[926] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterBase swig_types[927] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterBox swig_types[928] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterCone swig_types[929] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterCylinder swig_types[930] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterFactory swig_types[931] -#define SWIGTYPE_p_p_iParticleBuiltinEmitterSphere swig_types[932] -#define SWIGTYPE_p_p_iParticleEffector swig_types[933] -#define SWIGTYPE_p_p_iParticleEmitter swig_types[934] -#define SWIGTYPE_p_p_iParticleSystem swig_types[935] -#define SWIGTYPE_p_p_iParticleSystemBase swig_types[936] -#define SWIGTYPE_p_p_iParticleSystemFactory swig_types[937] -#define SWIGTYPE_p_p_iPath swig_types[938] -#define SWIGTYPE_p_p_iPluginIterator swig_types[939] -#define SWIGTYPE_p_p_iPluginManager swig_types[940] -#define SWIGTYPE_p_p_iPolygonHandle swig_types[941] -#define SWIGTYPE_p_p_iPolygonMesh swig_types[942] -#define SWIGTYPE_p_p_iPortal swig_types[943] -#define SWIGTYPE_p_p_iPortalCallback swig_types[944] -#define SWIGTYPE_p_p_iPortalContainer swig_types[945] -#define SWIGTYPE_p_p_iRegion swig_types[946] -#define SWIGTYPE_p_p_iRegionList swig_types[947] -#define SWIGTYPE_p_p_iRenderBuffer swig_types[948] -#define SWIGTYPE_p_p_iRendererLightmap swig_types[949] -#define SWIGTYPE_p_p_iReporter swig_types[950] -#define SWIGTYPE_p_p_iReporterIterator swig_types[951] -#define SWIGTYPE_p_p_iReporterListener swig_types[952] -#define SWIGTYPE_p_p_iRigidBody swig_types[953] -#define SWIGTYPE_p_p_iSCF swig_types[954] -#define SWIGTYPE_p_p_iSaver swig_types[955] -#define SWIGTYPE_p_p_iSceneNode swig_types[956] -#define SWIGTYPE_p_p_iScript swig_types[957] -#define SWIGTYPE_p_p_iScriptObject swig_types[958] -#define SWIGTYPE_p_p_iSector swig_types[959] -#define SWIGTYPE_p_p_iSectorCallback swig_types[960] -#define SWIGTYPE_p_p_iSectorIterator swig_types[961] -#define SWIGTYPE_p_p_iSectorList swig_types[962] -#define SWIGTYPE_p_p_iSectorMeshCallback swig_types[963] -#define SWIGTYPE_p_p_iSequenceTimedOperation swig_types[964] -#define SWIGTYPE_p_p_iSequenceTrigger swig_types[965] -#define SWIGTYPE_p_p_iSequenceWrapper swig_types[966] -#define SWIGTYPE_p_p_iShader swig_types[967] -#define SWIGTYPE_p_p_iShaderCompiler swig_types[968] -#define SWIGTYPE_p_p_iShaderManager swig_types[969] -#define SWIGTYPE_p_p_iShaderPriorityList swig_types[970] -#define SWIGTYPE_p_p_iShaderVarStack swig_types[971] -#define SWIGTYPE_p_p_iShaderVariableAccessor swig_types[972] -#define SWIGTYPE_p_p_iShaderVariableContext swig_types[973] -#define SWIGTYPE_p_p_iSimpleFormerState swig_types[974] -#define SWIGTYPE_p_p_iSndSysData swig_types[975] -#define SWIGTYPE_p_p_iSndSysListener swig_types[976] -#define SWIGTYPE_p_p_iSndSysLoader swig_types[977] -#define SWIGTYPE_p_p_iSndSysManager swig_types[978] -#define SWIGTYPE_p_p_iSndSysRenderer swig_types[979] -#define SWIGTYPE_p_p_iSndSysRendererCallback swig_types[980] -#define SWIGTYPE_p_p_iSndSysRendererSoftware swig_types[981] -#define SWIGTYPE_p_p_iSndSysSoftwareDriver swig_types[982] -#define SWIGTYPE_p_p_iSndSysSoftwareFilter3D swig_types[983] -#define SWIGTYPE_p_p_iSndSysSoftwareOutputFilter swig_types[984] -#define SWIGTYPE_p_p_iSndSysSource swig_types[985] -#define SWIGTYPE_p_p_iSndSysSourceSoftware swig_types[986] -#define SWIGTYPE_p_p_iSndSysSourceSoftware3D swig_types[987] -#define SWIGTYPE_p_p_iSndSysStream swig_types[988] -#define SWIGTYPE_p_p_iSndSysStreamCallback swig_types[989] -#define SWIGTYPE_p_p_iSndSysWrapper swig_types[990] -#define SWIGTYPE_p_p_iSprite2DFactoryState swig_types[991] -#define SWIGTYPE_p_p_iSprite2DState swig_types[992] -#define SWIGTYPE_p_p_iSprite2DUVAnimation swig_types[993] -#define SWIGTYPE_p_p_iSprite2DUVAnimationFrame swig_types[994] -#define SWIGTYPE_p_p_iSprite3DFactoryState swig_types[995] -#define SWIGTYPE_p_p_iSprite3DState swig_types[996] -#define SWIGTYPE_p_p_iSpriteAction swig_types[997] -#define SWIGTYPE_p_p_iSpriteCal3DFactoryState swig_types[998] -#define SWIGTYPE_p_p_iSpriteCal3DSocket swig_types[999] -#define SWIGTYPE_p_p_iSpriteCal3DState swig_types[1000] -#define SWIGTYPE_p_p_iSpriteFrame swig_types[1001] -#define SWIGTYPE_p_p_iSpriteSocket swig_types[1002] -#define SWIGTYPE_p_p_iStandardReporterListener swig_types[1003] -#define SWIGTYPE_p_p_iString swig_types[1004] -#define SWIGTYPE_p_p_iStringArray swig_types[1005] -#define SWIGTYPE_p_p_iStringSet swig_types[1006] -#define SWIGTYPE_p_p_iSuperLightmap swig_types[1007] -#define SWIGTYPE_p_p_iTerraFormer swig_types[1008] -#define SWIGTYPE_p_p_iTerraSampler swig_types[1009] -#define SWIGTYPE_p_p_iTerrainFactoryState swig_types[1010] -#define SWIGTYPE_p_p_iTerrainObjectState swig_types[1011] -#define SWIGTYPE_p_p_iTextureCallback swig_types[1012] -#define SWIGTYPE_p_p_iTextureHandle swig_types[1013] -#define SWIGTYPE_p_p_iTextureList swig_types[1014] -#define SWIGTYPE_p_p_iTextureManager swig_types[1015] -#define SWIGTYPE_p_p_iTextureWrapper swig_types[1016] -#define SWIGTYPE_p_p_iThingEnvironment swig_types[1017] -#define SWIGTYPE_p_p_iThingFactoryState swig_types[1018] -#define SWIGTYPE_p_p_iThingState swig_types[1019] -#define SWIGTYPE_p_p_iVFS swig_types[1020] -#define SWIGTYPE_p_p_iView swig_types[1021] -#define SWIGTYPE_p_p_iVirtualClock swig_types[1022] -#define SWIGTYPE_p_p_iVisibilityCuller swig_types[1023] -#define SWIGTYPE_p_p_iVisibilityCullerListener swig_types[1024] -#define SWIGTYPE_p_p_iVisibilityObject swig_types[1025] -#define SWIGTYPE_p_p_iVisibilityObjectIterator swig_types[1026] -#define SWIGTYPE_p_p_scfImplementation1TcsPath_iPath_t swig_types[1027] -#define SWIGTYPE_p_p_void swig_types[1028] -#define SWIGTYPE_p_scfImplementation1TcsPath_iPath_t swig_types[1029] -#define SWIGTYPE_p_size_t swig_types[1030] -#define SWIGTYPE_p_uint16_t swig_types[1031] -#define SWIGTYPE_p_uint32_t swig_types[1032] -#define SWIGTYPE_p_uint64_t swig_types[1033] -#define SWIGTYPE_p_uint8_t swig_types[1034] -#define SWIGTYPE_p_uint_least64_t swig_types[1035] -#define SWIGTYPE_p_unsigned_char swig_types[1036] -#define SWIGTYPE_p_unsigned_int swig_types[1037] -#define SWIGTYPE_p_unsigned_long swig_types[1038] -#define SWIGTYPE_p_utf32_char swig_types[1039] -#define SWIGTYPE_p_void swig_types[1040] -#define SWIGTYPE_p_wchar_t swig_types[1041] -static swig_type_info *swig_types[1043]; -static swig_module_info swig_module = {swig_types, 1042, 0, 0, 0, 0}; +#define SWIGTYPE_p_csRefTiString_t swig_types[169] +#define SWIGTYPE_p_csRenderBufferHolder swig_types[170] +#define SWIGTYPE_p_csRenderBufferName swig_types[171] +#define SWIGTYPE_p_csRenderMesh swig_types[172] +#define SWIGTYPE_p_csRenderMeshList swig_types[173] +#define SWIGTYPE_p_csRenderMeshModes swig_types[174] +#define SWIGTYPE_p_csReporterHelper swig_types[175] +#define SWIGTYPE_p_csReversibleTransform swig_types[176] +#define SWIGTYPE_p_csScreenBoxResult swig_types[177] +#define SWIGTYPE_p_csSectorHitBeamResult swig_types[178] +#define SWIGTYPE_p_csSegment2 swig_types[179] +#define SWIGTYPE_p_csSegment3 swig_types[180] +#define SWIGTYPE_p_csSetTcsPtrKeyTiMeshWrapper_t_CS__Memory__AllocatorMalloc_t swig_types[181] +#define SWIGTYPE_p_csSetTunsigned_long_CS__Memory__AllocatorMalloc_t swig_types[182] +#define SWIGTYPE_p_csShaderMetadata swig_types[183] +#define SWIGTYPE_p_csShaderTagPresence swig_types[184] +#define SWIGTYPE_p_csShaderVariable swig_types[185] +#define SWIGTYPE_p_csSimplePixmap swig_types[186] +#define SWIGTYPE_p_csSimpleRenderMesh swig_types[187] +#define SWIGTYPE_p_csSndSysRendererSoftware swig_types[188] +#define SWIGTYPE_p_csSndSysSoundFormat swig_types[189] +#define SWIGTYPE_p_csSourceParameters3D swig_types[190] +#define SWIGTYPE_p_csSphere swig_types[191] +#define SWIGTYPE_p_csSpline swig_types[192] +#define SWIGTYPE_p_csSprite2DVertex swig_types[193] +#define SWIGTYPE_p_csSpriteCal3DActiveAnim swig_types[194] +#define SWIGTYPE_p_csSquaredDist swig_types[195] +#define SWIGTYPE_p_csStrKey swig_types[196] +#define SWIGTYPE_p_csString swig_types[197] +#define SWIGTYPE_p_csStringArray swig_types[198] +#define SWIGTYPE_p_csStringBase swig_types[199] +#define SWIGTYPE_p_csStringFastT36_t swig_types[200] +#define SWIGTYPE_p_csStringSet swig_types[201] +#define SWIGTYPE_p_csTinyDocumentSystem swig_types[202] +#define SWIGTYPE_p_csTraceBeamResult swig_types[203] +#define SWIGTYPE_p_csTransform swig_types[204] +#define SWIGTYPE_p_csTriangle swig_types[205] +#define SWIGTYPE_p_csVector2 swig_types[206] +#define SWIGTYPE_p_csVector3 swig_types[207] +#define SWIGTYPE_p_csVector3Array swig_types[208] +#define SWIGTYPE_p_csVector4 swig_types[209] +#define SWIGTYPE_p_csVertexAttrib swig_types[210] +#define SWIGTYPE_p_csVertexStatus swig_types[211] +#define SWIGTYPE_p_csView swig_types[212] +#define SWIGTYPE_p_csWrapPtr swig_types[213] +#define SWIGTYPE_p_csXRotMatrix3 swig_types[214] +#define SWIGTYPE_p_csXScaleMatrix3 swig_types[215] +#define SWIGTYPE_p_csYRotMatrix3 swig_types[216] +#define SWIGTYPE_p_csYScaleMatrix3 swig_types[217] +#define SWIGTYPE_p_csZRotMatrix3 swig_types[218] +#define SWIGTYPE_p_csZScaleMatrix3 swig_types[219] +#define SWIGTYPE_p_double swig_types[220] +#define SWIGTYPE_p_f_p_iBase__p__csPyEventHandler swig_types[221] +#define SWIGTYPE_p_f_p_iBase__p_csPath swig_types[222] +#define SWIGTYPE_p_f_p_iBase__p_iAnimTimeUpdateHandler swig_types[223] +#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsShaderVariable_p_t swig_types[224] +#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsSprite2DVertex_t swig_types[225] +#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[226] +#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[227] +#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[228] +#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[229] +#define SWIGTYPE_p_f_p_iBase__p_iAws swig_types[230] +#define SWIGTYPE_p_f_p_iBase__p_iAwsComponent swig_types[231] +#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentFactory swig_types[232] +#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentNode swig_types[233] +#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionKey swig_types[234] +#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionNodeFactory swig_types[235] +#define SWIGTYPE_p_f_p_iBase__p_iAwsFloatKey swig_types[236] +#define SWIGTYPE_p_f_p_iBase__p_iAwsIntKey swig_types[237] +#define SWIGTYPE_p_f_p_iBase__p_iAwsKey swig_types[238] +#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyContainer swig_types[239] +#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyFactory swig_types[240] +#define SWIGTYPE_p_f_p_iBase__p_iAwsLayoutManager swig_types[241] +#define SWIGTYPE_p_f_p_iBase__p_iAwsPointKey swig_types[242] +#define SWIGTYPE_p_f_p_iBase__p_iAwsPrefManager swig_types[243] +#define SWIGTYPE_p_f_p_iBase__p_iAwsRGBKey swig_types[244] +#define SWIGTYPE_p_f_p_iBase__p_iAwsRectKey swig_types[245] +#define SWIGTYPE_p_f_p_iBase__p_iAwsSink swig_types[246] +#define SWIGTYPE_p_f_p_iBase__p_iAwsSinkManager swig_types[247] +#define SWIGTYPE_p_f_p_iBase__p_iAwsSlot swig_types[248] +#define SWIGTYPE_p_f_p_iBase__p_iAwsSource swig_types[249] +#define SWIGTYPE_p_f_p_iBase__p_iAwsStringKey swig_types[250] +#define SWIGTYPE_p_f_p_iBase__p_iBase swig_types[251] +#define SWIGTYPE_p_f_p_iBase__p_iBinaryLoaderPlugin swig_types[252] +#define SWIGTYPE_p_f_p_iBase__p_iBodyGroup swig_types[253] +#define SWIGTYPE_p_f_p_iBase__p_iCacheManager swig_types[254] +#define SWIGTYPE_p_f_p_iBase__p_iCamera swig_types[255] +#define SWIGTYPE_p_f_p_iBase__p_iCameraPosition swig_types[256] +#define SWIGTYPE_p_f_p_iBase__p_iCameraPositionList swig_types[257] +#define SWIGTYPE_p_f_p_iBase__p_iCameraSectorListener swig_types[258] +#define SWIGTYPE_p_f_p_iBase__p_iClipper2D swig_types[259] +#define SWIGTYPE_p_f_p_iBase__p_iCollideSystem swig_types[260] +#define SWIGTYPE_p_f_p_iBase__p_iCollider swig_types[261] +#define SWIGTYPE_p_f_p_iBase__p_iColoredVertices swig_types[262] +#define SWIGTYPE_p_f_p_iBase__p_iCommandLineParser swig_types[263] +#define SWIGTYPE_p_f_p_iBase__p_iComponent swig_types[264] +#define SWIGTYPE_p_f_p_iBase__p_iConfigFile swig_types[265] +#define SWIGTYPE_p_f_p_iBase__p_iConfigIterator swig_types[266] +#define SWIGTYPE_p_f_p_iBase__p_iConfigManager swig_types[267] +#define SWIGTYPE_p_f_p_iBase__p_iConsoleOutput swig_types[268] +#define SWIGTYPE_p_f_p_iBase__p_iConsoleWatcher swig_types[269] +#define SWIGTYPE_p_f_p_iBase__p_iDataBuffer swig_types[270] +#define SWIGTYPE_p_f_p_iBase__p_iDebugHelper swig_types[271] +#define SWIGTYPE_p_f_p_iBase__p_iDocument swig_types[272] +#define SWIGTYPE_p_f_p_iBase__p_iDocumentAttribute swig_types[273] +#define SWIGTYPE_p_f_p_iBase__p_iDocumentAttributeIterator swig_types[274] +#define SWIGTYPE_p_f_p_iBase__p_iDocumentNode swig_types[275] +#define SWIGTYPE_p_f_p_iBase__p_iDocumentNodeIterator swig_types[276] +#define SWIGTYPE_p_f_p_iBase__p_iDocumentSystem swig_types[277] +#define SWIGTYPE_p_f_p_iBase__p_iDynamicSystem swig_types[278] +#define SWIGTYPE_p_f_p_iBase__p_iDynamics swig_types[279] +#define SWIGTYPE_p_f_p_iBase__p_iDynamicsColliderCollisionCallback swig_types[280] +#define SWIGTYPE_p_f_p_iBase__p_iDynamicsCollisionCallback swig_types[281] +#define SWIGTYPE_p_f_p_iBase__p_iDynamicsMoveCallback swig_types[282] +#define SWIGTYPE_p_f_p_iBase__p_iDynamicsSystemCollider swig_types[283] +#define SWIGTYPE_p_f_p_iBase__p_iEngine swig_types[284] +#define SWIGTYPE_p_f_p_iBase__p_iEngineFrameCallback swig_types[285] +#define SWIGTYPE_p_f_p_iBase__p_iEngineSectorCallback swig_types[286] +#define SWIGTYPE_p_f_p_iBase__p_iEngineSequenceManager swig_types[287] +#define SWIGTYPE_p_f_p_iBase__p_iEngineSequenceParameters swig_types[288] +#define SWIGTYPE_p_f_p_iBase__p_iEvent swig_types[289] +#define SWIGTYPE_p_f_p_iBase__p_iEventAttributeIterator swig_types[290] ... [truncated message content] |