Revision: 8344
http://playerstage.svn.sourceforge.net/playerstage/?rev=8344&view=rev
Author: natepak
Date: 2009-10-30 15:06:10 +0000 (Fri, 30 Oct 2009)
Log Message:
-----------
Added willowgarage.dae and an error message to Trimesh geom
Modified Paths:
--------------
code/gazebo/trunk/Media/models/CMakeLists.txt
code/gazebo/trunk/server/physics/TrimeshGeom.cc
Modified: code/gazebo/trunk/Media/models/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/Media/models/CMakeLists.txt 2009-10-30 14:40:08 UTC
(rev 8343)
+++ code/gazebo/trunk/Media/models/CMakeLists.txt 2009-10-30 15:06:10 UTC
(rev 8344)
@@ -19,6 +19,7 @@
unitpyramid.mesh
wheel.mesh
WoodPallet.mesh
+ willowgarage.dae
)
INSTALL(FILES ${files} DESTINATION
${CMAKE_INSTALL_PREFIX}/share/gazebo/Media/models)
Modified: code/gazebo/trunk/server/physics/TrimeshGeom.cc
===================================================================
--- code/gazebo/trunk/server/physics/TrimeshGeom.cc 2009-10-30 14:40:08 UTC
(rev 8343)
+++ code/gazebo/trunk/server/physics/TrimeshGeom.cc 2009-10-30 15:06:10 UTC
(rev 8344)
@@ -98,15 +98,15 @@
{
MeshManager *meshManager = MeshManager::Instance();
- unsigned int numVertices = 0;
- unsigned int numIndices = 0;
float *vertices = NULL;
unsigned int *indices = NULL;
this->meshNameP->Load(node);
this->scaleP->Load(node);
- const Mesh *mesh = meshManager->Load( this->meshNameP->GetValue() );
+ const Mesh *mesh = meshManager->Load( **this->meshNameP );
+ if (!mesh)
+ gzthrow("Invalid mesh");
mesh->FillArrays(&vertices, &indices);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
