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

Updated change log.

Browse Source 
From Fredric Marmond, changed unsigned int to unsigned long to avoid compile errors under 64 bit compile.
This commit is contained in:
Robert Osfield
2005-05-25 15:35:51 +00:00
parent 55d170d4fd
commit 2b08f729f3
3 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
ChangeLog
View File

@@ -1,3 +1,61 @@
2005-05-25 12:45 robert
* NEWS.txt, doc/Doxyfiles/core_Doxyfile,
include/osgIntrospection/Export,
src/osgWrappers/osgTerrain/DataSet.cpp: Updated doxgen docs.
2005-05-25 10:50 robert
* include/osg/Image, src/osg/Texture.cpp,
src/osg/TextureRectangle.cpp: Changd unsigned int's to unsigned
char* to fix gcc3.4 64 bit issues.
2005-05-25 10:48 robert
* NEWS.txt: Updated NEWS
2005-05-24 21:45 robert
* NEWS.txt: Updated NEWS
2005-05-24 19:57 robert
* include/: osg/Export, osgDB/Export, osgGA/Export,
osgParticle/Export, osgProducer/Export, osgSim/Export,
osgTerrain/Export, osgText/Export, osgUtil/Export: Added pragma
to remove warnings under VS.8.0
2005-05-24 16:34 robert
* include/osgTerrain/DataSet, include/osgUtil/RenderBin,
include/osgUtil/RenderStage, src/osgUtil/RenderBin.cpp,
src/osgUtil/RenderStage.cpp,
src/osgWrappers/osgUtil/RenderBin.cpp,
src/osgWrappers/osgUtil/RenderStage.cpp: Updates to clean up
wrapper generation, and to update wrappers
2005-05-24 16:23 robert
* src/osgPlugins/ive/: ConvexPlanarOccluder.h,
ConvexPlanarPolygon.h, CoordinateSystemNode.h, EllipsoidModel.h,
Impostor.h, MultiSwitch.h, OccluderNode.h, Switch.h: Did a
dos2unix on all files
2005-05-24 11:46 robert
* src/osgDB/DatabasePager.cpp: Added check for an empty compile
lists.
2005-05-24 11:37 robert
* src/osgPlugins/flt/: ReaderWriterFLT.cpp, ReaderWriterFLT.h:
Added re-entrent mutex to serialize access to OpenFlight plugin
to prevent any multi-threaded issues.
2005-05-23 12:27 robert
* ChangeLog: Updated changelog
2005-05-23 12:18 robert
* runexamples.bat: Added new examples to runexamples

4
include/osg/Geometry
View File

@@ -92,7 +92,7 @@ class OSG_EXPORT Geometry : public Drawable
ref_ptr<IndexArray> indices;
AttributeBinding binding;
GLboolean normalize;
mutable unsigned int offset;
mutable unsigned long offset;
};
struct OSG_EXPORT Vec3ArrayData
@@ -134,7 +134,7 @@ class OSG_EXPORT Geometry : public Drawable
ref_ptr<IndexArray> indices;
AttributeBinding binding;
GLboolean normalize;
mutable unsigned int offset;
mutable unsigned long offset;
};
/** Static ArrayData which is returned from getTexCoordData(i) const and getVertexAttribData(i) const

10
src/osg/Geometry.cpp
View File

@@ -438,10 +438,10 @@ bool Geometry::empty() const
void Geometry::setTexCoordData(unsigned int unit,const ArrayData& arrayData)
{
if (_texCoordList.size()<=unit)
_texCoordList.resize(unit+1);
_texCoordList[unit] = arrayData;
if (_texCoordList.size()<=unit)
_texCoordList.resize(unit+1);
_texCoordList[unit] = arrayData;
}
Geometry::ArrayData& Geometry::getTexCoordData(unsigned int unit)
@@ -896,7 +896,7 @@ void Geometry::drawImplementation(State& state) const
//std::cout << " gen VertexBuffer "<<buffer<<std::endl;
// compute total size and offsets required.
unsigned int totalSize = 0;
unsigned long totalSize = 0;
_vertexData.offset = 0;
if (_vertexData.array.valid()) totalSize += _vertexData.array->getTotalDataSize();