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

From Tree, fixes for Java bindings

Browse Source
This commit is contained in:
Robert Osfield
2004-10-25 19:16:57 +00:00
parent 66836ef3d0
commit df9c7e5031
6 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/ApplicationUsage
View File

@@ -78,7 +78,7 @@ class SG_EXPORT ApplicationUsage
void write(std::ostream& output,const UsageMap& um,unsigned int widthOfOutput=80,bool showDefaults=false,const UsageMap& ud=UsageMap());
void write(std::ostream& output,unsigned int type=COMMAND_LINE_OPTION|ENVIRONMENTAL_VARIABLE|KEYBOARD_MOUSE_BINDING, unsigned int widthOfOutput=80,bool showDefaults=false);
void write(std::ostream& output,unsigned int type=COMMAND_LINE_OPTION, unsigned int widthOfOutput=80,bool showDefaults=false);
protected:

6
include/osgParticle/ParticleEffect
View File

@@ -33,15 +33,15 @@ namespace osgParticle
virtual bool isSameKindAs(const osg::Object *obj) const { return dynamic_cast<const ParticleEffect*>(obj) != 0; }
virtual void accept(osg::NodeVisitor& nv) { if (nv.validNodeMask(*this)) { nv.pushOntoNodePath(this); nv.apply(*this); nv.popFromNodePath(); } }
void setEmitter(Emitter* emitter);
void setEmitter(Emitter* emitter) { _emitter = emitter; }
Emitter* getEmitter() { return _emitter.get(); }
const Emitter* getEmitter() const { return _emitter.get(); }
void setProgram(Program* program);
void setProgram(Program* program) { _program = program; }
Program* getProgram() { return _program.get(); }
const Program* getProgram() const { return _program.get(); }
void setParticleSystem(ParticleSystem* ps);
void setParticleSystem(ParticleSystem* ps) { _particleSystem = ps; }
ParticleSystem* getParticleSystem() { return _particleSystem.get(); }
const ParticleSystem* getParticleSystem() const { return _particleSystem.get(); }

1
include/osgTerrain/DataSet
View File

@@ -377,6 +377,7 @@ class OSGTERRAIN_EXPORT DataSet : public osg::Referenced
{
if (&rhs==this) return *this;
_positionStack = rhs._positionStack;
return *this;
}
bool operator == (const iterator& rhs) const