diff --git a/src/osgDB/SharedStateManager.cpp b/src/osgDB/SharedStateManager.cpp index d86dd5cc9..59419a561 100644 --- a/src/osgDB/SharedStateManager.cpp +++ b/src/osgDB/SharedStateManager.cpp @@ -51,8 +51,8 @@ void SharedStateManager::prune() //---------------------------------------------------------------- void SharedStateManager::share(osg::Node *node, OpenThreads::Mutex *mt) { - const osg::Timer& timer = *osg::Timer::instance(); - osg::Timer_t start_tick = timer.tick(); +// const osg::Timer& timer = *osg::Timer::instance(); +// osg::Timer_t start_tick = timer.tick(); mutex = mt; apply(*node); @@ -60,7 +60,7 @@ void SharedStateManager::share(osg::Node *node, OpenThreads::Mutex *mt) tmpSharedStateSetList.clear(); mutex = 0; - osg::Timer_t end_tick = timer.tick(); +// osg::Timer_t end_tick = timer.tick(); // std::cout << "SHARING TIME = "<=static_cast(verts.size()) || i2>=static_cast(verts.size()) || i3>=static_cast(verts.size())) { - printf("Invalid indices %d, %d, %d max allowed %d.\n", i1,i2,i3,verts.size());//, errm + printf("Invalid indices %d, %d, %d max allowed %d.\n", i1,i2,i3,static_cast(verts.size()));//, errm } s1=(verts[i2]-verts[i1]); // side 1 of face s2=(verts[i3]-verts[i2]); // side 2 of face @@ -493,7 +493,7 @@ void CALLBACK combineCallback( GLdouble coords[3], avertex *d[4], void CALLBACK error (GLenum errno) { // tess error code const unsigned char *errm=gluErrorString(errno); - printf("tesselator error %d %s\n", errno,errm);//, errm + printf("tesselator error %d %s\n", static_cast(errno),errm);//, errm } //========== void _face::linkholes(const std::vector verts, const dwmaterial *themat, const _face *f2) const diff --git a/src/osgPlugins/obj/ReaderWriterOBJ.cpp b/src/osgPlugins/obj/ReaderWriterOBJ.cpp index 00978120d..4d5d344df 100644 --- a/src/osgPlugins/obj/ReaderWriterOBJ.cpp +++ b/src/osgPlugins/obj/ReaderWriterOBJ.cpp @@ -323,7 +323,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterOBJ::readNode(const std::string& fil // toplevel group or transform osg::Group* osg_top = NULL; - if (obj->position[0] != 0.0f || obj->position[2] != 0.0f || obj->position[2] != 0.0f) { + if (obj->position[0] != 0.0f || obj->position[1] != 0.0f || obj->position[2] != 0.0f) { osg::MatrixTransform* xform = new osg::MatrixTransform; // note obj_x -> osg_x, // obj_y -> osg_z, diff --git a/src/osgPlugins/osgSim/IO_DOFTransform.cpp b/src/osgPlugins/osgSim/IO_DOFTransform.cpp index b5e2047ea..afd3919cf 100644 --- a/src/osgPlugins/osgSim/IO_DOFTransform.cpp +++ b/src/osgPlugins/osgSim/IO_DOFTransform.cpp @@ -125,7 +125,16 @@ bool DOFTransform_writeLocalData(const Object& obj, Output& fw) { const DOFTransform& transform = static_cast(obj); - fw.indent()<<"PutMatrix "<