[PlaneShift-svn] SF.net SVN: planeshift:[4780] trunk/src/client

[<ken...@us...>]

Revision: 4780
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4780&view=rev
Author:   kennygraunke
Date:     2009-11-24 01:27:27 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
Remove some seemingly unused nullmesh code.

Modified Paths:
--------------
    trunk/src/client/bgloader/loader.cpp
    trunk/src/client/pscelclient.cpp
    trunk/src/client/pscelclient.h

Modified: trunk/src/client/bgloader/loader.cpp
===================================================================
--- trunk/src/client/bgloader/loader.cpp	2009-11-23 21:34:19 UTC (rev 4779)
+++ trunk/src/client/bgloader/loader.cpp	2009-11-24 01:27:27 UTC (rev 4780)
@@ -824,7 +824,7 @@
                                     csString msg;
                                     msg.Format("Invalid submesh reference '%s' in meshobj '%s' in sector '%s'", submesh->GetAttributeValue("name"),
                                         m->name.GetData(), s->name.GetData());
-                                    CS_ASSERT_MSG(msg.GetData(), false);
+                                    //CS_ASSERT_MSG(msg.GetData(), false);
                                 }
                             }
                         }

Modified: trunk/src/client/pscelclient.cpp
===================================================================
--- trunk/src/client/pscelclient.cpp	2009-11-23 21:34:19 UTC (rev 4779)
+++ trunk/src/client/pscelclient.cpp	2009-11-24 01:27:27 UTC (rev 4780)
@@ -179,13 +179,6 @@
 
     unresSector = psengine->GetEngine()->CreateSector("SectorWhereWeKeepEntitiesResidingInUnloadedMaps");
 
-    // Init nullmesh factory.
-    nullfact = psengine->GetEngine()->CreateMeshFactory("crystalspace.mesh.object.null", "nullmesh");
-    csRef<iNullFactoryState> nullstate = scfQueryInterface<iNullFactoryState> (nullfact->GetMeshObjectFactory());
-    csBox3 bbox;
-    bbox.AddBoundingVertex(csVector3(0.0f));
-    nullstate->SetBoundingBox(bbox);
-
     LoadEffectItems();
 
     return true;

Modified: trunk/src/client/pscelclient.h
===================================================================
--- trunk/src/client/pscelclient.h	2009-11-23 21:34:19 UTC (rev 4779)
+++ trunk/src/client/pscelclient.h	2009-11-24 01:27:27 UTC (rev 4780)
@@ -253,14 +253,6 @@
      */
     void AddInstanceObject(const char* name, csRef<InstanceObject> object);
 
-    /**
-     * Returns the nullmesh factory.
-     */
-    iMeshFactoryWrapper* GetNullFact() const
-    {
-        return nullfact;
-    }
-
 protected:
     /** Finds given entity in list of unresolved entities */
     csList<UnresolvedPos*>::Iterator FindUnresolvedPos(GEMClientObject * entity);


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