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

From Brede Johansen, added support for PolygonMode into .ive format.

Browse Source
This commit is contained in:
Robert Osfield
2005-10-06 15:43:29 +00:00
parent 449333b5d3
commit 808511468b
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
VisualStudio/osgPlugins/ive/ive.dsp
View File

@@ -304,6 +304,10 @@ SOURCE=..\..\..\src\osgPlugins\ive\Point.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgPlugins\ive\PolygonMode.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgPlugins\ive\PolygonOffset.cpp
# End Source File
# Begin Source File
@@ -640,6 +644,10 @@ SOURCE=..\..\..\src\osgPlugins\ive\Point.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgPlugins\ive\PolygonMode.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgPlugins\ive\PolygonOffset.h
# End Source File
# Begin Source File

8
src/osgPlugins/ive/DataInputStream.cpp
View File

@@ -23,7 +23,7 @@
#include "CullFace.h"
#include "ClipPlane.h"
#include "PolygonOffset.h"
//#include "PolygonMode.h"
#include "PolygonMode.h"
#include "ShadeModel.h"
#include "Point.h"
#include "LineWidth.h"
@@ -840,10 +840,10 @@ osg::StateAttribute* DataInputStream::readStateAttribute()
attribute = new osg::PolygonOffset();
((ive::PolygonOffset*)(attribute))->read(this);
}
/* else if(attributeID == IVEPOLYGONMODE){
else if(attributeID == IVEPOLYGONMODE){
attribute = new osg::PolygonMode();
((ive::PolygonMode*)(attribute))->read(this);
}*/
}
else if(attributeID == IVESHADEMODEL){
attribute = new osg::ShadeModel();
((ive::ShadeModel*)(attribute))->read(this);
@@ -1180,3 +1180,5 @@ osg::Node* DataInputStream::readNode()
return node;
}

6
src/osgPlugins/ive/DataOutputStream.cpp
View File

@@ -24,7 +24,7 @@
#include "CullFace.h"
#include "ClipPlane.h"
#include "PolygonOffset.h"
//#include "PolygonMode.h"
#include "PolygonMode.h"
#include "ShadeModel.h"
#include "Point.h"
#include "LineWidth.h"
@@ -662,10 +662,10 @@ void DataOutputStream::writeStateAttribute(const osg::StateAttribute* attribute)
else if(dynamic_cast<const osg::PolygonOffset*>(attribute)){
((ive::PolygonOffset*)(attribute))->write(this);
}
/* // This is a PolygonMode
// This is a PolygonMode
else if(dynamic_cast<const osg::PolygonMode*>(attribute)){
((ive::PolygonMode*)(attribute))->write(this);
}*/
}
else if(dynamic_cast<const osg::ShadeModel*>(attribute)){
((ive::ShadeModel*)(attribute))->write(this);
}

1
src/osgPlugins/ive/GNUmakefile
View File

@@ -54,6 +54,7 @@ CXXFILES =\
OccluderNode.cpp\
PagedLOD.cpp\
Point.cpp\
PolygonMode.cpp\
PolygonOffset.cpp\
PositionAttitudeTransform.cpp\
PrimitiveSet.cpp\

1
src/osgPlugins/ive/ReadWrite.h
View File

@@ -69,6 +69,7 @@ namespace ive {
#define IVEUNIFORM 0x00001126
#define IVEVIEWPORT 0x00001127
#define IVESCISSOR 0x00001128
#define IVEPOLYGONMODE 0x00001129
// Drawables
#define IVEDRAWABLE 0x00001000