FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to build in VS7.0

Browse Source
This commit is contained in:
Robert Osfield 2002-11-08 15:56:49 +00:00
parent 184e432407
commit 4617294722
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgPlugins/geo/ReaderWriterGEO.cpp
View File

@ -714,12 +714,12 @@ class ReaderWriterGEO : public ReaderWriter
break; break;
case DB_DSK_HEADER: // attach to previous case DB_DSK_HEADER: // attach to previous
curparent= &(*itr); curparent= &(*itr);
sorted.push_back(itr); sorted.push_back(&(*itr));
break; break;
case DB_DSK_INTERNAL_VARS: // attach to parent case DB_DSK_INTERNAL_VARS: // attach to parent
case DB_DSK_LOCAL_VARS: case DB_DSK_LOCAL_VARS:
case DB_DSK_EXTERNAL_VARS: case DB_DSK_EXTERNAL_VARS:
(curparent)->addBehaviourRecord((itr)); (curparent)->addBehaviourRecord(&(*itr));
break; break;
case DB_DSK_FLOAT_VAR: // attach to parent case DB_DSK_FLOAT_VAR: // attach to parent
case DB_DSK_INT_VAR: case DB_DSK_INT_VAR:
@ -730,13 +730,13 @@ class ReaderWriterGEO : public ReaderWriter
case DB_DSK_FLOAT3_VAR: case DB_DSK_FLOAT3_VAR:
case DB_DSK_FLOAT4_VAR: case DB_DSK_FLOAT4_VAR:
// else if ((*itr).isVar(): // else if ((*itr).isVar():
(curparent)->addBehaviourRecord((itr)); (curparent)->addBehaviourRecord(&(*itr));
break; break;
case DB_DSK_TEXTURE: // attach to parent case DB_DSK_TEXTURE: // attach to parent
geotxlist.push_back(itr); geotxlist.push_back(&(*itr));
break; break;
case DB_DSK_MATERIAL: // attach to parent case DB_DSK_MATERIAL: // attach to parent
geomatlist.push_back(itr); geomatlist.push_back(&(*itr));
break; break;
case DB_DSK_VIEW: // not needed for Real Time case DB_DSK_VIEW: // not needed for Real Time
break; break;
@ -795,12 +795,12 @@ class ReaderWriterGEO : public ReaderWriter
case DB_DSK_ABS_ACTION: case DB_DSK_ABS_ACTION:
case DB_DSK_IF_THEN_ELSE_ACTION: case DB_DSK_IF_THEN_ELSE_ACTION:
case DB_DSK_DCS_ACTION: case DB_DSK_DCS_ACTION:
(curparent->getLastChild())->addBehaviourRecord((itr)); (curparent->getLastChild())->addBehaviourRecord(&(*itr));
break; break;
default: default:
if (curparent) { if (curparent) {
(*itr).setparent(curparent); (*itr).setparent(curparent);
curparent->addchild(itr); curparent->addchild(&(*itr));
} }
break; break;
} }

4
src/osgPlugins/lwo/Lwo2Layer.cpp
View File

@ -106,7 +106,8 @@ Lwo2Layer::GenerateGeode( Geode& geode, short tags_count, DrawableToTagMapping&
// selecting polygons for current layer only // selecting polygons for current layer only
int polygon_index = 0; int polygon_index = 0;
PolygonsList polygons; PolygonsList polygons;
for (IteratorPolygonsList polygon_iterator = _polygons.begin(); polygon_iterator != _polygons.end(); polygon_iterator++, polygon_index++) IteratorPolygonsList polygon_iterator;
for (polygon_iterator = _polygons.begin(); polygon_iterator != _polygons.end(); polygon_iterator++, polygon_index++)
{ {
// *polygon_iterator it's a PolygonsList // *polygon_iterator it's a PolygonsList
@ -135,7 +136,6 @@ Lwo2Layer::GenerateGeode( Geode& geode, short tags_count, DrawableToTagMapping&
// polygons of current layer // polygons of current layer
polygon_index = 0; polygon_index = 0;
IteratorPolygonsList polygon_iterator;
for (polygon_iterator = polygons.begin(); polygon_iterator != polygons.end(); polygon_iterator++, polygon_index++) for (polygon_iterator = polygons.begin(); polygon_iterator != polygons.end(); polygon_iterator++, polygon_index++)
{ {
if ((*polygon_iterator)[0].point_index != -1) if ((*polygon_iterator)[0].point_index != -1)