Planeshift: a 3D MMORPG

Revision: 4340
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4340&view=rev
Author:   mgist
Date:     2009-09-09 18:56:09 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
- Fixes for shader change.

Modified Paths:
--------------
    trunk/src/client/charapp.cpp
    trunk/src/client/charapp.h
    trunk/src/client/psclientchar.cpp
    trunk/src/client/psclientchar.h

Modified: trunk/src/client/charapp.cpp
===================================================================

--- trunk/src/client/charapp.cpp	2009-09-09 17:11:23 UTC (rev 4339)
+++ trunk/src/client/charapp.cpp	2009-09-09 18:56:09 UTC (rev 4340)
@@ -259,7 +259,7 @@
 }
 
 
-void psCharAppearance::HairColor(csVector3& color)
+void psCharAppearance::HairColor(csVector4& color)
 {
     if ( hairMesh.Length() == 0 )
     {
@@ -321,7 +321,7 @@
     }
 }
 
-void psCharAppearance::EyeColor(csVector3& color)
+void psCharAppearance::EyeColor(csVector4& color)
 {
     eyeShader = color;
     iShaderVariableContext* context_eyes;
@@ -625,26 +625,54 @@
 void psCharAppearance::DefaultMesh(const char* part)
 {
     const char * defaultPart = NULL;
-    /* First we detach every mesh that match the partPattern */
-    for (int idx=0; idx < stateFactory->GetMeshCount(); idx++)
+
+    if(stateFactory && state)
     {
-        const char * meshName = stateFactory->GetMeshName( idx );
-        if (strstr(meshName, part))
+        /* First we detach every mesh that match the partPattern */
+        for (int idx=0; idx < stateFactory->GetMeshCount(); idx++)
         {
-            state->DetachCoreMesh( meshName );
-            if (stateFactory->IsMeshDefault(idx))
+            const char * meshName = stateFactory->GetMeshName( idx );
+            if (strstr(meshName, part))
             {
-                defaultPart = meshName;
+                state->DetachCoreMesh( meshName );
+                if (stateFactory->IsMeshDefault(idx))
+                {
+                    defaultPart = meshName;
+                }
             }
         }
+
+        if (!defaultPart)
+        {
+            return;
+        }
+
+        state->AttachCoreMesh( defaultPart );
     }
+    else if(animeshFactory && animeshObject)
+    {
+        if (!defaultPart)
+        {
+            return;
+        }
 
-    if (!defaultPart)
-    {
-        return;
+        for ( size_t idx=0; idx < animeshFactory->GetSubMeshCount(); idx++)
+        {
+            const char* meshName = animeshFactory->GetSubMesh(idx)->GetName();
+            if(meshName)
+            {
+                if (strstr(meshName, part))
+                {
+                    animeshObject->GetSubMesh(idx)->SetRendering(false);
+                }
+
+                if (!strcmp(meshName, defaultPart))
+                {
+                    animeshObject->GetSubMesh(idx)->SetRendering(true);
+                }
+            }
+        }
     }
-
-    state->AttachCoreMesh( defaultPart );
 }
 
 
@@ -689,22 +717,51 @@
 {
     csString newPartParsed = ParseStrings(partPattern, newPart);
 
-    // If the new mesh cannot be found then do nothing.
-    int newMeshAvailable = stateFactory->FindMeshName(newPartParsed);
-    if ( newMeshAvailable == -1 )
-        return false;
+    if(stateFactory && state)
+    {
+        // If the new mesh cannot be found then do nothing.
+        int newMeshAvailable = stateFactory->FindMeshName(newPartParsed);
+        if ( newMeshAvailable == -1 )
+            return false;
 
-    /* First we detach every mesh that match the partPattern */
-    for (int idx=0; idx < stateFactory->GetMeshCount(); idx++)
+        /* First we detach every mesh that match the partPattern */
+        for (int idx=0; idx < stateFactory->GetMeshCount(); idx++)
+        {
+            const char * meshName = stateFactory->GetMeshName( idx );
+            if (strstr(meshName,partPattern))
+            {
+                state->DetachCoreMesh( meshName );
+            }
+        }
+
+        state->AttachCoreMesh( newPartParsed.GetData() );
+    }
+    else if(animeshFactory && animeshObject)
     {
-        const char * meshName = stateFactory->GetMeshName( idx );
-        if (strstr(meshName,partPattern))
+        // If the new mesh cannot be found then do nothing.
+        size_t newMeshAvailable = animeshFactory->FindSubMesh(newPartParsed);
+        if ( newMeshAvailable == (size_t)-1 )
+            return false;
+
+        /* First we detach every mesh that match the partPattern */
+        for ( size_t idx=0; idx < animeshFactory->GetSubMeshCount(); idx++)
         {
-            state->DetachCoreMesh( meshName );
+            const char* meshName = animeshFactory->GetSubMesh(idx)->GetName();
+            if(meshName)
+            {
+                if (strstr(meshName, partPattern))
+                {
+                    animeshObject->GetSubMesh(idx)->SetRendering(false);
+                }
+
+                if (!strcmp(meshName, newPartParsed))
+                {
+                    animeshObject->GetSubMesh(idx)->SetRendering(true);
+                }
+            }
         }
     }
 
-    state->AttachCoreMesh( newPartParsed.GetData() );
     return true;
 }
 

Modified: trunk/src/client/charapp.h
===================================================================
--- trunk/src/client/charapp.h	2009-09-09 17:11:23 UTC (rev 4339)
+++ trunk/src/client/charapp.h	2009-09-09 18:56:09 UTC (rev 4340)
@@ -92,14 +92,14 @@
     void BeardMesh(csString& submesh);
     
     /** Set the colour of the hair.
-      * @param shader the R,G,B value of the shader to use on the hair.
+      * @param shader the R,G,B,A value of the shader to use on the hair.
       */
-    void HairColor(csVector3 &shader);
+    void HairColor(csVector4 &shader);
 
     /** Set the colour of the eyes.
-     * @param shader the R,G,B value of the shader to use on the eyes.
+     * @param shader the R,G,B,A value of the shader to use on the eyes.
      */
-    void EyeColor(csVector3 &shader);
+    void EyeColor(csVector4 &shader);
     
     /** Toggle the hair mesh on and off.
       * @param flag True if we want to show the hair. False if we want to hide it.
@@ -256,8 +256,8 @@
     csString hairMesh;                                  ///< Default hair mesh.
     csString beardMesh;                                 ///< Beard mesh.
     
-    csVector3 eyeShader;                                ///< Default eye colour.
-    csVector3 hairShader;                               ///< Default hair colour.
+    csVector4 eyeShader;                                ///< Default eye colour.
+    csVector4 hairShader;                               ///< Default hair colour.
     
     bool hairAttached;                                  ///< Flag if hair is on/off                        
     bool beardAttached;                                 ///< Flag if beard is on/off.

Modified: trunk/src/client/psclientchar.cpp
===================================================================
--- trunk/src/client/psclientchar.cpp	2009-09-09 17:11:23 UTC (rev 4339)
+++ trunk/src/client/psclientchar.cpp	2009-09-09 18:56:09 UTC (rev 4340)
@@ -82,9 +82,14 @@
     location             = ConvertTraitLocationString(node->GetAttributeValue( "loc" ));
     csString shaderColours = node->GetAttributeValue("shader");
     if ( shaderColours.Length() > 0 )
+    {
         sscanf( shaderColours.GetData(), "%f,%f,%f", &shader.x, &shader.y, &shader.z );
+        shader.w = 1.0f;
+    }
     else
-        shader = csVector3(0,0,0);
+    {
+        shader = csVector4(0,0,0);
+    }
 
     material = psengine->FindCommonString(cstr_id_material);
     mesh = psengine->FindCommonString(cstr_id_mesh);

Modified: trunk/src/client/psclientchar.h
===================================================================
--- trunk/src/client/psclientchar.h	2009-09-09 17:11:23 UTC (rev 4339)
+++ trunk/src/client/psclientchar.h	2009-09-09 18:56:09 UTC (rev 4340)
@@ -71,7 +71,7 @@
     csString mesh;
     csString material;
     csString subMesh;
-    csVector3 shader;   ///< The shader colour set for this trait. 
+    csVector4 shader;   ///< The shader colour set for this trait. 
 };
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (35)
2002	Jan (354)	Feb (363)	Mar (542)	Apr (494)	May (232)	Jun (349)	Jul (221)	Aug (154)	Sep (124)	Oct (89)	Nov (121)	Dec (133)
2003	Jan (279)	Feb (490)	Mar (448)	Apr (295)	May (151)	Jun (209)	Jul (367)	Aug (371)	Sep (284)	Oct (492)	Nov (540)	Dec (240)
2004	Jan (381)	Feb (497)	Mar (556)	Apr (394)	May (332)	Jun (263)	Jul (533)	Aug (348)	Sep (398)	Oct (520)	Nov (511)	Dec (703)
2005	Jan (700)	Feb (354)	Mar (456)	Apr (300)	May (444)	Jun (405)	Jul (312)	Aug (480)	Sep (302)	Oct (660)	Nov (448)	Dec (658)
2006	Jan (543)	Feb (313)	Mar (293)	Apr (293)	May (244)	Jun (256)	Jul (257)	Aug (194)	Sep (64)	Oct (174)	Nov (340)	Dec (250)
2007	Jan (281)	Feb (350)	Mar (245)	Apr (348)	May (262)	Jun (188)	Jul (233)	Aug (303)	Sep (426)	Oct (470)	Nov (181)	Dec (242)
2008	Jan (176)	Feb (268)	Mar (253)	Apr (136)	May (198)	Jun (207)	Jul (134)	Aug (166)	Sep (65)	Oct (113)	Nov (248)	Dec (222)
2009	Jan (170)	Feb (163)	Mar (247)	Apr (225)	May (202)	Jun (84)	Jul (281)	Aug (138)	Sep (292)	Oct (118)	Nov (140)	Dec (278)
2010	Jan (304)	Feb (219)	Mar (110)	Apr (88)	May (94)	Jun (53)	Jul (74)	Aug (98)	Sep (63)	Oct (90)	Nov (134)	Dec (216)
2011	Jan (166)	Feb (179)	Mar (94)	Apr (82)	May (140)	Jun (141)	Jul (92)	Aug (56)	Sep (35)	Oct (38)	Nov (75)	Dec (187)
2012	Jan (96)	Feb (49)	Mar (36)	Apr (111)	May (87)	Jun (28)	Jul (40)	Aug (15)	Sep (28)	Oct (23)	Nov (18)	Dec (32)
2013	Jan (44)	Feb (53)	Mar (32)	Apr (46)	May (16)	Jun (10)	Jul (19)	Aug (31)	Sep (55)	Oct (110)	Nov (105)	Dec (108)
2014	Jan (76)	Feb (70)	Mar (59)	Apr (125)	May (28)	Jun (9)	Jul (10)	Aug (20)	Sep (34)	Oct (52)	Nov (29)	Dec (17)
2015	Jan (18)	Feb (17)	Mar (17)	Apr	May (1)	Jun (8)	Jul (6)	Aug (3)	Sep	Oct	Nov (1)	Dec (2)
2016	Jan (10)	Feb (42)	Mar (65)	Apr (44)	May (23)	Jun (9)	Jul (4)	Aug (3)	Sep (1)	Oct	Nov (3)	Dec (24)
2017	Jan (5)	Feb	Mar	Apr	May	Jun (1)	Jul (3)	Aug (1)	Sep	Oct	Nov	Dec
2018	Jan	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
		1 (5)	2 (2)	3 (3)	4 (1)	5 (10)
6 (4)	7 (2)	8 (10)	9 (4)	10 (5)	11 (4)	12 (2)
13	14 (8)	15 (40)	16 (11)	17	18 (34)	19 (6)
20 (13)	21 (8)	22 (19)	23 (22)	24 (23)	25 (9)	26 (4)
27 (31)	28 (8)	29 (3)	30 (1)

Thanks for helping keep SourceForge clean.

Planeshift: a 3D MMORPG

Status: Beta

Brought to you by: acraig, lpancallo, weltall2

planeshift-cvs — This list sends infos about cvs updates