Index: /OpenSceneGraph/trunk/include/osgVolume/Export =================================================================== --- /OpenSceneGraph/trunk/include/osgVolume/Export (revision 12292) +++ /OpenSceneGraph/trunk/include/osgVolume/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -38,5 +38,5 @@ #else # define OSGVOLUME_EXPORT -#endif +#endif /** Index: /OpenSceneGraph/trunk/include/osgVolume/Locator =================================================================== --- /OpenSceneGraph/trunk/include/osgVolume/Locator (revision 12292) +++ /OpenSceneGraph/trunk/include/osgVolume/Locator (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ { public: - + Locator() {} @@ -36,5 +36,5 @@ osg::Object(locator, copyop), _transform(locator._transform) {} - + META_Object(osgVolume, Locator); @@ -53,5 +53,5 @@ virtual bool convertModelToLocal(const osg::Vec3d& /*world*/, osg::Vec3d& /*local*/) const; - static bool convertLocalCoordBetween(const Locator& source, const osg::Vec3d& sourceNDC, + static bool convertLocalCoordBetween(const Locator& source, const osg::Vec3d& sourceNDC, const Locator& destination, osg::Vec3d& destinationNDC) { @@ -61,5 +61,5 @@ return true; } - + bool computeLocalBounds(osg::Vec3d& bottomLeft, osg::Vec3d& topRight) const; bool computeLocalBounds(Locator& source, osg::Vec3d& bottomLeft, osg::Vec3d& topRight) const; Index: /OpenSceneGraph/trunk/include/osgVolume/RayTracedTechnique =================================================================== --- /OpenSceneGraph/trunk/include/osgVolume/RayTracedTechnique (revision 12292) +++ /OpenSceneGraph/trunk/include/osgVolume/RayTracedTechnique (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ RayTracedTechnique(const RayTracedTechnique&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - + META_Object(osgVolume, RayTracedTechnique); @@ -43,5 +43,5 @@ protected: - + virtual ~RayTracedTechnique(); Index: /OpenSceneGraph/trunk/include/osgVolume/Version =================================================================== --- /OpenSceneGraph/trunk/include/osgVolume/Version (revision 12292) +++ /OpenSceneGraph/trunk/include/osgVolume/Version (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgVolume/VolumeTile =================================================================== --- /OpenSceneGraph/trunk/include/osgVolume/VolumeTile (revision 12292) +++ /OpenSceneGraph/trunk/include/osgVolume/VolumeTile (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -30,15 +30,15 @@ { public: - + TileID(); TileID(int in_level, int in_x, int in_y, int in_z); - - bool operator == (const TileID& rhs) const + + bool operator == (const TileID& rhs) const { return (level==rhs.level) && (x==rhs.x) && (y==rhs.y) && (z==rhs.z); } - bool operator != (const TileID& rhs) const + bool operator != (const TileID& rhs) const { return (level!=rhs.level) || (x!=rhs.x) || (y!=rhs.y) || (z!=rhs.z); @@ -55,5 +55,5 @@ return z=0; } @@ -72,5 +72,5 @@ VolumeTile(); - + /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ VolumeTile(const VolumeTile&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); @@ -93,14 +93,14 @@ const Volume* getVolume() const { return _volume; } - + /** Set the TileID (layer, x,y,z) of the VolumeTile. - * The TileID is used so it can be located by its neighbours + * The TileID is used so it can be located by its neighbours * via the enclosing Volume node that manages a map of TileID to VolumeTiles.*/ void setTileID(const TileID& tileID); - + /** Get the TileID (layer, x,y,z) of the VolumeTile.*/ const TileID& getTileID() const { return _tileID; } - - + + void setLocator(Locator* locator) { _locator = locator; } Locator* getLocator() { return _locator.get(); } @@ -119,5 +119,5 @@ /** Get the VolumeTechnique that will be used to render this tile. */ VolumeTechnique* getVolumeTechnique() { return _volumeTechnique.get(); } - + /** Get the const VolumeTechnique that will be used to render this tile. */ const VolumeTechnique* getVolumeTechnique() const { return _volumeTechnique.get(); } @@ -140,13 +140,13 @@ Volume* _volume; - + bool _dirty; bool _hasBeenTraversal; - + TileID _tileID; osg::ref_ptr _volumeTechnique; - osg::ref_ptr _locator; + osg::ref_ptr _locator; osg::ref_ptr _layer; Index: /OpenSceneGraph/trunk/include/osgVolume/Volume =================================================================== --- /OpenSceneGraph/trunk/include/osgVolume/Volume (revision 12292) +++ /OpenSceneGraph/trunk/include/osgVolume/Volume (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -29,5 +29,5 @@ Volume(); - + /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ Volume(const Volume&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); @@ -36,5 +36,5 @@ virtual void traverse(osg::NodeVisitor& nv); - + /** Get the VolumeTile for a given VolumeTileID.*/ VolumeTile* getVolumeTile(const TileID& tileID); @@ -42,5 +42,5 @@ /** Get the const VolumeTile for a given VolumeTileID.*/ const VolumeTile* getVolumeTile(const TileID& tileID) const; - + /** Set the VolumeTechnique prototype that nested VolumeTile should clone if they haven't already been assigned a volume rendering technique. */ @@ -49,5 +49,5 @@ /** Get the VolumeTechnique prototype. */ VolumeTechnique* getVolumeTechniquePrototype() { return _volumeTechnique.get(); } - + /** Get the const VolumeTechnique prototype. */ const VolumeTechnique* getVolumeTechniquePrototype() const { return _volumeTechnique.get(); } @@ -57,7 +57,7 @@ virtual ~Volume(); - + friend class VolumeTile; - + void dirtyRegisteredVolumeTiles(); @@ -71,5 +71,5 @@ VolumeTileSet _volumeTileSet; VolumeTileMap _volumeTileMap; - + osg::ref_ptr _volumeTechnique; }; Index: /OpenSceneGraph/trunk/include/osgVolume/FixedFunctionTechnique =================================================================== --- /OpenSceneGraph/trunk/include/osgVolume/FixedFunctionTechnique (revision 12292) +++ /OpenSceneGraph/trunk/include/osgVolume/FixedFunctionTechnique (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ FixedFunctionTechnique(const FixedFunctionTechnique&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - + META_Object(osgVolume, FixedFunctionTechnique); @@ -35,9 +35,9 @@ virtual void cull(osgUtil::CullVisitor* nv); - + void setNumSlices(unsigned int numSlices); unsigned int getNumSlices() const { return _numSlices; } - + /** Clean scene graph from any terrain technique specific nodes.*/ @@ -48,9 +48,9 @@ protected: - + virtual ~FixedFunctionTechnique(); - + osg::ref_ptr _node; - + unsigned int _numSlices; }; Index: /OpenSceneGraph/trunk/include/osgVolume/Layer =================================================================== --- /OpenSceneGraph/trunk/include/osgVolume/Layer (revision 12292) +++ /OpenSceneGraph/trunk/include/osgVolume/Layer (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgVolume/VolumeTechnique =================================================================== --- /OpenSceneGraph/trunk/include/osgVolume/VolumeTechnique (revision 12292) +++ /OpenSceneGraph/trunk/include/osgVolume/VolumeTechnique (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -34,5 +34,5 @@ /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ VolumeTechnique(const VolumeTechnique&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - + META_Object(osgVolume, VolumeTechnique); @@ -53,9 +53,9 @@ protected: - + void setDirty(bool dirty); virtual ~VolumeTechnique(); - + friend class osgVolume::VolumeTile; Index: /OpenSceneGraph/trunk/include/osgPresentation/SlideEventHandler =================================================================== --- /OpenSceneGraph/trunk/include/osgPresentation/SlideEventHandler (revision 12876) +++ /OpenSceneGraph/trunk/include/osgPresentation/SlideEventHandler (revision 13041) @@ -1,11 +1,11 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under + * This software is open source and may be redistributed and/or modified under * the terms of the GNU General Public License (GPL) version 2.0. * The full license is in LICENSE.txt file included with this distribution,. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * include LICENSE.txt for more details. */ @@ -163,12 +163,12 @@ ActiveOperators(); ~ActiveOperators(); - + void collect(osg::Node* incommingNode, osg::NodeVisitor::TraversalMode tm = osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); void process(); - + void setPause(bool pause); bool getPause() const { return _pause; } - + void reset(); @@ -197,7 +197,7 @@ SlideEventHandler(osgViewer::Viewer* viewer=0); - + static SlideEventHandler* instance(); - + META_Object(osgslideshowApp,SlideEventHandler); @@ -210,7 +210,7 @@ virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter&); - + virtual void getUsage(osg::ApplicationUsage& usage) const; - + osgViewer::Viewer* getViewer() { return _viewer.get(); } @@ -225,5 +225,5 @@ unsigned int getNumSlides(); - + int getActiveSlide() const { return _activeSlide; } int getActiveLayer() const { return _activeLayer; } @@ -240,13 +240,13 @@ bool nextLayer(); bool previousLayer(); - + bool home(); void setAutoSteppingActive(bool flag = true) { _autoSteppingActive = flag; } bool getAutoSteppingActive() const { return _autoSteppingActive; } - + void setTimeDelayBetweenSlides(double dt) { _timePerSlide = dt; } double getTimeDelayBetweenSlides() const { return _timePerSlide; } - + double getDuration(const osg::Node* node) const; @@ -267,5 +267,5 @@ bool getRequestReload() const { return _requestReload; } - + protected: @@ -277,11 +277,11 @@ void updateAlpha(bool, bool, float x, float y); void updateLight(float x, float y); - + osg::observer_ptr _viewer; - + osg::observer_ptr _showSwitch; int _activePresentation; - + osg::observer_ptr _presentationSwitch; int _activeSlide; @@ -297,9 +297,9 @@ bool _pause; bool _hold; - + bool _updateLightActive; bool _updateOpacityActive; float _previousX, _previousY; - + bool _cursorOn; @@ -311,10 +311,10 @@ float _timeDelayOnNewSlideWithMovies; - + double _minimumTimeBetweenKeyPresses; double _timeLastKeyPresses; - + ActiveOperators _activeOperators; - + osg::ref_ptr _compileSlideCallback; @@ -322,5 +322,5 @@ void updateOperators(); - + }; Index: /OpenSceneGraph/trunk/include/osgPresentation/Export =================================================================== --- /OpenSceneGraph/trunk/include/osgPresentation/Export (revision 12221) +++ /OpenSceneGraph/trunk/include/osgPresentation/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -37,5 +37,5 @@ #else # define OSGPRESENTATION_EXPORT -#endif +#endif Index: /OpenSceneGraph/trunk/include/osgPresentation/CompileSlideCallback =================================================================== --- /OpenSceneGraph/trunk/include/osgPresentation/CompileSlideCallback (revision 12139) +++ /OpenSceneGraph/trunk/include/osgPresentation/CompileSlideCallback (revision 13041) @@ -1,11 +1,11 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under + * This software is open source and may be redistributed and/or modified under * the terms of the GNU General Public License (GPL) version 2.0. * The full license is in LICENSE.txt file included with this distribution,. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * include LICENSE.txt for more details. */ @@ -32,7 +32,7 @@ protected: - + virtual ~CompileSlideCallback() {} - + mutable bool _needCompile; mutable unsigned int _frameNumber; Index: /OpenSceneGraph/trunk/include/osgPresentation/PickEventHandler =================================================================== --- /OpenSceneGraph/trunk/include/osgPresentation/PickEventHandler (revision 12139) +++ /OpenSceneGraph/trunk/include/osgPresentation/PickEventHandler (revision 13041) @@ -1,11 +1,11 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under + * This software is open source and may be redistributed and/or modified under * the terms of the GNU General Public License (GPL) version 2.0. * The full license is in LICENSE.txt file included with this distribution,. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * include LICENSE.txt for more details. */ @@ -31,35 +31,35 @@ PickEventHandler(const std::string& str, osgPresentation::Operation operation, bool relativeJump=true, int slideNum=0, int layerNum=0); PickEventHandler(const osgPresentation::KeyPosition& keyPos, bool relativeJump=true, int slideNum=0, int layerNum=0); - + void setOperation(osgPresentation::Operation operation) { _operation = operation; } osgPresentation::Operation getOperation() const { return _operation; } - + void setCommand(const std::string& str) { _command = str; } const std::string& getCommand() const { return _command; } - + void setKeyPosition(const osgPresentation::KeyPosition& keyPos) { _keyPos = keyPos; } const osgPresentation::KeyPosition& getKeyPosition() const { return _keyPos; } - + void setRelativeJump(int slideDelta, int layerDelta); void setAbsoluteJump(int slideNum, int layerNum); - + bool getRelativeJump() const { return _relativeJump; } int getSlideNum() const { return _slideNum; } int getLayerNum() const { return _layerNum; } - + bool requiresJump() const { return _relativeJump ? (_slideNum!=0 || _layerNum!=0) : true; } virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object* object, osg::NodeVisitor* nv); - + virtual void accept(osgGA::GUIEventHandlerVisitor& v); - + virtual void getUsage(osg::ApplicationUsage& usage) const; - + void doOperation(); - + std::string _command; osgPresentation::KeyPosition _keyPos; osgPresentation::Operation _operation; - + bool _relativeJump; int _slideNum; Index: /OpenSceneGraph/trunk/include/osgPresentation/SlideShowConstructor =================================================================== --- /OpenSceneGraph/trunk/include/osgPresentation/SlideShowConstructor (revision 12911) +++ /OpenSceneGraph/trunk/include/osgPresentation/SlideShowConstructor (revision 13041) @@ -1,11 +1,11 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under + * This software is open source and may be redistributed and/or modified under * the terms of the GNU General Public License (GPL) version 2.0. * The full license is in LICENSE.txt file included with this distribution,. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * include LICENSE.txt for more details. */ @@ -75,15 +75,15 @@ public: - + enum CoordinateFrame { SLIDE, MODEL }; - + LayerAttributes* getOrCreateLayerAttributes(osg::Node* node); - + void setDuration(osg::Node* node,double duration) { getOrCreateLayerAttributes(node)->setDuration(duration); } - + void addKey(osg::Node* node,const KeyPosition& kp) { @@ -103,5 +103,5 @@ void addPresentationKey(const KeyPosition& kp) { - if (!_presentationSwitch) createPresentation(); + if (!_presentationSwitch) createPresentation(); if (_presentationSwitch.valid()) addKey( _presentationSwitch.get(), kp); } @@ -109,5 +109,5 @@ void addPresentationRunString(const std::string& runString) { - if (!_presentationSwitch) createPresentation(); + if (!_presentationSwitch) createPresentation(); if (_presentationSwitch.valid()) addRunString( _presentationSwitch.get(),runString); } @@ -118,5 +118,5 @@ if (_slide.valid()) addKey(_slide.get(),kp); } - + void addSlideRunString(const std::string& runString) { @@ -124,5 +124,5 @@ if (_slide.valid()) addRunString(_slide.get(),runString); } - + void setSlideJump(bool relativeJump, int switchNum, int layerNum) { @@ -142,5 +142,5 @@ if (_currentLayer.valid()) addRunString(_currentLayer.get(),runString); } - + void setLayerJump(bool relativeJump, int switchNum, int layerNum) @@ -224,5 +224,5 @@ { ModelData() {} - + std::string effect; std::string options; @@ -318,22 +318,22 @@ void createPresentation(); - + void setBackgroundColor(const osg::Vec4& color, bool updateClearNode); const osg::Vec4& getBackgroundColor() const { return _backgroundColor; } - + void setTextColor(const osg::Vec4& color); const osg::Vec4& getTextColor() const { return _textFontDataDefault.color; } - + void setPresentationName(const std::string& name); - + void setPresentationAspectRatio(float aspectRatio); void setPresentationAspectRatio(const std::string& str); - + void setPresentationDuration(double duration); void addSlide(); - + void selectSlide(int slideNum); @@ -348,15 +348,15 @@ void setSlideBackgrondHUD(bool hud) { _slideBackgroundAsHUD = hud; } void setSlideBackground(const std::string& name) { _slideBackgroundImageFileName = name; } - + void setSlideDuration(double duration); void addLayer(bool inheritPreviousLayers=true, bool defineAsBaseLayer=false); - + void selectLayer(int layerNum); - + void setLayerDuration(double duration); - + // title settings FontData& getTitleFontData() { return _titleFontData; } @@ -369,5 +369,5 @@ FontData& getTextFontData() { return _textFontData; } FontData& getTextFontDataDefault() { return _textFontDataDefault; } - + PositionData& getTextPositionData() { return _textPositionData; } PositionData& getTextPositionDataDefault() { return _textPositionDataDefault; } @@ -389,9 +389,9 @@ void addToCurrentLayer(osg::Node* subgraph); - + void addBullet(const std::string& bullet, PositionData& positionData, FontData& fontData); - + void addParagraph(const std::string& paragraph, PositionData& positionData, FontData& fontData); - + void addImage(const std::string& filename,const PositionData& positionData, const ImageData& imageData); @@ -407,9 +407,9 @@ void addModel(const std::string& filename, const PositionData& positionData, const ModelData& modelData); - + void addVolume(const std::string& filename, const PositionData& positionData, const VolumeData& volumeData); osg::Group* takePresentation() { return _root.release(); } - + osg::Group* getPresentation() { return _root.get(); } @@ -417,5 +417,5 @@ osg::Switch* getCurrentSlide() { return _slide.get(); } - + osg::Group* getCurrentLayer() { return _currentLayer.get(); } @@ -439,13 +439,13 @@ osg::Vec3 computePositionInModelCoords(const PositionData& positionData) const; void updatePositionFromInModelCoords(const osg::Vec3& vertex, PositionData& positionData) const; - + osg::Vec3 convertSlideToModel(const osg::Vec3& position) const; osg::Vec3 convertModelToSlide(const osg::Vec3& position) const; osg::AnimationPathCallback* getAnimationPathCallback(const PositionData& positionData); - + osg::Node* attachMaterialAnimation(osg::Node* model, const PositionData& positionData); bool attachTexMat(osg::StateSet* stateset, const ImageData& imageData, float s, float t, bool textureRectangle); - + osg::StateSet* createTransformStateSet() { @@ -470,5 +470,5 @@ osg::ref_ptr _hudSettings; - + // title settings FontData _titleFontData; @@ -481,5 +481,5 @@ FontData _textFontData; FontData _textFontDataDefault; - + PositionData _textPositionData; PositionData _textPositionDataDefault; @@ -502,5 +502,5 @@ osg::ref_ptr _root; osg::ref_ptr _presentationSwitch; - + osg::ref_ptr _slideClearNode; osg::ref_ptr _slide; @@ -508,10 +508,10 @@ std::string _slideBackgroundImageFileName; bool _slideBackgroundAsHUD; - + osg::ref_ptr _previousLayer; osg::ref_ptr _currentLayer; - + osg::ref_ptr _filePathData; - + osg::ref_ptr _layerToApplyEventCallbackTo; osg::ref_ptr _currentEventCallbackToApply; @@ -519,5 +519,5 @@ std::string findFileAndRecordPath(const std::string& filename); - + void recordOptionsFilePath(const osgDB::Options* options); Index: /OpenSceneGraph/trunk/include/osgPresentation/AnimationMaterial =================================================================== --- /OpenSceneGraph/trunk/include/osgPresentation/AnimationMaterial (revision 12139) +++ /OpenSceneGraph/trunk/include/osgPresentation/AnimationMaterial (revision 13041) @@ -1,11 +1,11 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under + * This software is open source and may be redistributed and/or modified under * the terms of the GNU General Public License (GPL) version 2.0. * The full license is in LICENSE.txt file included with this distribution,. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * include LICENSE.txt for more details. */ @@ -32,5 +32,5 @@ { public: - + AnimationMaterial():_loopMode(LOOP) {} @@ -43,13 +43,13 @@ - /** get the transformation matrix for a point in time.*/ + /** get the transformation matrix for a point in time.*/ bool getMaterial(double time,osg::Material& material) const; void insert(double time,osg::Material* material); - + double getFirstTime() const { if (!_timeControlPointMap.empty()) return _timeControlPointMap.begin()->first; else return 0.0;} double getLastTime() const { if (!_timeControlPointMap.empty()) return _timeControlPointMap.rbegin()->first; else return 0.0;} double getPeriod() const { return getLastTime()-getFirstTime();} - + enum LoopMode { @@ -58,16 +58,16 @@ NO_LOOPING }; - + void setLoopMode(LoopMode lm) { _loopMode = lm; } - + LoopMode getLoopMode() const { return _loopMode; } typedef std::map > TimeControlPointMap; - + TimeControlPointMap& getTimeControlPointMap() { return _timeControlPointMap; } - + const TimeControlPointMap& getTimeControlPointMap() const { return _timeControlPointMap; } - + /** read the anumation path from a flat ascii file stream.*/ void read(std::istream& in); @@ -75,11 +75,11 @@ /** write the anumation path to a flat ascii file stream.*/ void write(std::ostream& out) const; - + bool requiresBlending() const; protected: - + virtual ~AnimationMaterial() {} - + void interpolate(osg::Material& material, float r, const osg::Material& lhs,const osg::Material& rhs) const; @@ -101,5 +101,5 @@ _pause(false), _pauseTime(0.0) {} - + AnimationMaterialCallback(const AnimationMaterialCallback& apc,const osg::CopyOp& copyop): @@ -114,5 +114,5 @@ _pauseTime(apc._pauseTime) {} - + META_Object(osg,AnimationMaterialCallback); @@ -126,5 +126,5 @@ _pause(false), _pauseTime(0.0) {} - + void setAnimationMaterial(AnimationMaterial* path) { _animationMaterial = path; } @@ -132,8 +132,8 @@ const AnimationMaterial* getAnimationMaterial() const { return _animationMaterial.get(); } - + void setTimeOffset(double offset) { _timeOffset = offset; } double getTimeOffset() const { return _timeOffset; } - + void setTimeMultiplier(double multiplier) { _timeMultiplier = multiplier; } double getTimeMultiplier() const { return _timeMultiplier; } @@ -149,5 +149,5 @@ /** implements the callback*/ virtual void operator()(osg::Node* node, osg::NodeVisitor* nv); - + void update(osg::Node& node); @@ -164,5 +164,5 @@ protected: - + ~AnimationMaterialCallback(){} Index: /OpenSceneGraph/trunk/include/osgFX/BumpMapping =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/BumpMapping (revision 5328) +++ /OpenSceneGraph/trunk/include/osgFX/BumpMapping (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,14 +26,14 @@ /** - This effect makes surfaces appear bumpy. Children nodes must use two textures, - one for diffuse color and one for the normal map (which can be created - from a height map with tools like nVIDIA's normal map generator). Furthermore, - tangent-space basis vectors must be created and assigned to each Geometry; this - can be done quickly by calling BumpMapping::prepareChildren(). Note that both - diffuse and normal map textures must have corresponding UV maps defined in + This effect makes surfaces appear bumpy. Children nodes must use two textures, + one for diffuse color and one for the normal map (which can be created + from a height map with tools like nVIDIA's normal map generator). Furthermore, + tangent-space basis vectors must be created and assigned to each Geometry; this + can be done quickly by calling BumpMapping::prepareChildren(). Note that both + diffuse and normal map textures must have corresponding UV maps defined in Geometry objects. - This effect defines a preferred technique which uses ARB vertex & fragment - programs, and a fallback technique which doesn't use fragment programs. The - latter is more limited though since it can't handle ambient and specular + This effect defines a preferred technique which uses ARB vertex & fragment + programs, and a fallback technique which doesn't use fragment programs. The + latter is more limited though since it can't handle ambient and specular components. */ @@ -43,8 +43,8 @@ BumpMapping(const BumpMapping& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); - META_Effect(osgFX, BumpMapping, - - "Bump Mapping", - + META_Effect(osgFX, BumpMapping, + + "Bump Mapping", + "This effect makes surfaces appear bumpy. Children nodes must use two textures, " "one for diffuse color and one for the normal map (which can be created " @@ -58,17 +58,17 @@ "latter is more limited though since it can't handle ambient and specular " "components.", - + "Marco Jez"); - - + + /** get the OpenGL light number */ inline int getLightNumber() const; - + /** set the OpenGL light number that will be used in lighting computations */ inline void setLightNumber(int n); - + /** get the texture unit that contains diffuse color texture. Default is 1 */ inline int getDiffuseTextureUnit() const; - + /** set the texture unit that contains diffuse color texture. Default is 1 */ inline void setDiffuseTextureUnit(int n); @@ -76,20 +76,20 @@ /** get the texture unit that contains normal map texture. Default is 0 */ inline int getNormalMapTextureUnit() const; - + /** set the texture unit that contains normal map texture. Default is 0 */ inline void setNormalMapTextureUnit(int n); - + /** get the diffuse color texture that overrides children's texture */ inline osg::Texture2D* getOverrideDiffuseTexture(); - + /** get the const diffuse color texture that overrides children's texture */ inline const osg::Texture2D* getOverrideDiffuseTexture() const; - + /** set the diffuse color texture that overrides children's texture */ inline void setOverrideDiffuseTexture(osg::Texture2D* texture); - + /** get the normal map texture that overrides children's texture */ inline osg::Texture2D* getOverrideNormalMapTexture(); - + /** get the const normal map texture that overrides children's texture */ inline const osg::Texture2D* getOverrideNormalMapTexture() const; @@ -97,5 +97,5 @@ /** set the normal map texture that overrides children's texture */ inline void setOverrideNormalMapTexture(osg::Texture2D* texture); - + /** prepare a Geometry for bump lighting. Tangent-space basis vectors are @@ -103,11 +103,11 @@ */ void prepareGeometry(osg::Geometry* geo); - + /** prepare a Node for bump lighting, calling prepareGeometry() for each Geometry */ void prepareNode(osg::Node* node); - + /** prepare children for bump lighting. Actually calls prepareNode() for each child */ void prepareChildren(); - + /** set up a demo environment with predefined diffuse and normal maps, as well as texture coordinates */ void setUpDemo(); @@ -127,11 +127,11 @@ }; - // INLINE METHODS - + // INLINE METHODS + inline int BumpMapping::getLightNumber() const { return _lightnum; } - + inline void BumpMapping::setLightNumber(int n) { @@ -139,10 +139,10 @@ dirtyTechniques(); } - + inline int BumpMapping::getDiffuseTextureUnit() const { return _diffuse_unit; } - + inline void BumpMapping::setDiffuseTextureUnit(int n) { @@ -150,10 +150,10 @@ dirtyTechniques(); } - + inline int BumpMapping::getNormalMapTextureUnit() const { return _normal_unit; } - + inline void BumpMapping::setNormalMapTextureUnit(int n) { @@ -161,5 +161,5 @@ dirtyTechniques(); } - + inline osg::Texture2D* BumpMapping::getOverrideDiffuseTexture() { @@ -171,5 +171,5 @@ return _diffuse_tex.get(); } - + inline void BumpMapping::setOverrideDiffuseTexture(osg::Texture2D* texture) { @@ -187,5 +187,5 @@ return _normal_tex.get(); } - + inline void BumpMapping::setOverrideNormalMapTexture(osg::Texture2D* texture) { Index: /OpenSceneGraph/trunk/include/osgFX/AnisotropicLighting =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/AnisotropicLighting (revision 5328) +++ /OpenSceneGraph/trunk/include/osgFX/AnisotropicLighting (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,14 +26,14 @@ /** - This single-pass effect implements a sort of anisotropic + This single-pass effect implements a sort of anisotropic lighting that replaces the standard OpenGL lighting model. - The final color of vertices is not computed directly, it is - the result of a texture lookup on a user-supplied lighting - image map. A vertex program is used to compute the s and t - texture coordinates as follows: s = (N dot H) ; t = (N dot L) - where N is the vertex normal, L is the light-to-vertex vector, - H is the half-way vector. This is a good example of how you - can use the State::getInitialViewMatrix() method to retrieve - the view matrix and perform view-dependant effects without + The final color of vertices is not computed directly, it is + the result of a texture lookup on a user-supplied lighting + image map. A vertex program is used to compute the s and t + texture coordinates as follows: s = (N dot H) ; t = (N dot L) + where N is the vertex normal, L is the light-to-vertex vector, + H is the half-way vector. This is a good example of how you + can use the State::getInitialViewMatrix() method to retrieve + the view matrix and perform view-dependant effects without fakes of any kind. This effect requires the ARB_vertex_program extension. @@ -44,8 +44,8 @@ AnisotropicLighting(const AnisotropicLighting& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); - META_Effect(osgFX, AnisotropicLighting, - - "Anisotropic Lighting", - + META_Effect(osgFX, AnisotropicLighting, + + "Anisotropic Lighting", + "This single-pass effect implements a sort of anisotropic " "lighting that replaces the standard OpenGL lighting model.\n" @@ -59,15 +59,15 @@ "the view matrix and perform view-dependant effects without " "fakes of any kind.\n" - "This effect requires the ARB_vertex_program extension.", - + "This effect requires the ARB_vertex_program extension.", + "Marco Jez"); - - + + /** get the lighting map */ inline osg::Image* getLightingMap(); - + /** get the const lighting map */ inline const osg::Image* getLightingMap() const; - + /** set the lighting map */ inline void setLightingMap(osg::Image* image); @@ -75,5 +75,5 @@ /** get the OpenGL light number */ inline int getLightNumber() const; - + /** set the OpenGL light number that will be used in lighting computations */ inline void setLightNumber(int n); @@ -91,25 +91,25 @@ // INLINE METHODS - + inline osg::Image* AnisotropicLighting::getLightingMap() { return _texture->getImage(); } - + inline const osg::Image* AnisotropicLighting::getLightingMap() const { return _texture->getImage(); } - + inline void AnisotropicLighting::setLightingMap(osg::Image* image) { _texture->setImage(image); } - + inline int AnisotropicLighting::getLightNumber() const { return _lightnum; } - + inline void AnisotropicLighting::setLightNumber(int n) { Index: /OpenSceneGraph/trunk/include/osgFX/Export =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/Export (revision 8744) +++ /OpenSceneGraph/trunk/include/osgFX/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,8 +32,8 @@ \namespace osgFX -The osgFX library is a NodeKit that extends the core scene graph to provide a special effects framework. +The osgFX library is a NodeKit that extends the core scene graph to provide a special effects framework. osgFX's framework allows multiple rendering techniques to be provide for each effect, thereby provide the use appropriate rendering techniques for each different class of graphics hardware, i.e. support for both modern -programmable graphics hardware and still have standard OpenGL 1.1 support as a fallback. +programmable graphics hardware and still have standard OpenGL 1.1 support as a fallback. */ Index: /OpenSceneGraph/trunk/include/osgFX/Cartoon =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/Cartoon (revision 5328) +++ /OpenSceneGraph/trunk/include/osgFX/Cartoon (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,8 +26,8 @@ /** - This effect implements a technique called 'Cel-Shading' to produce a - cartoon-style (non photorealistic) rendering. Two passes are required: - the first one draws solid surfaces, the second one draws the outlines. - A vertex program is used to setup texture coordinates for a sharp lighting + This effect implements a technique called 'Cel-Shading' to produce a + cartoon-style (non photorealistic) rendering. Two passes are required: + the first one draws solid surfaces, the second one draws the outlines. + A vertex program is used to setup texture coordinates for a sharp lighting texture on unit 0 which is generated on-the-fly. This effect requires the ARB_vertex_program extension. @@ -40,9 +40,9 @@ // effect class informations META_Effect( - osgFX, - Cartoon, - - "Cartoon", - + osgFX, + Cartoon, + + "Cartoon", + "This effect implements a technique called 'Cel-Shading' to produce a " "cartoon-style (non photorealistic) rendering. Two passes are required: " @@ -52,22 +52,22 @@ "This effect requires the ARB_vertex_program extension " "or OpenGL Shading Language.", - + "Marco Jez; OGLSL port by Mike Weiblen"); /** get the outline color */ inline const osg::Vec4& getOutlineColor() const; - + /** set the outline color */ inline void setOutlineColor(const osg::Vec4& color); - + /** get the outline line width */ inline float getOutlineLineWidth() const; - + /** set the outline line width */ inline void setOutlineLineWidth(float w); - + /** get the OpenGL light number */ inline int getLightNumber() const; - + /** set the OpenGL light number that will be used in lighting computations */ inline void setLightNumber(int n); @@ -96,20 +96,20 @@ _wf_mat->setEmission(osg::Material::FRONT_AND_BACK, color); } - + inline float Cartoon::getOutlineLineWidth() const { return _wf_lw->getWidth(); } - + inline void Cartoon::setOutlineLineWidth(float w) { _wf_lw->setWidth(w); } - + inline int Cartoon::getLightNumber() const { return _lightnum; } - + inline void Cartoon::setLightNumber(int n) { Index: /OpenSceneGraph/trunk/include/osgFX/Technique =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/Technique (revision 5328) +++ /OpenSceneGraph/trunk/include/osgFX/Technique (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ /** - An helper macro that defines the methods techniqueName() and + An helper macro that defines the methods techniqueName() and techniqueDescription() making them return the strings passed as parameters. */ @@ -88,5 +88,5 @@ inline const osg::StateSet* getPassStateSet(int i) const; - /** + /** traverse children with multipass if necessary. By default this method simply calls the protected method traverse_implementation(); you can @@ -95,5 +95,5 @@ */ inline virtual void traverse(osg::NodeVisitor& nv, Effect* fx); - + protected: Technique(const Technique &): osg::Referenced() {} // copying is nonsense ;) @@ -106,5 +106,5 @@ /** create a new pass node, add it to the technique and associate a StateSet */ void addPass(osg::StateSet* ss = 0); - + /** optional: return a node that overrides the child node on a specified pass */ inline virtual osg::Node* getOverrideChild(int) { return 0; } @@ -115,5 +115,5 @@ */ virtual void define_passes() = 0; - + /** traverse children with multipass if necessary. Don't call this method @@ -143,10 +143,10 @@ return _passes[i].get(); } - + inline void Technique::dirtyPasses() { _passes.clear(); } - + inline void Technique::traverse(osg::NodeVisitor& nv, Effect* fx) { Index: /OpenSceneGraph/trunk/include/osgFX/Validator =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/Validator (revision 11808) +++ /OpenSceneGraph/trunk/include/osgFX/Validator (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -35,5 +35,5 @@ class OSGFX_EXPORT Validator: public osg::StateAttribute { public: - + Validator(); Validator(Effect* effect); @@ -46,5 +46,5 @@ inline int compare(const osg::StateAttribute& sa) const; - + inline void disable() { _effect = 0; } @@ -64,5 +64,5 @@ //used by the COMPARE_StateAttribute_Parameter macros below. COMPARE_StateAttribute_Types(Validator,sa) - + // compare parameters COMPARE_StateAttribute_Parameter(_effect) Index: /OpenSceneGraph/trunk/include/osgFX/Version =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/Version (revision 12139) +++ /OpenSceneGraph/trunk/include/osgFX/Version (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgFX/Scribe =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/Scribe (revision 5328) +++ /OpenSceneGraph/trunk/include/osgFX/Scribe (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,8 +26,8 @@ /** - This is a two-passes effect; the first pass renders the subgraph as usual - while the second pass switches to wireframe mode, sets up lighting and + This is a two-passes effect; the first pass renders the subgraph as usual + while the second pass switches to wireframe mode, sets up lighting and material to obtain a fixed (user-defined) color and then renders the subgraph. - This effect uses the PolygonOffset attribute to avoid Z-fighting, so it + This effect uses the PolygonOffset attribute to avoid Z-fighting, so it requires at least OpenGL version 1.1. */ @@ -39,9 +39,9 @@ // effect class informations META_Effect( - osgFX, - Scribe, - - "Scribe", - + osgFX, + Scribe, + + "Scribe", + "This is a two-passes effect; the first pass renders the subgraph as usual " "while the second pass switches to wireframe mode, sets up lighting and " @@ -49,16 +49,16 @@ "This effect uses the PolygonOffset attribute to avoid Z-fighting, so it " "requires at least OpenGL version 1.1.", - + "Marco Jez"); /** get the wireframe color */ inline const osg::Vec4& getWireframeColor() const; - + /** set the wireframe color */ inline void setWireframeColor(const osg::Vec4& color); - + /** get the wireframe line width */ inline float getWireframeLineWidth() const; - + /** set the wireframe line width */ inline void setWireframeLineWidth(float w); @@ -86,10 +86,10 @@ _wf_mat->setEmission(osg::Material::FRONT_AND_BACK, color); } - + inline float Scribe::getWireframeLineWidth() const { return _wf_lw->getWidth(); } - + inline void Scribe::setWireframeLineWidth(float w) { Index: /OpenSceneGraph/trunk/include/osgFX/Registry =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/Registry (revision 5328) +++ /OpenSceneGraph/trunk/include/osgFX/Registry (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -58,5 +58,5 @@ // INLINE METHODS - + inline const Registry::EffectMap& Registry::getEffectMap() const Index: /OpenSceneGraph/trunk/include/osgFX/SpecularHighlights =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/SpecularHighlights (revision 5328) +++ /OpenSceneGraph/trunk/include/osgFX/SpecularHighlights (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -23,10 +23,10 @@ /** - This effect applies additive specular highlights at fragment level (instead - of OpenGL's vertex-level lighting) by using a cube map and reflective texgen. - A texture matrix is computed to rotate the cube map automatically; this makes - the specular effect consistent with respect to view direction and light position. + This effect applies additive specular highlights at fragment level (instead + of OpenGL's vertex-level lighting) by using a cube map and reflective texgen. + A texture matrix is computed to rotate the cube map automatically; this makes + the specular effect consistent with respect to view direction and light position. The user can choose which light should be used to compute the texture matrix. - This effect requires the GL_ARB_texture_env_add extension and one of the cube map + This effect requires the GL_ARB_texture_env_add extension and one of the cube map extensions (GL_EXT_texture_cube_map, GL_ARB_texture_cube_map or OpenGL v1.3). */ @@ -36,8 +36,8 @@ SpecularHighlights(const SpecularHighlights& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); - META_Effect(osgFX, SpecularHighlights, - - "Specular Highlights", - + META_Effect(osgFX, SpecularHighlights, + + "Specular Highlights", + "This effect applies additive specular highlights at fragment level (instead " "of OpenGL's vertex-level lighting) by using a cube map and reflective texgen. " @@ -46,30 +46,30 @@ "The user can choose which light should be used to compute the texture matrix.\n" "This effect requires the GL_ARB_texture_env_add extension and one of the cube map " - "extensions (GL_EXT_texture_cube_map, GL_ARB_texture_cube_map or OpenGL v1.3).", - + "extensions (GL_EXT_texture_cube_map, GL_ARB_texture_cube_map or OpenGL v1.3).", + "Marco Jez"); - - + + /** get the OpenGL light number */ inline int getLightNumber() const; - + /** set the OpenGL light number that will be used in lighting computations */ inline void setLightNumber(int n); - + /** get the texture unit number */ inline int getTextureUnit() const; - + /** set the texture unit that will be used to apply the cube map */ inline void setTextureUnit(int n); - + /** get the specular color */ inline const osg::Vec4& getSpecularColor() const; - + /** set the specular color */ inline void setSpecularColor(const osg::Vec4& color); - + /** get the specular exponent */ inline float getSpecularExponent() const; - + /** set the specular exponent */ inline void setSpecularExponent(float e); @@ -89,10 +89,10 @@ // INLINE METHODS - + inline int SpecularHighlights::getLightNumber() const { return _lightnum; } - + inline void SpecularHighlights::setLightNumber(int n) { @@ -100,10 +100,10 @@ dirtyTechniques(); } - + inline int SpecularHighlights::getTextureUnit() const { return _unit; } - + inline void SpecularHighlights::setTextureUnit(int n) { @@ -116,5 +116,5 @@ return _color; } - + inline void SpecularHighlights::setSpecularColor(const osg::Vec4& color) { @@ -127,5 +127,5 @@ return _sexp; } - + inline void SpecularHighlights::setSpecularExponent(float e) { Index: /OpenSceneGraph/trunk/include/osgFX/Effect =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/Effect (revision 5328) +++ /OpenSceneGraph/trunk/include/osgFX/Effect (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -51,8 +51,8 @@ often using different OpenGL extensions. The active technique can be selected either manually, with selectTechnique(), or automatically, in which - case the first technique that is supported by all active rendering contexts + case the first technique that is supported by all active rendering contexts is chosen. - If you are an Effect user, then simply use it as a node group. Create an - instance of your desired effect, add it to your scene graph and call its + If you are an Effect user, then simply use it as a node group. Create an + instance of your desired effect, add it to your scene graph and call its addChild() method to add a child node as you would do with a Group. If you are an Effect developer, you will have to implement the method @@ -75,5 +75,5 @@ /** get the name of this Effect */ virtual const char *effectName() const = 0; - + /** get a brief description of this Effect*/ virtual const char *effectDescription() const = 0; @@ -87,5 +87,5 @@ /** set whether the effect is enabled or not */ inline void setEnabled(bool v); - + /** optional: set effect parameters to produce a visually significant @@ -97,5 +97,5 @@ /** get the number of techniques defined for this Effect */ inline int getNumTechniques() const; - + /** get the i-th Technique */ inline Technique* getTechnique(int i); @@ -115,5 +115,5 @@ /** custom traversal */ - virtual void traverse(osg::NodeVisitor& nv); + virtual void traverse(osg::NodeVisitor& nv); /** default traversal */ @@ -123,5 +123,5 @@ virtual ~Effect(); Effect &operator=(const Effect &) { return *this; } - + /** force rebuilding of techniques on next traversal */ inline void dirtyTechniques(); @@ -137,5 +137,5 @@ */ virtual bool define_techniques() = 0; - + private: friend class Validator; @@ -150,5 +150,5 @@ // use int instead of bool to avoid errors mutable osg::buffered_value _tech_selected; - + int _global_sel_tech; @@ -156,5 +156,5 @@ osg::ref_ptr _dummy_for_validation; - + void build_dummy_node(); }; @@ -171,5 +171,5 @@ _enabled = v; } - + inline int Effect::getNumTechniques() const { @@ -201,10 +201,10 @@ _techs.push_back(tech); } - + inline void Effect::dirtyTechniques() { _techs_defined = false; } - + inline void Effect::inherited_traverse(osg::NodeVisitor& nv) { Index: /OpenSceneGraph/trunk/include/osgFX/MultiTextureControl =================================================================== --- /OpenSceneGraph/trunk/include/osgFX/MultiTextureControl (revision 5328) +++ /OpenSceneGraph/trunk/include/osgFX/MultiTextureControl (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,17 +32,17 @@ META_Node(osgFX, MultiTextureControl); - + void setTextureWeight(unsigned int unit, float weight); float getTextureWeight(unsigned int unit) const { return (unit<_textureWeightList.size()) ? _textureWeightList[unit] : 0.0f; } - + unsigned int getNumTextureWeights() const { return _textureWeightList.size(); } - + protected: virtual ~MultiTextureControl() {} MultiTextureControl& operator = (const MultiTextureControl&) { return *this; } - + void updateStateSet(); - + typedef std::vector TextureWeightList; TextureWeightList _textureWeightList; Index: /OpenSceneGraph/trunk/include/osgUtil/CullVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/CullVisitor (revision 12833) +++ /OpenSceneGraph/trunk/include/osgUtil/CullVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -44,15 +44,15 @@ * sorted opaque bin. The opaque bin is rendered first, and then the * transparent bin is rendered in order from the furthest osg::Drawable - * from the eye to the one nearest the eye. + * from the eye to the one nearest the eye. */ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor, public osg::CullStack { public: - + typedef osg::Matrix::value_type value_type; - + CullVisitor(); - + /// Copy constructor that does a shallow copy. CullVisitor(const CullVisitor&); @@ -65,5 +65,5 @@ /** get the prototype singleton used by CullVisitor::create().*/ static osg::ref_ptr& prototype(); - + /** create a CullVisitor by cloning CullVisitor::prototype().*/ static CullVisitor* create(); @@ -131,5 +131,5 @@ } } - + /** Pop the top state set and hence associated state group. * Move the current state group to the parent of the popped @@ -157,5 +157,5 @@ _currentStateGraph = _currentStateGraph->_parent; } - + inline void setStateGraph(StateGraph* rg) { @@ -207,5 +207,5 @@ void setCalculatedNearPlane(value_type value) { _computed_znear = value; } inline value_type getCalculatedNearPlane() const { return _computed_znear; } - + void setCalculatedFarPlane(value_type value) { _computed_zfar = value; } inline value_type getCalculatedFarPlane() const { return _computed_zfar; } @@ -217,7 +217,7 @@ bool updateCalculatedNearFar(const osg::Matrix& matrix,const osg::Drawable& drawable, bool isBillboard=false); - + void updateCalculatedNearFar(const osg::Vec3& pos); - + /** Add a drawable to current render graph.*/ inline void addDrawable(osg::Drawable* drawable,osg::RefMatrix* matrix); @@ -234,5 +234,5 @@ /** compute near plane based on the polgon intersection of primtives in near plane candidate list of drawables. - * Note, you have to set ComputeNearFarMode to COMPUTE_NEAR_FAR_USING_PRIMITIVES to be able to near plane candidate drawables to be recorded by the cull traversal. */ + * Note, you have to set ComputeNearFarMode to COMPUTE_NEAR_FAR_USING_PRIMITIVES to be able to near plane candidate drawables to be recorded by the cull traversal. */ void computeNearPlane(); @@ -240,5 +240,5 @@ * the computed near and far.*/ virtual void popProjectionMatrix(); - + /** CullVisitor's default clamping of the projection float matrix to computed near and far values. @@ -266,5 +266,5 @@ return true; } - else + else return false; } @@ -287,8 +287,8 @@ return true; } - else + else return false; } - + void setState(osg::State* state) { _renderInfo.setState(state); } @@ -306,5 +306,5 @@ /** Prevent unwanted copy operator.*/ CullVisitor& operator = (const CullVisitor&) { return *this; } - + inline void handle_cull_callbacks_and_traverse(osg::Node& node) { @@ -324,5 +324,5 @@ StateGraph* _currentStateGraph; - osg::ref_ptr _rootRenderStage; + osg::ref_ptr _rootRenderStage; RenderBin* _currentRenderBin; std::vector _renderBinStack; @@ -332,12 +332,12 @@ value_type _computed_znear; value_type _computed_zfar; - - + + typedef std::vector< osg::ref_ptr > RenderLeafList; RenderLeafList _reuseRenderLeafList; unsigned int _currentReuseRenderLeafIndex; - + inline RenderLeaf* createOrReuseRenderLeaf(osg::Drawable* drawable,osg::RefMatrix* projection,osg::RefMatrix* matrix, float depth=0.0f); - + unsigned int _numberOfEncloseOverrideRenderBinDetails; @@ -351,5 +351,5 @@ { } - + void set(const osg::Matrix& matrix, const osg::Drawable* drawable, const osg::Polytope& frustum) { @@ -357,5 +357,5 @@ _drawable = drawable; if (!_planes.empty()) _planes.clear(); - + // create a new list of planes from the active walls of the frustum. osg::Polytope::ClippingMask result_mask = frustum.getResultMask(); @@ -366,13 +366,13 @@ { if (result_mask&selector_mask) _planes.push_back(*itr); - selector_mask <<= 1; + selector_mask <<= 1; } } - + MatrixPlanesDrawables(const MatrixPlanesDrawables& mpd): _matrix(mpd._matrix), _drawable(mpd._drawable), _planes(mpd._planes) {} - + MatrixPlanesDrawables& operator = (const MatrixPlanesDrawables& mpd) { @@ -382,10 +382,10 @@ return *this; } - + osg::Matrix _matrix; const osg::Drawable* _drawable; osg::Polytope::PlaneList _planes; }; - + typedef std::multimap DistanceMatrixDrawableMap; DistanceMatrixDrawableMap _nearPlaneCandidateMap; @@ -437,5 +437,5 @@ { // Skips any already reused renderleaf. - while (_currentReuseRenderLeafIndex<_reuseRenderLeafList.size() && + while (_currentReuseRenderLeafIndex<_reuseRenderLeafList.size() && _reuseRenderLeafList[_currentReuseRenderLeafIndex]->referenceCount()>1) { Index: /OpenSceneGraph/trunk/include/osgUtil/IntersectVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/IntersectVisitor (revision 10100) +++ /OpenSceneGraph/trunk/include/osgUtil/IntersectVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -31,5 +31,5 @@ class OSGUTIL_EXPORT Hit -{ +{ /** Deprecated */ public: @@ -38,7 +38,7 @@ Hit(const Hit& hit); ~Hit(); - + Hit& operator = (const Hit& hit); - + typedef std::vector VecIndexList; @@ -49,9 +49,9 @@ return _ratio _originalLineSegment; @@ -80,5 +80,5 @@ osg::ref_ptr _matrix; osg::ref_ptr _inverse; - + VecIndexList _vecIndexList; int _primitiveIndex; @@ -101,5 +101,5 @@ void reset(); - + /** Add a line segment to use for intersection testing during scene traversal. * Note, a maximum of 32 line segments can be added to a IntersectVistor, @@ -114,5 +114,5 @@ int getNumHits(const osg::LineSegment* seg) { return _segHitList[seg].size(); } - + LineSegmentHitListMap& getSegHitList() { return _segHitList; } @@ -124,5 +124,5 @@ USE_SEGMENT_START_POINT_AS_EYE_POINT_FOR_LOD_LEVEL_SELECTION }; - + void setLODSelectionMode(LODSelectionMode mode) { _lodSelectionMode = mode; } LODSelectionMode getLODSelectionMode() const { return _lodSelectionMode; } @@ -191,9 +191,9 @@ typedef std::vector > IntersectStateStack; - + IntersectStateStack _intersectStateStack; LineSegmentHitListMap _segHitList; - + LODSelectionMode _lodSelectionMode; osg::Vec3 _pseudoEyePoint; @@ -214,5 +214,5 @@ protected: - + float _mx; float _my; Index: /OpenSceneGraph/trunk/include/osgUtil/MeshOptimizers =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/MeshOptimizers (revision 12139) +++ /OpenSceneGraph/trunk/include/osgUtil/MeshOptimizers (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgUtil/CubeMapGenerator =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/CubeMapGenerator (revision 5328) +++ /OpenSceneGraph/trunk/include/osgUtil/CubeMapGenerator (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -29,5 +29,5 @@ { - /** This is the base class for cube map generators. + /** This is the base class for cube map generators. It exposes the necessary interface to access the six generated images; descendants should only override the compute_color() method. @@ -41,6 +41,6 @@ inline const osg::Image *getImage(osg::TextureCubeMap::Face face) const; - /** Generate the six cube images. - If use_osg_system is true, then the OSG's coordinate system is used instead + /** Generate the six cube images. + If use_osg_system is true, then the OSG's coordinate system is used instead of the default OpenGL one. */ @@ -52,7 +52,7 @@ inline void set_pixel(int index, int c, int r, const osg::Vec4 &color); - inline static osg::Vec4 vector_to_color(const osg::Vec3 &vec); + inline static osg::Vec4 vector_to_color(const osg::Vec3 &vec); - /** Override this method to define how colors are computed. + /** Override this method to define how colors are computed. The parameter R is the reflection vector, pointing from the center of the cube. The return value should be the RGBA color associated with that reflection ray. @@ -64,5 +64,5 @@ typedef std::vector > Image_list; - Image_list images_; + Image_list images_; }; @@ -77,5 +77,5 @@ case osg::TextureCubeMap::NEGATIVE_Y: return images_[3].get(); case osg::TextureCubeMap::POSITIVE_Z: return images_[4].get(); - case osg::TextureCubeMap::NEGATIVE_Z: return images_[5].get(); + case osg::TextureCubeMap::NEGATIVE_Z: return images_[5].get(); default: return 0; } @@ -90,5 +90,5 @@ case osg::TextureCubeMap::NEGATIVE_Y: return images_[3].get(); case osg::TextureCubeMap::POSITIVE_Z: return images_[4].get(); - case osg::TextureCubeMap::NEGATIVE_Z: return images_[5].get(); + case osg::TextureCubeMap::NEGATIVE_Z: return images_[5].get(); default: return 0; } @@ -102,5 +102,5 @@ *(i->data(c, r)+1) = static_cast(osg::clampBetween(color.y(),0.0f,1.0f) * 255); *(i->data(c, r)+2) = static_cast(osg::clampBetween(color.z(),0.0f,1.0f) * 255); - *(i->data(c, r)+3) = static_cast(osg::clampBetween(color.w(),0.0f,1.0f) * 255); + *(i->data(c, r)+3) = static_cast(osg::clampBetween(color.w(),0.0f,1.0f) * 255); } else { osg::notify(osg::WARN) << "Warning: CubeMapGenerator::set_pixel(): invalid image index\n"; Index: /OpenSceneGraph/trunk/include/osgUtil/TangentSpaceGenerator =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/TangentSpaceGenerator (revision 5328) +++ /OpenSceneGraph/trunk/include/osgUtil/TangentSpaceGenerator (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgUtil/Version =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/Version (revision 7365) +++ /OpenSceneGraph/trunk/include/osgUtil/Version (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgUtil/SceneGraphBuilder =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/SceneGraphBuilder (revision 12380) +++ /OpenSceneGraph/trunk/include/osgUtil/SceneGraphBuilder (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,5 +32,5 @@ SceneGraphBuilder(); - // + // // OpenGL 1.0 style building methods // @@ -43,5 +43,5 @@ void Scaled(GLdouble x, GLdouble y, GLdouble z); void Rotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z); - + void BlendFunc(GLenum srcFactor, GLenum dstFactor); void CullFace(GLenum mode); @@ -55,8 +55,8 @@ void PolygonStipple(const GLubyte* mask); void ShadeModel(GLenum mode); - + void Enable(GLenum mode); void Disable(GLenum mode); - + void Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); void Color4fv(GLfloat* c) { Color4f(c[0], c[1], c[2], c[3]); } @@ -121,25 +121,25 @@ protected: - + typedef std::vector Matrices; void matrixChanged(); void addAttribute(osg::StateAttribute* attribute); - void addMode(GLenum mode, bool enabled); + void addMode(GLenum mode, bool enabled); void addTextureAttribute(unsigned int unit, osg::StateAttribute* attribute); - void addTextureMode(unsigned int unit, GLenum mode, bool enabled); + void addTextureMode(unsigned int unit, GLenum mode, bool enabled); void addShape(osg::Shape* shape); void addDrawable(osg::Drawable* drawable); void newGeometry(); - + void allocateGeometry(); void completeGeometry(); - + void allocateStateSet(); - + Matrices _matrixStack; osg::ref_ptr _stateset; bool _statesetAssigned; - + bool _normalSet; osg::Vec3f _normal; @@ -156,5 +156,5 @@ osg::ref_ptr _colors; osg::ref_ptr _texCoords; - + struct QuadricState { @@ -178,5 +178,5 @@ osg::ref_ptr _transform; osg::ref_ptr _group; - + }; Index: /OpenSceneGraph/trunk/include/osgUtil/PerlinNoise =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/PerlinNoise (revision 12891) +++ /OpenSceneGraph/trunk/include/osgUtil/PerlinNoise (revision 13041) @@ -42,5 +42,5 @@ PerlinNoise(); - + void SetNoiseFrequency(int frequency); @@ -63,11 +63,11 @@ osg::Image* create3DNoiseImage(int texSize); osg::Texture3D* create3DNoiseTexture(int texSize ); - + protected: - + void initNoise(void); enum { MAXB = 0x100 }; - + int p[MAXB + MAXB + 2]; double g3[MAXB + MAXB + 2][3]; @@ -78,5 +78,5 @@ int B; int BM; - + }; Index: /OpenSceneGraph/trunk/include/osgUtil/SmoothingVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/SmoothingVisitor (revision 11688) +++ /OpenSceneGraph/trunk/include/osgUtil/SmoothingVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -33,5 +33,5 @@ SmoothingVisitor(); virtual ~SmoothingVisitor(); - + /// smooth geoset by creating per vertex normals. static void smooth(osg::Geometry& geoset, double creaseAngle=osg::PI); Index: /OpenSceneGraph/trunk/include/osgUtil/SceneView =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/SceneView (revision 12794) +++ /OpenSceneGraph/trunk/include/osgUtil/SceneView (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -52,5 +52,5 @@ COMPILE_GLOBJECTS_AT_INIT = 0x4, STANDARD_SETTINGS = HEADLIGHT | - COMPILE_GLOBJECTS_AT_INIT + COMPILE_GLOBJECTS_AT_INIT }; @@ -76,5 +76,5 @@ */ void setSceneData(osg::Node* node); - + /** Get the scene data to view. The data will typically be * an osg::Scene but can be any osg::Node type. @@ -86,5 +86,5 @@ */ const osg::Node* getSceneData(unsigned int childNo=0) const { return (_camera->getNumChildren()>childNo) ? _camera->getChild(childNo) : 0; } - + /** Get the number of scene data subgraphs added to the SceneView's camera.*/ unsigned int getNumSceneData() const { return _camera->getNumChildren(); } @@ -102,8 +102,8 @@ /** Get the const viewport. */ const osg::Viewport* getViewport() const { return (_camera->getViewport()!=0) ? _camera->getViewport() : 0; } - + /** Set the DisplaySettings. */ inline void setDisplaySettings(osg::DisplaySettings* vs) { _displaySettings = vs; } - + /** Get the const DisplaySettings */ inline const osg::DisplaySettings* getDisplaySettings() const { return _displaySettings.get(); } @@ -119,10 +119,10 @@ /** Get the color used in glClearColor.*/ const osg::Vec4& getClearColor() const { return _camera->getClearColor(); } - - - /** Manually set the redraw interlaced stereo stencil mask request flag to control whether to redraw the stencil buffer on the next frame.*/ + + + /** Manually set the redraw interlaced stereo stencil mask request flag to control whether to redraw the stencil buffer on the next frame.*/ void setRedrawInterlacedStereoStencilMask(bool flag) { _redrawInterlacedStereoStencilMask = flag; } - /** Get the redraw interlaced stereo stencil mask request flag.*/ + /** Get the redraw interlaced stereo stencil mask request flag.*/ bool getRedrawInterlacedStereoStencilMask() const { return _redrawInterlacedStereoStencilMask; } @@ -139,5 +139,5 @@ osg::StateSet* getLocalStateSet() { return _localStateSet.get(); } const osg::StateSet* getLocalStateSet() const { return _localStateSet.get(); } - + enum ActiveUniforms { @@ -159,5 +159,5 @@ }; - /** Set the uniforms that SceneView should set set up on each frame.*/ + /** Set the uniforms that SceneView should set set up on each frame.*/ void setActiveUniforms(int activeUniforms) { _activeUniforms = activeUniforms; } @@ -166,5 +166,5 @@ void updateUniforms(); - + typedef Options LightingMode; @@ -176,9 +176,9 @@ osg::Light* getLight() { return _light.get(); } const osg::Light* getLight() const { return _light.get(); } - + void setState(osg::State* state) { _renderInfo.setState(state); } osg::State* getState() { return _renderInfo.getState(); } const osg::State* getState() const { return _renderInfo.getState(); } - + void setView(osg::View* view) { _camera->setView(view); } osg::View* getView() { return _camera->getView(); } @@ -188,5 +188,5 @@ osg::RenderInfo& getRenderInfo() { return _renderInfo; } const osg::RenderInfo& getRenderInfo() const { return _renderInfo; } - + @@ -222,5 +222,5 @@ const osg::Matrixd& getProjectionMatrix() const { return _camera->getProjectionMatrix(); } - /** Get the orthographic settings of the orthographic projection matrix. + /** Get the orthographic settings of the orthographic projection matrix. * Returns false if matrix is not an orthographic matrix, where parameter values are undefined.*/ bool getProjectionMatrixAsOrtho(double& left, double& right, @@ -235,5 +235,5 @@ /** Get the frustum setting of a symmetric perspective projection matrix. - * Returns false if matrix is not a perspective matrix, where parameter values are undefined. + * Returns false if matrix is not a perspective matrix, where parameter values are undefined. * Note, if matrix is not a symmetric perspective matrix then the shear will be lost. * Asymmetric matrices occur when stereo, power walls, caves and reality center display are used. @@ -245,5 +245,5 @@ /** Set the view matrix. Can be thought of as setting the position of the world relative to the camera in camera coordinates. */ inline void setViewMatrix(const osg::Matrixf& matrix) { _camera->setViewMatrix(matrix); } - + /** Set the view matrix. Can be thought of as setting the position of the world relative to the camera in camera coordinates. */ inline void setViewMatrix(const osg::Matrixd& matrix) { _camera->setViewMatrix(matrix); } @@ -263,5 +263,5 @@ - + void setInitVisitor(osg::NodeVisitor* av) { _initVisitor = av; } osg::NodeVisitor* getInitVisitor() { return _initVisitor.get(); } @@ -285,5 +285,5 @@ osgUtil::CullVisitor* getCullVisitorRight() { return _cullVisitorRight.get(); } const osgUtil::CullVisitor* getCullVisitorRight() const { return _cullVisitorRight.get(); } - + void setCollectOccludersVisitor(osg::CollectOccludersVisitor* cov) { _collectOccludersVisitor = cov; } osg::CollectOccludersVisitor* getCollectOccludersVisitor() { return _collectOccludersVisitor.get(); } @@ -355,5 +355,5 @@ /** Set whether the draw method should call renderer->prioritizeTexture.*/ void setPrioritizeTextures(bool pt) { _prioritizeTextures = pt; } - + /** Get whether the draw method should call renderer->prioritizeTexture.*/ bool getPrioritizeTextures() const { return _prioritizeTextures; } @@ -368,5 +368,5 @@ virtual osg::Matrixd computeRightEyeView(const osg::Matrixd& view) const = 0; }; - + void setComputeStereoMatricesCallback(ComputeStereoMatricesCallback* callback) { _computeStereoMatricesCallback=callback; } ComputeStereoMatricesCallback* getComputeStereoMatricesCallback() { return _computeStereoMatricesCallback.get(); } @@ -420,5 +420,5 @@ else return computeLeftEyeViewImplementation(view); } - + inline osg::Matrixd computeRightEyeProjection(const osg::Matrixd& projection) const { @@ -463,8 +463,8 @@ /** Do draw traversal of draw bins generated by cull traversal.*/ virtual void draw(); - + /** Compute the number of dynamic objects that will be held in the rendering backend */ unsigned int getDynamicObjectCount() const { return _dynamicObjectCount; } - + /** Release all OpenGL objects from the scene graph, such as texture objects, display lists, etc. * These released scene graphs are placed in the respective delete GLObjects cache, and @@ -477,5 +477,5 @@ /** Flush deleted OpenGL objects, such as texture objects, display lists, etc., within the specified available time.*/ virtual void flushDeletedGLObjects(double& availableTime); - + /** Extract stats for current draw list. */ bool getStats(Statistics& primStats); @@ -491,5 +491,5 @@ /** Do cull traversal of attached scene graph using Cull NodeVisitor. Return true if computeNearFar has been done during the cull traversal.*/ virtual bool cullStage(const osg::Matrixd& projection,const osg::Matrixd& modelview,osgUtil::CullVisitor* cullVisitor, osgUtil::StateGraph* rendergraph, osgUtil::RenderStage* renderStage, osg::Viewport *viewport); - + void computeLeftEyeViewport(const osg::Viewport *viewport); void computeRightEyeViewport(const osg::Viewport *viewport); @@ -501,5 +501,5 @@ osg::ref_ptr _localStateSet; osg::RenderInfo _renderInfo; - + bool _initCalled; osg::ref_ptr _initVisitor; @@ -522,14 +522,14 @@ osg::ref_ptr _collectOccludersVisitor; - + osg::ref_ptr _frameStamp; - + osg::observer_ptr _camera; osg::ref_ptr _cameraWithOwnership; - + osg::ref_ptr _globalStateSet; osg::ref_ptr _light; osg::ref_ptr _displaySettings; - + osg::ref_ptr _secondaryStateSet; @@ -538,19 +538,19 @@ LightingMode _lightingMode; - + bool _prioritizeTextures; - + bool _automaticFlush; bool _requiresFlush; - - int _activeUniforms; + + int _activeUniforms; double _previousFrameTime; double _previousSimulationTime; - + bool _redrawInterlacedStereoStencilMask; int _interlacedStereoStencilWidth; int _interlacedStereoStencilHeight; - unsigned int _dynamicObjectCount; + unsigned int _dynamicObjectCount; }; Index: /OpenSceneGraph/trunk/include/osgUtil/TransformCallback =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/TransformCallback (revision 12056) +++ /OpenSceneGraph/trunk/include/osgUtil/TransformCallback (revision 13041) @@ -1,15 +1,15 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ -//C++ header +//C++ header #ifndef OSGUTIL_TRANSFORMCALLBACK @@ -36,5 +36,5 @@ protected: - + float _angular_velocity; osg::Vec3 _pivot; Index: /OpenSceneGraph/trunk/include/osgUtil/IncrementalCompileOperation =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/IncrementalCompileOperation (revision 12534) +++ /OpenSceneGraph/trunk/include/osgUtil/IncrementalCompileOperation (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -73,7 +73,7 @@ * the lower the amount of time the set aside the slower databases will paged it but with better * chance of avoid any frame drops. The default values are chosen to achieve the later when running - * on a modern mid to high end PC. + * on a modern mid to high end PC. * The way to compute the amount of available time use a scheme such as : - * availableTime = maximum(1.0/targetFrameRate - timeTakenDuringUpdateCullAndDraw, minimumTimeAvailableForGLCompileAndDeletePerFrame). + * availableTime = maximum(1.0/targetFrameRate - timeTakenDuringUpdateCullAndDraw, minimumTimeAvailableForGLCompileAndDeletePerFrame). */ void setTargetFrameRate(double tfr) { _targetFrameRate = tfr; } @@ -81,7 +81,7 @@ /** Get the target frame rate that the IncrementalCompileOperation should assume.*/ double getTargetFrameRate() const { return _targetFrameRate; } - + /** Set the minimum amount of time (in seconds) that should be made available for compiling and delete OpenGL objects per frame. - * Default value is 0.001 (1 millisecond). + * Default value is 0.001 (1 millisecond). * For usage see notes in setTargetFrameRate.*/ void setMinimumTimeAvailableForGLCompileAndDeletePerFrame(double ta) { _minimumTimeAvailableForGLCompileAndDeletePerFrame = ta; } @@ -176,5 +176,5 @@ osg::ElapsedTime timer; }; - + struct CompileOp : public osg::Referenced { @@ -231,5 +231,5 @@ class CompileSet; - + struct CompileCompletedCallback : public virtual osg::Referenced { Index: /OpenSceneGraph/trunk/include/osgUtil/HalfWayMapGenerator =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/HalfWayMapGenerator (revision 5328) +++ /OpenSceneGraph/trunk/include/osgUtil/HalfWayMapGenerator (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -21,7 +21,7 @@ { - /** This cube map generator produces an Half-way vector map, useful for + /** This cube map generator produces an Half-way vector map, useful for * hardware-based specular lighting effects. - * It computes: C = normalize(R - L), where C is the resulting color, + * It computes: C = normalize(R - L), where C is the resulting color, * R is the reflection vector and L is the light direction. */ Index: /OpenSceneGraph/trunk/include/osgUtil/OperationArrayFunctor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/OperationArrayFunctor (revision 12139) +++ /OpenSceneGraph/trunk/include/osgUtil/OperationArrayFunctor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -28,5 +28,5 @@ { public: - + virtual void apply(osg::Array&) {} // virtual void apply(osg::ByteArray& array) { T::process(array); } @@ -61,17 +61,17 @@ { template - void process(ArrayType & array) - { + void process(ArrayType & array) + { typedef typename ArrayType::ElementDataType ElementDataType; - + ElementDataType convertedVector; osgUtil::ConvertVec::convert(_vector, convertedVector); - + typename ArrayType::iterator it = array.begin(); std::advance(it, _begin); - + typename ArrayType::iterator end = it; std::advance(end, _count); - + for (; it < end; ++it) (*it) += convertedVector; @@ -80,5 +80,5 @@ unsigned int _begin; unsigned int _count; - + osg::Vec3d _vector; }; @@ -88,17 +88,17 @@ { template - void process(ArrayType & array) - { + void process(ArrayType & array) + { typedef typename ArrayType::ElementDataType ElementDataType; - + ElementDataType convertedVector; osgUtil::ConvertVec::convert(_vector, convertedVector); - + typename ArrayType::iterator it = array.begin(); std::advance(it, _begin); - + typename ArrayType::iterator end = it; std::advance(end, _count); - + for (; it < end; ++it) (*it) *= convertedVector; @@ -107,5 +107,5 @@ unsigned int _begin; unsigned int _count; - + osg::Vec3d _vector; }; Index: /OpenSceneGraph/trunk/include/osgUtil/ShaderGen =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/ShaderGen (revision 12139) +++ /OpenSceneGraph/trunk/include/osgUtil/ShaderGen (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgUtil/Tessellator =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/Tessellator (revision 12978) +++ /OpenSceneGraph/trunk/include/osgUtil/Tessellator (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -37,5 +37,5 @@ { public: - + Tessellator(); ~Tessellator(); @@ -72,5 +72,5 @@ /** Change the contours lists of the geometry into tessellated primitives (the * list of primitives in the original geometry is stored in the Tessellator for - * possible re-use. + * possible re-use. * The name remains retessellatePolygons although it now handles trifans, strips, quads etc. * as well as Polygons so as to not break old codes relying on this function name. */ @@ -80,5 +80,5 @@ * tessellate the contours; see gluTessNormal in red book or man pages. * GWM July 2005. Can improve teselation - * "For example, if you know that all polygons lie in the x-y plane, + * "For example, if you know that all polygons lie in the x-y plane, * call gluTessNormal(tess, 0.0, 0.0, 1.0) before rendering any polygons." */ @@ -90,5 +90,5 @@ { Prim(GLenum mode):_mode(mode) {} - + typedef std::vector VecList; @@ -96,7 +96,7 @@ VecList _vertices; }; - + virtual void beginTessellation(); - + void beginContour(); @@ -113,9 +113,9 @@ typedef std::vector< osg::ref_ptr > PrimList; - - PrimList& getPrimList() { return _primList; } - + + PrimList& getPrimList() { return _primList; } + void reset(); - + protected: @@ -126,5 +126,5 @@ void collectTessellation(osg::Geometry &cxgeom, unsigned int originalIndex); - + typedef std::map VertexPtrToIndexMap; void addContour(GLenum mode, unsigned int first, unsigned int last, osg::Vec3Array* vertices); @@ -138,5 +138,5 @@ void error(GLenum errorCode); - + static void CALLBACK beginCallback(GLenum which, void* userData); static void CALLBACK vertexCallback(GLvoid *data, void* userData); @@ -146,6 +146,6 @@ static void CALLBACK endCallback(void* userData); static void CALLBACK errorCallback(GLenum errorCode, void* userData); - - + + struct Vec3d { @@ -156,5 +156,5 @@ struct NewVertex { - + NewVertex(): _vpos(0), @@ -167,5 +167,5 @@ _f4(0), _v4(0) {} - + NewVertex(const NewVertex& nv): _vpos(nv._vpos), @@ -195,5 +195,5 @@ osg::Vec3 *_vpos; // added gwm Jan 2004 the vertex coords s.t. NewVertex can be used in a std::vector - + float _f1; osg::Vec3* _v1; @@ -207,9 +207,9 @@ float _f4; osg::Vec3* _v4; - - }; - + + }; + //change NewVertexList from std::map NewVertexList; - // because this has undefined order of insertion for new vertices. + // because this has undefined order of insertion for new vertices. // which occasionally corrupted the texture mapping. typedef std::vector NewVertexList; @@ -224,5 +224,5 @@ /** winding rule, which parts will become solid */ - WindingType _wtype; + WindingType _wtype; /** tessellation rule, which parts will become solid */ Index: /OpenSceneGraph/trunk/include/osgUtil/StateGraph =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/StateGraph (revision 12745) +++ /OpenSceneGraph/trunk/include/osgUtil/StateGraph (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -42,5 +42,5 @@ { public: - + typedef std::map< const osg::StateSet*, osg::ref_ptr > ChildList; @@ -58,8 +58,8 @@ ChildList _children; LeafList _leaves; - + mutable float _averageDistance; mutable float _minimumDistance; - + osg::ref_ptr _userData; @@ -89,13 +89,13 @@ { if (_parent) _depth = _parent->_depth + 1; - + if (_parent && _parent->_dynamic) _dynamic = true; else _dynamic = stateset->getDataVariance()==osg::Object::DYNAMIC; } - + ~StateGraph() {} - + StateGraph* cloneType() const { return new StateGraph; } - + void setUserData(osg::Referenced* obj) { _userData = obj; } osg::Referenced* getUserData() { return _userData.get(); } @@ -115,5 +115,5 @@ return _leaves.empty() && _children.empty(); } - + inline bool leaves_empty() const { @@ -134,9 +134,9 @@ } _averageDistance /= (float)_leaves.size(); - + } return _averageDistance; } - + inline float getMinimumDistance() const { @@ -152,5 +152,5 @@ if ((*itr)->_depth<_minimumDistance) _minimumDistance=(*itr)->_depth; } - + } return _minimumDistance; @@ -171,6 +171,6 @@ /** Recursively prune the StateGraph of empty children.*/ void prune(); - - + + inline StateGraph* find_or_insert(const osg::StateSet* stateset) { @@ -178,5 +178,5 @@ ChildList::iterator itr = _children.find(stateset); if (itr!=_children.end()) return itr->second.get(); - + // create a state group and insert it into the children list // then return the state group. @@ -210,5 +210,5 @@ // need to pop back root render graph. - do + do { return_path.push_back(sg_new); @@ -225,5 +225,5 @@ return; } - + // first handle the typical case which is two state groups @@ -231,5 +231,5 @@ if (sg_curr->_parent==sg_new->_parent) { - + // state has changed so need to pop old state. if (sg_curr->getStateSet()) state.popStateSet(); @@ -238,5 +238,5 @@ return; } - + // need to pop back up to the same depth as the new state group. @@ -246,5 +246,5 @@ sg_curr = sg_curr->_parent; } - + // use return path to trace back steps to sg_new. std::vector return_path; @@ -256,5 +256,5 @@ sg_new = sg_new->_parent; } - + // now pop back up both parent paths until they agree. @@ -270,5 +270,5 @@ sg_new = sg_new->_parent; } - + for(std::vector::reverse_iterator itr=return_path.rbegin(); itr!=return_path.rend(); @@ -289,7 +289,7 @@ sg_curr = sg_curr->_parent; } - - } - + + } + inline static int numToPop(StateGraph* sg_curr) { @@ -301,5 +301,5 @@ sg_curr = sg_curr->_parent; } - + return numToPop; } Index: /OpenSceneGraph/trunk/include/osgUtil/RenderStage =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/RenderStage (revision 12298) +++ /OpenSceneGraph/trunk/include/osgUtil/RenderStage (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -38,11 +38,11 @@ { public: - + RenderStage(); RenderStage(SortMode mode); - + RenderStage(const RenderStage& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - + virtual osg::Object* cloneType() const { return new RenderStage(); } virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new RenderStage(*this,copyop); } // note only implements a clone of type. @@ -51,6 +51,6 @@ virtual void reset(); - - + + /** Set the draw buffer used at the start of each frame draw. */ void setDrawBuffer(GLenum buffer, bool applyMask = true ) { _drawBuffer = buffer; setDrawBufferApplyMask( applyMask ); } @@ -88,8 +88,8 @@ /** Get the viewport. */ osg::Viewport* getViewport() { return _viewport.get(); } - + /** Set the initial view matrix.*/ void setInitialViewMatrix(const osg::RefMatrix* matrix) { _initialViewMatrix = matrix; } - + /** Get the initial view matrix.*/ const osg::RefMatrix* getInitialViewMatrix() { return _initialViewMatrix.get(); } @@ -108,22 +108,22 @@ - /** Set the clear color used in glClearColor(..). + /** Set the clear color used in glClearColor(..). * glClearColor is only called if mask & GL_COLOR_BUFFER_BIT is true*/ void setClearColor(const osg::Vec4& color) { _clearColor=color; } - + /** Get the clear color.*/ const osg::Vec4& getClearColor() const { return _clearColor; } - - /** Set the clear accum used in glClearAccum(..). + + /** Set the clear accum used in glClearAccum(..). * glClearAcumm is only called if mask & GL_ACCUM_BUFFER_BIT is true. */ void setClearAccum(const osg::Vec4& color) { _clearAccum=color; } - + /** Get the clear accum.*/ const osg::Vec4& getClearAccum() const { return _clearAccum; } - + /** Set the clear depth used in glClearDepth(..). Defaults to 1.0 * glClearDepth is only called if mask & GL_DEPTH_BUFFER_BIT is true. */ void setClearDepth(double depth) { _clearDepth=depth; } - + /** Get the clear depth.*/ double getClearDepth() const { return _clearDepth; } @@ -132,8 +132,8 @@ * glClearStencil is only called if mask & GL_STENCIL_BUFFER_BIT is true*/ void setClearStencil(int stencil) { _clearStencil=stencil; } - + /** Get the clear color.*/ int getClearStencil() const { return _clearStencil; } - + void setCamera(osg::Camera* camera) { if (_camera!=camera) { _camera = camera; _cameraRequiresSetUp = true; } } @@ -143,14 +143,14 @@ void setCameraRequiresSetUp(bool flag) { _cameraRequiresSetUp = flag; } bool getCameraRequiresSetUp() const { return _cameraRequiresSetUp; } - + /** Attempt the set the RenderStage from the Camera settings.*/ void runCameraSetUp(osg::RenderInfo& renderInfo); - + void setTexture(osg::Texture* texture, unsigned int level = 0, unsigned int face=0) { _texture = texture; _level = level; _face = face; } osg::Texture* getTexture() { return _texture.get(); } - + void setImage(osg::Image* image) { _image = image; } osg::Image* getImage() { return _image.get(); } - + void setImageReadPixelFormat(GLenum format) { _imageReadPixelFormat = format; } GLenum getImageReadPixelFormat() const { return _imageReadPixelFormat; } @@ -206,5 +206,5 @@ getPositionalStateContainer()->addPositionedAttribute(matrix,attr); } - + virtual void addPositionedTextureAttribute(unsigned int textureUnit, osg::RefMatrix* matrix,const osg::StateAttribute* attr) { @@ -215,5 +215,5 @@ virtual void sort(); - + virtual void drawPreRenderStages(osg::RenderInfo& renderInfo,RenderLeaf*& previous); @@ -221,5 +221,5 @@ virtual void drawInner(osg::RenderInfo& renderInfo,RenderLeaf*& previous, bool& doCopyTexture); - + virtual void drawPostRenderStages(osg::RenderInfo& renderInfo,RenderLeaf*& previous); @@ -230,10 +230,10 @@ void addPreRenderStage(RenderStage* rs, int order = 0); - + void addPostRenderStage(RenderStage* rs, int order = 0); /** Extract stats for current draw list. */ - bool getStats(Statistics& stats) const; - + bool getStats(Statistics& stats) const; + /** Compute the number of dynamic RenderLeaves.*/ virtual unsigned int computeNumberOfDynamicRenderLeaves() const; @@ -276,5 +276,5 @@ osg::ref_ptr _viewport; osg::ref_ptr _initialViewMatrix; - + GLenum _drawBuffer; bool _drawBufferApplyMask; @@ -290,5 +290,5 @@ bool _cameraRequiresSetUp; osg::Camera* _camera; - + osg::ref_ptr _texture; unsigned int _level; @@ -298,7 +298,7 @@ GLenum _imageReadPixelFormat; GLenum _imageReadPixelDataType; - + std::map< osg::Camera::BufferComponent, Attachment> _bufferAttachmentMap; - + osg::ref_ptr _fbo; osg::ref_ptr _resolveFbo; Index: /OpenSceneGraph/trunk/include/osgUtil/RenderLeaf =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/RenderLeaf (revision 10275) +++ /OpenSceneGraph/trunk/include/osgUtil/RenderLeaf (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -34,5 +34,5 @@ { public: - + inline RenderLeaf(osg::Drawable* drawable,osg::RefMatrix* projection,osg::RefMatrix* modelview, float depth=0.0f, unsigned int traversalNumber=0): @@ -48,5 +48,5 @@ } - + inline void set(osg::Drawable* drawable,osg::RefMatrix* projection,osg::RefMatrix* modelview, float depth=0.0f, unsigned int traversalNumber=0) { @@ -59,5 +59,5 @@ _traversalNumber = traversalNumber; } - + inline void reset() { @@ -70,14 +70,14 @@ _traversalNumber = 0; } - + virtual void render(osg::RenderInfo& renderInfo,RenderLeaf* previous); - + /// Allow StateGraph to change the RenderLeaf's _parent. friend class osgUtil::StateGraph; public: - - - + + + StateGraph* _parent; @@ -88,5 +88,5 @@ osg::Drawable* _drawable; const osg::Drawable* getDrawable() const { return _drawable; } -#endif +#endif osg::ref_ptr _projection; osg::ref_ptr _modelview; Index: /OpenSceneGraph/trunk/include/osgUtil/EdgeCollector =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/EdgeCollector (revision 12139) +++ /OpenSceneGraph/trunk/include/osgUtil/EdgeCollector (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -63,5 +63,5 @@ { public: - + struct Triangle; struct Edge; @@ -70,5 +70,5 @@ typedef std::list > IndexArrayList; - + ~EdgeCollector(); @@ -90,5 +90,5 @@ { Point(): _protected(false), _index(0) {} - + bool _protected; @@ -101,5 +101,5 @@ bool operator < ( const Point& rhs) const { return _vertex < rhs._vertex; } - + bool isBoundaryPoint() const; }; @@ -111,27 +111,27 @@ osg::ref_ptr _p1; osg::ref_ptr _p2; - + osg::ref_ptr _op1; osg::ref_ptr _op2; - + TriangleSet _triangles; - + bool operator < ( const Edge& rhs) const; - + bool operator == ( const Edge& rhs) const; bool operator != ( const Edge& rhs) const; - + void setOrderedPoints(Point* p1, Point* p2); - + void addTriangle(Triangle* triangle) { _triangles.insert(triangle); } - + bool isBoundaryEdge() const { return _triangles.size()<=1; } - + bool isAdjacentToBoundary() const { return isBoundaryEdge() || _p1->isBoundaryPoint() || _p2->isBoundaryPoint(); } - + bool endConnected(const Edge& rhs) const { return (_op2 == rhs._op1); } - + bool beginConnected(const Edge& rhs) const { return (_op1 == rhs._op2); } }; @@ -140,5 +140,5 @@ { Triangle() {} - + void clear(); @@ -146,24 +146,24 @@ void setOrderedPoints(Point* p1, Point* p2, Point* p3); - + float distance(const osg::Vec3& vertex) const { return _plane.distance(vertex); } - + bool isBoundaryTriangle() const { return (_e1->isBoundaryEdge() || _e2->isBoundaryEdge() || _e3->isBoundaryEdge()); } - + osg::ref_ptr _p1; osg::ref_ptr _p2; osg::ref_ptr _p3; - + osg::ref_ptr _op1; osg::ref_ptr _op2; osg::ref_ptr _op3; - + osg::ref_ptr _e1; osg::ref_ptr _e2; osg::ref_ptr _e3; - - osg::Plane _plane; + + osg::Plane _plane; }; @@ -171,37 +171,37 @@ { typedef std::vector > EdgeList; - + bool isClosed() { return (_edgeList.back()->endConnected(*_edgeList.front().get())); } - + osg::UIntArray * toIndexArray() const; - + EdgeList _edgeList; }; - + Triangle* addTriangle(unsigned int p1, unsigned int p2, unsigned int p3); Triangle* addTriangle(Point* p1, Point* p2, Point* p3); Edge* addEdge(Triangle* triangle, Point* p1, Point* p2); - + Point* addPoint(Triangle* triangle, unsigned int p1) { return addPoint(triangle,_originalPointList[p1].get()); } Point* addPoint(Triangle* triangle, Point* point); - + void getBoundaryEdgeList(EdgeList & el); bool extractBoundaryEdgeloop(EdgeList & el, Edgeloop & edgeloop); bool extractBoundaryEdgeloopList(EdgeList & el, EdgeloopList & edgeloopList); - + void getEdgeloopIndexList(IndexArrayList & ial); - + //protected: - + osg::Geometry* _geometry; - + EdgeSet _edgeSet; TriangleSet _triangleSet; PointSet _pointSet; PointList _originalPointList; - + }; Index: /OpenSceneGraph/trunk/include/osgUtil/ConvertVec =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/ConvertVec (revision 12139) +++ /OpenSceneGraph/trunk/include/osgUtil/ConvertVec (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -17,6 +17,6 @@ namespace osgUtil { -template struct ConvertVec @@ -32,7 +32,7 @@ { static void convert(InType & in, OutType & out) - { - out.set(static_cast(in.x()), - static_cast(in.y())); + { + out.set(static_cast(in.x()), + static_cast(in.y())); } }; @@ -42,8 +42,8 @@ { static void convert(InType & in, OutType & out) - { - out.set(static_cast(in.x()), - static_cast(in.y()), - static_cast(0.0)); + { + out.set(static_cast(in.x()), + static_cast(in.y()), + static_cast(0.0)); } }; @@ -53,9 +53,9 @@ { static void convert(InType & in, OutType & out) - { - out.set(static_cast(in.x()), - static_cast(in.y()), - static_cast(0.0), - static_cast(1.0)); + { + out.set(static_cast(in.x()), + static_cast(in.y()), + static_cast(0.0), + static_cast(1.0)); } }; @@ -69,7 +69,7 @@ { static void convert(InType & in, OutType & out) - { - out.set(static_cast(in.x()), - static_cast(in.y())); + { + out.set(static_cast(in.x()), + static_cast(in.y())); } }; @@ -79,8 +79,8 @@ { static void convert(InType & in, OutType & out) - { - out.set(static_cast(in.x()), - static_cast(in.y()), - static_cast(in.z())); + { + out.set(static_cast(in.x()), + static_cast(in.y()), + static_cast(in.z())); } }; @@ -90,9 +90,9 @@ { static void convert(InType & in, OutType & out) - { - out.set(static_cast(in.x()), - static_cast(in.y()), - static_cast(in.z()), - static_cast(1.0)); + { + out.set(static_cast(in.x()), + static_cast(in.y()), + static_cast(in.z()), + static_cast(1.0)); } }; @@ -106,7 +106,7 @@ { static void convert(InType & in, OutType & out) - { - out.set(static_cast(in.x()/in.w()), - static_cast(in.y()/in.w())); + { + out.set(static_cast(in.x()/in.w()), + static_cast(in.y()/in.w())); } }; @@ -116,8 +116,8 @@ { static void convert(InType & in, OutType & out) - { - out.set(static_cast(in.x()/in.w()), - static_cast(in.y()/in.w()), - static_cast(in.z()/in.w())); + { + out.set(static_cast(in.x()/in.w()), + static_cast(in.y()/in.w()), + static_cast(in.z()/in.w())); } }; @@ -127,9 +127,9 @@ { static void convert(InType & in, OutType & out) - { - out.set(static_cast(in.x()), - static_cast(in.y()), - static_cast(in.z()), - static_cast(in.w())); + { + out.set(static_cast(in.x()), + static_cast(in.y()), + static_cast(in.z()), + static_cast(in.w())); } }; Index: /OpenSceneGraph/trunk/include/osgUtil/Export =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/Export (revision 12221) +++ /OpenSceneGraph/trunk/include/osgUtil/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -38,6 +38,6 @@ #endif #else - #define OSGUTIL_EXPORT -#endif + #define OSGUTIL_EXPORT +#endif /** Index: /OpenSceneGraph/trunk/include/osgUtil/Optimizer =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/Optimizer (revision 11987) +++ /OpenSceneGraph/trunk/include/osgUtil/Optimizer (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -45,5 +45,5 @@ inline bool isOperationPermissibleForObject(const osg::StateSet* object) const; inline bool isOperationPermissibleForObject(const osg::StateAttribute* object) const; - inline bool isOperationPermissibleForObject(const osg::Drawable* object) const; + inline bool isOperationPermissibleForObject(const osg::Drawable* object) const; inline bool isOperationPermissibleForObject(const osg::Node* object) const; @@ -57,5 +57,5 @@ * For example of usage see examples/osgimpostor or osgviewer. */ - + class OSGUTIL_EXPORT Optimizer { @@ -118,5 +118,5 @@ /** Reset internal data to initial state - the getPermissibleOptionsMap is cleared.*/ void reset(); - + /** Traverse the node and its subgraph with a series of optimization * visitors, specified by the OptimizationOptions.*/ @@ -128,5 +128,5 @@ - /** Callback for customizing what operations are permitted on objects in the scene graph.*/ + /** Callback for customizing what operations are permitted on objects in the scene graph.*/ struct IsOperationPermissibleForObjectCallback : public osg::Referenced { @@ -135,29 +135,29 @@ return optimizer->isOperationPermissibleForObjectImplementation(stateset,option); } - + virtual bool isOperationPermissibleForObjectImplementation(const Optimizer* optimizer, const osg::StateAttribute* attribute,unsigned int option) const { return optimizer->isOperationPermissibleForObjectImplementation(attribute,option); } - + virtual bool isOperationPermissibleForObjectImplementation(const Optimizer* optimizer, const osg::Drawable* drawable,unsigned int option) const { return optimizer->isOperationPermissibleForObjectImplementation(drawable,option); } - + virtual bool isOperationPermissibleForObjectImplementation(const Optimizer* optimizer, const osg::Node* node,unsigned int option) const { return optimizer->isOperationPermissibleForObjectImplementation(node,option); } - - }; - - /** Set the callback for customizing what operations are permitted on objects in the scene graph.*/ + + }; + + /** Set the callback for customizing what operations are permitted on objects in the scene graph.*/ void setIsOperationPermissibleForObjectCallback(IsOperationPermissibleForObjectCallback* callback) { _isOperationPermissibleForObjectCallback=callback; } - /** Get the callback for customizing what operations are permitted on objects in the scene graph.*/ + /** Get the callback for customizing what operations are permitted on objects in the scene graph.*/ IsOperationPermissibleForObjectCallback* getIsOperationPermissibleForObjectCallback() { return _isOperationPermissibleForObjectCallback.get(); } - /** Get the callback for customizing what operations are permitted on objects in the scene graph.*/ + /** Get the callback for customizing what operations are permitted on objects in the scene graph.*/ const IsOperationPermissibleForObjectCallback* getIsOperationPermissibleForObjectCallback() const { return _isOperationPermissibleForObjectCallback.get(); } @@ -167,5 +167,5 @@ _permissibleOptimizationsMap[object] = options; } - + inline unsigned int getPermissibleOptimizationsForObject(const osg::Object* object) const { @@ -180,6 +180,6 @@ if (_isOperationPermissibleForObjectCallback.valid()) return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option); - else - return isOperationPermissibleForObjectImplementation(object,option); + else + return isOperationPermissibleForObjectImplementation(object,option); } @@ -188,6 +188,6 @@ if (_isOperationPermissibleForObjectCallback.valid()) return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option); - else - return isOperationPermissibleForObjectImplementation(object,option); + else + return isOperationPermissibleForObjectImplementation(object,option); } @@ -196,6 +196,6 @@ if (_isOperationPermissibleForObjectCallback.valid()) return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option); - else - return isOperationPermissibleForObjectImplementation(object,option); + else + return isOperationPermissibleForObjectImplementation(object,option); } @@ -204,6 +204,6 @@ if (_isOperationPermissibleForObjectCallback.valid()) return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option); - else - return isOperationPermissibleForObjectImplementation(object,option); + else + return isOperationPermissibleForObjectImplementation(object,option); } @@ -212,5 +212,5 @@ return (option & getPermissibleOptimizationsForObject(stateset))!=0; } - + bool isOperationPermissibleForObjectImplementation(const osg::StateAttribute* attribute, unsigned int option) const { @@ -246,5 +246,5 @@ return (option & getPermissibleOptimizationsForObject(node))!=0; } - + protected: @@ -252,13 +252,13 @@ typedef std::map PermissibleOptimizationsMap; - PermissibleOptimizationsMap _permissibleOptimizationsMap; - + PermissibleOptimizationsMap _permissibleOptimizationsMap; + public: /** Flatten Static Transform nodes by applying their transform to the - * geometry on the leaves of the scene graph, then removing the + * geometry on the leaves of the scene graph, then removing the * now redundant transforms. Static transformed Subgraphs that have multiple * parental paths above them are not flattened, if you require this then - * the subgraphs have to be duplicated - for this use the + * the subgraphs have to be duplicated - for this use the * FlattenStaticTransformsDuplicatingSharedSubgraphsVisitor. */ class OSGUTIL_EXPORT FlattenStaticTransformsVisitor : public BaseOptimizerVisitor @@ -285,5 +285,5 @@ typedef std::set NodeSet; typedef std::set TransformSet; - + TransformStack _transformStack; NodeSet _excludedNodeSet; @@ -299,5 +299,5 @@ * of duplicated and flatten individually. This results in more static transforms * being removed, but also means that more data is generated, and as a result may - * not always be the most appropriate flatten visitor to use.*/ + * not always be the most appropriate flatten visitor to use.*/ class OSGUTIL_EXPORT FlattenStaticTransformsDuplicatingSharedSubgraphsVisitor : public BaseOptimizerVisitor { @@ -325,5 +325,5 @@ }; - /** Combine Static Transform nodes that sit above one another.*/ + /** Combine Static Transform nodes that sit above one another.*/ class OSGUTIL_EXPORT CombineStaticTransformsVisitor : public BaseOptimizerVisitor { @@ -357,5 +357,5 @@ virtual void apply(osg::Geode& geode); virtual void apply(osg::Group& group); - + void removeEmptyNodes(); @@ -372,10 +372,10 @@ RemoveRedundantNodesVisitor(Optimizer* optimizer=0): BaseOptimizerVisitor(optimizer, REMOVE_REDUNDANT_NODES) {} - + virtual void apply(osg::Group& group); virtual void apply(osg::Transform& transform); - + bool isOperationPermissible(osg::Node& node); - + void removeRedundantNodes(); @@ -392,7 +392,7 @@ RemoveLoadedProxyNodesVisitor(Optimizer* optimizer=0): BaseOptimizerVisitor(optimizer, REMOVE_LOADED_PROXY_NODES) {} - + virtual void apply(osg::ProxyNode& group); - + void removeRedundantNodes(); @@ -431,5 +431,5 @@ }; - + /** Optimize State in the scene graph by removing duplicate state, * replacing it with shared instances, both for StateAttributes, @@ -451,5 +451,5 @@ } - /** empty visitor, make it ready for next traversal.*/ + /** empty visitor, make it ready for next traversal.*/ virtual void reset(); @@ -463,5 +463,5 @@ void addStateSet(osg::StateSet* stateset,osg::Object* obj); - + inline bool optimize(osg::Object::DataVariance variance) { @@ -474,5 +474,5 @@ // note, one element for DYNAMIC, STATIC and UNSPECIFIED bool _optimize[3]; - + StateSetMap _statesets; @@ -510,7 +510,7 @@ void checkGeode(osg::Geode& geode); - - }; - + + }; + class OSGUTIL_EXPORT MakeFastGeometryVisitor : public BaseOptimizerVisitor { @@ -524,7 +524,7 @@ void checkGeode(osg::Geode& geode); - - }; - + + }; + class OSGUTIL_EXPORT MergeGeometryVisitor : public BaseOptimizerVisitor { @@ -540,5 +540,5 @@ _targetMaximumNumberOfVertices = num; } - + unsigned int getTargetMaximumNumberOfVertices() const { @@ -574,13 +574,13 @@ SpatializeGroupsVisitor(Optimizer* optimizer=0): BaseOptimizerVisitor(optimizer, SPATIALIZE_GROUPS) {} - + virtual void apply(osg::Group& group); virtual void apply(osg::Geode& geode); - + bool divide(unsigned int maxNumTreesPerCell=8); - + bool divide(osg::Group* group, unsigned int maxNumTreesPerCell); bool divide(osg::Geode* geode, unsigned int maxNumTreesPerCell); - + typedef std::set GroupsToDivideList; GroupsToDivideList _groupsToDivideList; @@ -597,12 +597,12 @@ CopySharedSubgraphsVisitor(Optimizer* optimizer=0): BaseOptimizerVisitor(optimizer, COPY_SHARED_NODES) {} - + virtual void apply(osg::Node& node); void copySharedNodes(); - + typedef std::set SharedNodeList; SharedNodeList _sharedNodeList; - + }; @@ -621,5 +621,5 @@ _changeClientImageStorage(changeClientImageStorage), _valueClientImageStorage(valueClientImageStorage), _changeAnisotropy(changeAnisotropy), _valueAnisotropy(valueAnisotropy) {} - + virtual void apply(osg::Geode& node); virtual void apply(osg::Node& node); @@ -634,5 +634,5 @@ }; - + /** Flatten MatrixTransform/Billboard pairs.*/ class OSGUTIL_EXPORT FlattenBillboardVisitor : public BaseOptimizerVisitor @@ -649,10 +649,10 @@ virtual void apply(osg::Billboard& billboard); - void process(); + void process(); BillboardNodePathMap _billboards; }; - + /** Texture Atlas Builder creates a set of textures/images which each contain multiple images. * Texture Atlas' are used to make it possible to use much wider batching of data. */ @@ -661,12 +661,12 @@ public: TextureAtlasBuilder(); - + void reset(); - + void setMaximumAtlasSize(int width, int height); int getMaximumAtlasWidth() const { return _maximumAtlasWidth; } int getMaximumAtlasHeight() const { return _maximumAtlasHeight; } - + void setMargin(int margin); int getMargin() const { return _margin; } @@ -674,32 +674,32 @@ void addSource(const osg::Image* image); void addSource(const osg::Texture2D* texture); - + unsigned int getNumSources() const { return _sourceList.size(); } const osg::Image* getSourceImage(unsigned int i) { return _sourceList[i]->_image.get(); } const osg::Texture2D* getSourceTexture(unsigned int i) { return _sourceList[i]->_texture.get(); } - + void buildAtlas(); osg::Image* getImageAtlas(unsigned int i); osg::Texture2D* getTextureAtlas(unsigned int i); osg::Matrix getTextureMatrix(unsigned int i); - + osg::Image* getImageAtlas(const osg::Image* image); osg::Texture2D* getTextureAtlas(const osg::Image* image); osg::Matrix getTextureMatrix(const osg::Image* image); - + osg::Image* getImageAtlas(const osg::Texture2D* textue); osg::Texture2D* getTextureAtlas(const osg::Texture2D* texture); osg::Matrix getTextureMatrix(const osg::Texture2D* texture); - + protected: - + int _maximumAtlasWidth; int _maximumAtlasHeight; int _margin; - + // forward declare class Atlas; - + class Source : public osg::Referenced { @@ -713,5 +713,5 @@ Source(const osg::Texture2D* texture): _x(0),_y(0),_atlas(0),_texture(texture) { if (texture) _image = texture->getImage(); } - + int _x; int _y; @@ -720,11 +720,11 @@ osg::ref_ptr _image; osg::ref_ptr _texture; - + bool suitableForAtlas(int maximumAtlasWidth, int maximumAtlasHeight, int margin); osg::Matrix computeTextureMatrix() const; - - - protected: - + + + protected: + virtual ~Source() {} }; @@ -744,5 +744,5 @@ _height(0), _indexFirstOfRow(0){} - + int _maximumAtlasWidth; int _maximumAtlasHeight; @@ -751,7 +751,7 @@ osg::ref_ptr _texture; osg::ref_ptr _image; - + SourceList _sourceList; - + int _x; int _y; @@ -769,11 +769,11 @@ void clampToNearestPowerOfTwoSize(); void copySources(); - + protected: virtual ~Atlas() {} }; - + typedef std::vector< osg::ref_ptr > AtlasList; - + Source* getSource(const osg::Image* image); Source* getSource(const osg::Texture2D* texture); @@ -792,6 +792,6 @@ }; - - /** Optimize texture usage in the scene graph by combining textures into texture atlas + + /** Optimize texture usage in the scene graph by combining textures into texture atlas * Use of texture atlas cuts down on the number of seperate states in the scene, reducing * state changes and improving the chances of use larger batches of geomertry.*/ @@ -807,5 +807,5 @@ TextureAtlasBuilder& getTextureAtlasBuilder() { return _builder; } - /** empty visitor, make it ready for next traversal.*/ + /** empty visitor, make it ready for next traversal.*/ virtual void reset(); @@ -851,5 +851,5 @@ void applyStateSet(osg::StateSet& stateset); - + void applyDrawable(osg::Drawable& drawable); @@ -859,20 +859,20 @@ inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::StateSet* object) const { - return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) : true; + return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) : true; } inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::StateAttribute* object) const { - return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) : true; + return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) : true; } inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::Drawable* object) const { - return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) : true; + return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) : true; } inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::Node* object) const { - return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) : true; + return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) : true; } Index: /OpenSceneGraph/trunk/include/osgUtil/PositionalStateContainer =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/PositionalStateContainer (revision 6060) +++ /OpenSceneGraph/trunk/include/osgUtil/PositionalStateContainer (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -30,5 +30,5 @@ { public: - + PositionalStateContainer(); @@ -40,5 +40,5 @@ virtual void reset(); - + typedef std::pair< osg::ref_ptr , osg::ref_ptr > AttrMatrixPair; typedef std::vector< AttrMatrixPair > AttrMatrixList; @@ -60,12 +60,12 @@ virtual void draw(osg::State& state,RenderLeaf*& previous, const osg::Matrix* postMultMatrix = 0); - + public: - + AttrMatrixList _attrList; TexUnitAttrMatrixListMap _texAttrListMap; - + protected: - + virtual ~PositionalStateContainer(); Index: /OpenSceneGraph/trunk/include/osgUtil/DisplayRequirementsVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/DisplayRequirementsVisitor (revision 9377) +++ /OpenSceneGraph/trunk/include/osgUtil/DisplayRequirementsVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -36,13 +36,13 @@ * alpha and stencil off.*/ DisplayRequirementsVisitor(); - + META_NodeVisitor("osgUtil","DisplayRequirementsVisitor") /** Set the DisplaySettings. */ inline void setDisplaySettings(osg::DisplaySettings* ds) { _ds = ds; } - + /** Get the DisplaySettings */ inline const osg::DisplaySettings* getDisplaySettings() const { return _ds.get(); } - + virtual void applyStateSet(osg::StateSet& stateset); @@ -50,9 +50,9 @@ virtual void apply(osg::Geode& geode); - + protected: - + osg::ref_ptr _ds; - + }; Index: /OpenSceneGraph/trunk/include/osgUtil/GLObjectsVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/GLObjectsVisitor (revision 9917) +++ /OpenSceneGraph/trunk/include/osgUtil/GLObjectsVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -24,5 +24,5 @@ namespace osgUtil { -/** Visitor for traversing scene graph and setting each osg::Drawable's _useDisplayList flag, +/** Visitor for traversing scene graph and setting each osg::Drawable's _useDisplayList flag, * with option to immediately compile osg::Drawable OpenGL Display lists and * osg::StateAttribute's. @@ -45,16 +45,16 @@ CHECK_BLACK_LISTED_MODES = 0x100 }; - + typedef unsigned int Mode; /** Construct a GLObjectsVisitor to traverse all children, operating on - * node according to specified mode, such as to compile or release - * display list/texture objects etc. Default mode is to compile + * node according to specified mode, such as to compile or release + * display list/texture objects etc. Default mode is to compile * GL objects. */ - GLObjectsVisitor(Mode mode=COMPILE_DISPLAY_LISTS|COMPILE_STATE_ATTRIBUTES|CHECK_BLACK_LISTED_MODES); - + GLObjectsVisitor(Mode mode=COMPILE_DISPLAY_LISTS|COMPILE_STATE_ATTRIBUTES|CHECK_BLACK_LISTED_MODES); + META_NodeVisitor("osg","GLObjectsVisitor") - + virtual void reset() { @@ -63,5 +63,5 @@ } - + /** Set the operational mode of what operations to do on the scene graph.*/ void setMode(Mode mode) { _mode = mode; } @@ -69,5 +69,5 @@ /** Get the operational mode.*/ Mode getMode() const { return _mode; } - + /** Set the State to use during traversal. */ @@ -76,5 +76,5 @@ _renderInfo.setState(state); } - + osg::State* getState() { @@ -86,5 +86,5 @@ _renderInfo = renderInfo; } - + osg::RenderInfo& getRenderInfo() { @@ -94,6 +94,6 @@ /** Simply traverse using standard NodeVisitor traverse method.*/ virtual void apply(osg::Node& node); - - /** For each Geode visited set the display list usage according to the + + /** For each Geode visited set the display list usage according to the * _displayListMode. */ @@ -125,7 +125,7 @@ virtual void operator () (osg::GraphicsContext* context); - + protected: - + osg::ref_ptr _subgraph; GLObjectsVisitor::Mode _mode; Index: /OpenSceneGraph/trunk/include/osgUtil/DrawElementTypeSimplifier =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/DrawElementTypeSimplifier (revision 12139) +++ /OpenSceneGraph/trunk/include/osgUtil/DrawElementTypeSimplifier (revision 13041) @@ -1,12 +1,12 @@ /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,5 +32,5 @@ { public: - + META_NodeVisitor("osgUtil","DrawElementTypeSimplifierVisitor"); Index: /OpenSceneGraph/trunk/include/osgUtil/DelaunayTriangulator =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/DelaunayTriangulator (revision 11704) +++ /OpenSceneGraph/trunk/include/osgUtil/DelaunayTriangulator (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,5 +26,5 @@ #include -namespace osgUtil +namespace osgUtil { @@ -44,5 +44,5 @@ DelaunayConstraint() { } - /** Each primitiveset is a list of vertices which may be closed by joining up to its start + /** Each primitiveset is a list of vertices which may be closed by joining up to its start * to make a loop. Constraints should be simple lines, not crossing themselves. * Constraints which cross other constraints can cause difficulties - see the example @@ -57,7 +57,7 @@ /** Get the filling primitive. One: * triangulate must have bneen called and - * two: triangle list is filled when + * two: triangle list is filled when * DelaunayTriangulator::removeInternalTriangles is called. - * These return the triangles removed from the delaunay triangulation by + * These return the triangles removed from the delaunay triangulation by * DelaunayTriangulator::removeInternalTriangles. */ inline const osg::DrawElementsUInt *getTriangles() const { return prim_tris_.get(); } @@ -82,5 +82,5 @@ */ void removeVerticesInside(const DelaunayConstraint *dco); - + /** return winding number as a float of loop around testpoint; may use multiple loops * does not reject points on the edge or very very close to the edge */ @@ -151,5 +151,5 @@ /** Get the generated primitive (call triangulate() first). */ inline osg::DrawElementsUInt *getTriangles() { return prim_tris_.get(); } - + /** remove the triangles internal to the constraint loops. * (Line strips cannot remove any internal triangles). */ Index: /OpenSceneGraph/trunk/include/osgUtil/ReflectionMapGenerator =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/ReflectionMapGenerator (revision 5328) +++ /OpenSceneGraph/trunk/include/osgUtil/ReflectionMapGenerator (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -19,5 +19,5 @@ { - /** This is the most simple cube map generator. It performs a direct association + /** This is the most simple cube map generator. It performs a direct association between reflection vector and RGBA color (C = R). */ Index: /OpenSceneGraph/trunk/include/osgUtil/TransformAttributeFunctor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/TransformAttributeFunctor (revision 12400) +++ /OpenSceneGraph/trunk/include/osgUtil/TransformAttributeFunctor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,8 +27,8 @@ { public: - + /** Construct a functor to transform a drawable's vertex and normal attributes by specified matrix.*/ TransformAttributeFunctor(const osg::Matrix& m); - + virtual ~TransformAttributeFunctor(); Index: /OpenSceneGraph/trunk/include/osgUtil/TriStripVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/TriStripVisitor (revision 8651) +++ /OpenSceneGraph/trunk/include/osgUtil/TriStripVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -33,6 +33,6 @@ /// default to traversing all children. - TriStripVisitor(Optimizer* optimizer=0) : - BaseOptimizerVisitor( optimizer, Optimizer::TRISTRIP_GEOMETRY), + TriStripVisitor(Optimizer* optimizer=0) : + BaseOptimizerVisitor( optimizer, Optimizer::TRISTRIP_GEOMETRY), _cacheSize( 16 ), _minStripSize( 2 ), @@ -56,27 +56,27 @@ _cacheSize = size; } - + inline unsigned int getCacheSize() const { return _cacheSize; } - + inline void setMinStripSize( unsigned int size ) { _minStripSize = size; } - + inline unsigned int getMinStripSize() const { return _minStripSize; } - - + + void setGenerateFourPointPrimitivesQuads(bool flag) { _generateFourPointPrimitivesQuads = flag; } bool getGenerateFourPointPrimitivesQuads() const { return _generateFourPointPrimitivesQuads; } - + private: - + typedef std::set GeometryList; Index: /OpenSceneGraph/trunk/include/osgUtil/UpdateVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/UpdateVisitor (revision 9377) +++ /OpenSceneGraph/trunk/include/osgUtil/UpdateVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -33,5 +33,5 @@ * Basic UpdateVisitor implementation for animating a scene. * This visitor traverses the scene graph, calling each nodes appCallback if - * it exists. + * it exists. */ class OSGUTIL_EXPORT UpdateVisitor : public osg::NodeVisitor @@ -48,10 +48,10 @@ /** During traversal each type of node calls its callbacks and its children traversed. */ virtual void apply(osg::Node& node) { handle_callbacks_and_traverse(node); } - + virtual void apply(osg::Geode& node) { handle_geode_callbacks(node); } virtual void apply(osg::Billboard& node) { handle_geode_callbacks(node); } - + virtual void apply(osg::LightSource& node) { handle_callbacks_and_traverse(node); } - + virtual void apply(osg::Group& node) { handle_callbacks_and_traverse(node); } virtual void apply(osg::Transform& node) { handle_callbacks_and_traverse(node); } @@ -69,5 +69,5 @@ /** Prevent unwanted copy operator.*/ UpdateVisitor& operator = (const UpdateVisitor&) { return *this; } - + inline void handle_callbacks(osg::StateSet* stateset) { @@ -77,5 +77,5 @@ } } - + inline void handle_callbacks_and_traverse(osg::Node& node) { @@ -99,12 +99,12 @@ osg::Drawable::UpdateCallback* callback = geode.getDrawable(i)->getUpdateCallback(); if (callback) callback->update(this,geode.getDrawable(i)); - + handle_callbacks(geode.getDrawable(i)->getStateSet()); } - + // should we traverse just in case a subclass of Geode adds children?? Won't for now as // Geode's arn't designed to have children. // traverse(geode); - } + } }; Index: /OpenSceneGraph/trunk/include/osgUtil/Simplifier =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/Simplifier (revision 9377) +++ /OpenSceneGraph/trunk/include/osgUtil/Simplifier (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -51,5 +51,5 @@ void setSmoothing(bool on) { _smoothing = on; } bool getSmoothing() const { return _smoothing; } - + class ContinueSimplificationCallback : public osg::Referenced { @@ -60,14 +60,14 @@ return simplifier.continueSimplificationImplementation(nextError, numOriginalPrimitives, numRemainingPrimitives); } - + protected: virtual ~ContinueSimplificationCallback() {} }; - + void setContinueSimplificationCallback(ContinueSimplificationCallback* cb) { _continueSimplificationCallback = cb; } ContinueSimplificationCallback* getContinueSimplificationCallback() { return _continueSimplificationCallback.get(); } const ContinueSimplificationCallback* getContinueSimplificationCallback() const { return _continueSimplificationCallback.get(); } - - + + bool continueSimplification(float nextError, unsigned int numOriginalPrimitives, unsigned int numRemainingPrimitives) const { @@ -97,5 +97,5 @@ /** simply the geometry.*/ void simplify(osg::Geometry& geometry); - + typedef std::vector IndexList; /// a list of point indices @@ -105,5 +105,5 @@ protected: - + double _sampleRatio; double _maximumError; @@ -111,7 +111,7 @@ bool _triStrip; bool _smoothing; - + osg::ref_ptr _continueSimplificationCallback; - + }; Index: /OpenSceneGraph/trunk/include/osgUtil/ReversePrimitiveFunctor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/ReversePrimitiveFunctor (revision 12139) +++ /OpenSceneGraph/trunk/include/osgUtil/ReversePrimitiveFunctor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -25,9 +25,9 @@ { public: - + virtual ~ReversePrimitiveFunctor() {} - + osg::PrimitiveSet * getReversedPrimitiveSet() { return _reversedPrimitiveSet.get(); } - + virtual void setVertexArray(unsigned int , const osg::Vec2* ) {} virtual void setVertexArray(unsigned int , const osg::Vec3* ) {} @@ -36,21 +36,21 @@ virtual void setVertexArray(unsigned int , const osg::Vec3d* ) {} virtual void setVertexArray(unsigned int , const osg::Vec4d* ) {} - + virtual void drawArrays(GLenum mode,GLint first,GLsizei count); virtual void drawElements(GLenum mode,GLsizei count, const GLubyte* indices); virtual void drawElements(GLenum mode,GLsizei count, const GLushort* indices); virtual void drawElements(GLenum mode,GLsizei count, const GLuint* indices); - - + + /// Mimics the OpenGL \c glBegin() function. virtual void begin(GLenum mode); virtual void vertex(unsigned int /*pos*/); virtual void end(); - - + + osg::ref_ptr _reversedPrimitiveSet; - + private: - + bool _running; }; Index: /OpenSceneGraph/trunk/include/osgUtil/RenderBin =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/RenderBin (revision 12298) +++ /OpenSceneGraph/trunk/include/osgUtil/RenderBin (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,6 +26,6 @@ class Statistics; /** - * RenderBin base class. Renderbin contains geometries to be rendered as a group, - * renderbins are rendered once each. They can improve efficiency or + * RenderBin base class. Renderbin contains geometries to be rendered as a group, + * renderbins are rendered once each. They can improve efficiency or * use different rendering algorithms. * A renderBin can contain further renderBins producing a tree hierarchy of renderBins. @@ -35,7 +35,7 @@ public: - typedef std::vector RenderLeafList; + typedef std::vector RenderLeafList; typedef std::vector StateGraphList; - typedef std::map< int, osg::ref_ptr > RenderBinList; + typedef std::map< int, osg::ref_ptr > RenderBinList; enum SortMode @@ -117,5 +117,5 @@ virtual void sortTraversalOrder(); - struct SortCallback : public osg::Referenced + struct SortCallback : public osg::Referenced { virtual void sortImplementation(RenderBin*) = 0; @@ -132,5 +132,5 @@ virtual void drawImplementation(osg::RenderInfo& renderInfo,RenderLeaf*& previous); - struct DrawCallback : public osg::Referenced + struct DrawCallback : public osg::Referenced { virtual void drawImplementation(RenderBin* bin,osg::RenderInfo& renderInfo,RenderLeaf*& previous) = 0; @@ -157,5 +157,5 @@ virtual ~RenderBin(); - + int _binNum; RenderBin* _parent; @@ -165,5 +165,5 @@ RenderLeafList _renderLeafList; - bool _sorted; + bool _sorted; SortMode _sortMode; osg::ref_ptr _sortCallback; @@ -179,3 +179,3 @@ #endif - + Index: /OpenSceneGraph/trunk/include/osgUtil/PrintVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/PrintVisitor (revision 12139) +++ /OpenSceneGraph/trunk/include/osgUtil/PrintVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -40,5 +40,5 @@ protected: - + PrintVisitor& operator = (const PrintVisitor&) { return *this; } Index: /OpenSceneGraph/trunk/include/osgUtil/HighlightMapGenerator =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/HighlightMapGenerator (revision 5328) +++ /OpenSceneGraph/trunk/include/osgUtil/HighlightMapGenerator (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -21,7 +21,7 @@ { - /** This cube map generator produces a specular highlight map. - * The vector-color association is: C = (R dot (-L)) ^ n, where C is the - * resulting color, R is the reflection vector, L is the light direction + /** This cube map generator produces a specular highlight map. + * The vector-color association is: C = (R dot (-L)) ^ n, where C is the + * resulting color, R is the reflection vector, L is the light direction * and n is the specular exponent. */ @@ -29,7 +29,7 @@ public: HighlightMapGenerator( - const osg::Vec3 &light_direction, - const osg::Vec4 &light_color, - float specular_exponent, + const osg::Vec3 &light_direction, + const osg::Vec4 &light_color, + float specular_exponent, int texture_size = 64); Index: /OpenSceneGraph/trunk/include/osg/Viewport =================================================================== --- /OpenSceneGraph/trunk/include/osg/Viewport (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/Viewport (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -20,5 +20,5 @@ namespace osg { -/** Encapsulate OpenGL glViewport. */ +/** Encapsulate OpenGL glViewport. */ class OSG_EXPORT Viewport : public StateAttribute { @@ -31,5 +31,5 @@ #endif Viewport(); - + Viewport(value_type x,value_type y,value_type width,value_type height): _x(x), @@ -37,5 +37,5 @@ _width(width), _height(height) {} - + /** Copy constructor using CopyOp to manage deep vs shallow copy. */ @@ -48,5 +48,5 @@ META_StateAttribute(osg, Viewport,VIEWPORT); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -61,5 +61,5 @@ COMPARE_StateAttribute_Parameter(_width) COMPARE_StateAttribute_Parameter(_height) - + return 0; // passed all the above comparison macros, must be equal. } @@ -73,5 +73,5 @@ } -#if 0 +#if 0 void getViewport(int& x,int& y,int& width,int& height) const { @@ -108,5 +108,5 @@ */ inline double aspectRatio() const { if (_height!=0) return (double)_width/(double)_height; else return 1.0; } - + /** Compute the Window Matrix which takes projected coords into Window coordinates. * To convert local coordinates into window coordinates use v_window = v_local * MVPW matrix, @@ -123,5 +123,5 @@ protected: - + virtual ~Viewport(); Index: /OpenSceneGraph/trunk/include/osg/PointSprite =================================================================== --- /OpenSceneGraph/trunk/include/osg/PointSprite (revision 6311) +++ /OpenSceneGraph/trunk/include/osg/PointSprite (revision 13041) @@ -38,5 +38,5 @@ /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ - PointSprite(const PointSprite& ps,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): + PointSprite(const PointSprite& ps,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): StateAttribute(ps,copyop), _coordOriginMode(ps._coordOriginMode) {} @@ -61,10 +61,10 @@ static bool isPointSpriteSupported(unsigned int context); - + enum CoordOriginMode { UPPER_LEFT = GL_UPPER_LEFT, LOWER_LEFT = GL_LOWER_LEFT }; - + inline void setCoordOriginMode(CoordOriginMode mode) { _coordOriginMode = mode; } inline CoordOriginMode getCoordOriginMode() const { return _coordOriginMode; } @@ -72,5 +72,5 @@ protected: virtual ~PointSprite(); - + CoordOriginMode _coordOriginMode; }; Index: /OpenSceneGraph/trunk/include/osg/Node =================================================================== --- /OpenSceneGraph/trunk/include/osg/Node (revision 12897) +++ /OpenSceneGraph/trunk/include/osg/Node (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -60,5 +60,5 @@ virtual const char* libraryName() const { return #library; } \ virtual void accept(osg::NodeVisitor& nv) { if (nv.validNodeMask(*this)) { nv.pushOntoNodePath(this); nv.apply(*this); nv.popFromNodePath(); } } \ - + /** Base class for all internal nodes in the scene graph. @@ -70,5 +70,5 @@ /** Construct a node. - Initialize the parent list to empty, node name to "" and + Initialize the parent list to empty, node name to "" and bounding sphere dirty flag to true.*/ Node(); @@ -146,5 +146,5 @@ virtual void ascend(NodeVisitor& nv); /** Traverse downwards : calls children's accept method with NodeVisitor.*/ - virtual void traverse(NodeVisitor& /*nv*/) {} + virtual void traverse(NodeVisitor& /*nv*/) {} /** A vector of osg::Group pointers which is used to store the parent(s) of node.*/ @@ -154,5 +154,5 @@ inline const ParentList& getParents() const { return _parents; } - /** Get the a copy of parent list of node. A copy is returned to + /** Get the a copy of parent list of node. A copy is returned to * prevent modification of the parent list.*/ inline ParentList getParents() { return _parents; } @@ -180,5 +180,5 @@ * The optional Node* haltTraversalAtNode allows the user to prevent traversal beyond a specifed node. */ MatrixList getWorldMatrices(const osg::Node* haltTraversalAtNode=0) const; - + /** Set update node callback, called during update traversal. */ @@ -286,5 +286,5 @@ inline unsigned int getNumChildrenWithOccluderNodes() const { return _numChildrenWithOccluderNodes; } - + /** return true if this node is an OccluderNode or the subgraph below this node are OccluderNodes.*/ bool containsOccluderNodes() const; @@ -354,5 +354,5 @@ /** Add a description string to the node.*/ void addDescription(const std::string& desc); - + /** Set the initial bounding volume to use when computing the overall bounding volume.*/ @@ -373,9 +373,9 @@ { _boundingSphere = _initialBound; - if (_computeBoundCallback.valid()) + if (_computeBoundCallback.valid()) _boundingSphere.expandBy(_computeBoundCallback->computeBound(*this)); else _boundingSphere.expandBy(computeBound()); - + _boundingSphereComputed = true; } @@ -459,8 +459,8 @@ bool _cullingActive; - unsigned int _numChildrenWithCullingDisabled; + unsigned int _numChildrenWithCullingDisabled; void setNumChildrenWithCullingDisabled(unsigned int num); - unsigned int _numChildrenWithOccluderNodes; + unsigned int _numChildrenWithOccluderNodes; void setNumChildrenWithOccluderNodes(unsigned int num); Index: /OpenSceneGraph/trunk/include/osg/CullStack =================================================================== --- /OpenSceneGraph/trunk/include/osg/CullStack (revision 9576) +++ /OpenSceneGraph/trunk/include/osg/CullStack (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -29,15 +29,15 @@ public: - - + + CullStack(); CullStack(const CullStack& cs); - + ~CullStack(); - + typedef std::vector OccluderList; void reset(); - + void pushCullingSet(); void popCullingSet(); @@ -64,5 +64,5 @@ return getCurrentCullingSet().pixelSize(v,radius); } - + /** Compute the pixel size of the bounding sphere.*/ float pixelSize(const BoundingSphere& bs) const @@ -76,5 +76,5 @@ return getCurrentCullingSet().clampedPixelSize(v,radius); } - + /** Compute the pixel size of the bounding sphere. fabs()ed to always be positive. */ float clampedPixelSize(const BoundingSphere& bs) const @@ -102,10 +102,10 @@ return bb.valid() && getCurrentCullingSet().isCulled(bb); } - + inline bool isCulled(const BoundingSphere& bs) { return getCurrentCullingSet().isCulled(bs); } - + inline bool isCulled(const osg::Node& node) { @@ -117,22 +117,22 @@ getCurrentCullingSet().pushCurrentMask(); } - + inline void popCurrentMask() { getCurrentCullingSet().popCurrentMask(); } - - + + typedef std::vector< CullingSet > CullingStack; inline CullingStack& getClipSpaceCullingStack() { return _clipspaceCullingStack; } - + inline CullingStack& getProjectionCullingStack() { return _projectionCullingStack; } - + inline CullingStack& getModelViewCullingStack() { return _modelviewCullingStack; } - + inline CullingSet& getCurrentCullingSet() { return *_back_modelviewCullingStack; } inline const CullingSet& getCurrentCullingSet() const { return *_back_modelviewCullingStack; } - + inline osg::Viewport* getViewport(); inline osg::RefMatrix* getModelViewMatrix(); @@ -140,5 +140,5 @@ inline osg::Matrix getWindowMatrix(); inline const osg::RefMatrix* getMVPW(); - + inline const osg::Vec3& getReferenceViewPoint() const { return _referenceViewPoints.back(); } inline void pushReferenceViewPoint(const osg::Vec3& viewPoint) { _referenceViewPoints.push_back(viewPoint); } @@ -160,8 +160,8 @@ return osg::Vec3(-matrix(0,2),-matrix(1,2),-matrix(2,2)); } - + protected: - + // base set of shadow volume occluder to use in culling. ShadowVolumeOccluderList _occluderList; @@ -176,5 +176,5 @@ typedef fast_back_stack > ViewportStack; ViewportStack _viewportStack; - + typedef fast_back_stack EyePointStack; EyePointStack _referenceViewPoints; @@ -196,12 +196,12 @@ ref_ptr _identity; - + typedef std::vector< osg::ref_ptr > MatrixList; MatrixList _reuseMatrixList; unsigned int _currentReuseMatrixIndex; - + inline osg::RefMatrix* createOrReuseMatrix(const osg::Matrix& value); - + }; @@ -276,5 +276,5 @@ { // skip of any already reused matrix. - while (_currentReuseMatrixIndex<_reuseMatrixList.size() && + while (_currentReuseMatrixIndex<_reuseMatrixList.size() && _reuseMatrixList[_currentReuseMatrixIndex]->referenceCount()>1) { @@ -300,3 +300,3 @@ } // end of namespace -#endif +#endif Index: /OpenSceneGraph/trunk/include/osg/DisplaySettings =================================================================== --- /OpenSceneGraph/trunk/include/osg/DisplaySettings (revision 11805) +++ /OpenSceneGraph/trunk/include/osg/DisplaySettings (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -43,5 +43,5 @@ readEnvironmentalVariables(); } - + DisplaySettings(ArgumentParser& arguments): Referenced(true) @@ -53,14 +53,14 @@ DisplaySettings(const DisplaySettings& vs); - + DisplaySettings& operator = (const DisplaySettings& vs); - + void setDisplaySettings(const DisplaySettings& vs); - + void merge(const DisplaySettings& vs); void setDefaults(); - + /** read the environmental variables.*/ void readEnvironmentalVariables(); @@ -68,6 +68,6 @@ /** read the commandline arguments.*/ void readCommandLine(ArgumentParser& arguments); - - + + enum DisplayType { @@ -79,5 +79,5 @@ void setDisplayType(DisplayType type) { _displayType = type; } - + DisplayType getDisplayType() const { return _displayType; } @@ -98,5 +98,5 @@ CHECKERBOARD }; - + void setStereoMode(StereoMode mode) { _stereoMode = mode; } StereoMode getStereoMode() const { return _stereoMode; } @@ -110,5 +110,5 @@ LEFT_EYE_RIGHT_VIEWPORT }; - + void setSplitStereoHorizontalEyeMapping(SplitStereoHorizontalEyeMapping m) { _splitStereoHorizontalEyeMapping = m; } SplitStereoHorizontalEyeMapping getSplitStereoHorizontalEyeMapping() const { return _splitStereoHorizontalEyeMapping; } @@ -178,11 +178,11 @@ unsigned int getNumMultiSamples() const { return _numMultiSamples; } bool getMultiSamples() const { return _numMultiSamples!=0; } - + void setCompileContextsHint(bool useCompileContexts) { _compileContextsHint = useCompileContexts; } bool getCompileContextsHint() const { return _compileContextsHint; } - + void setSerializeDrawDispatch(bool serializeDrawDispatch) { _serializeDrawDispatch = serializeDrawDispatch; } bool getSerializeDrawDispatch() const { return _serializeDrawDispatch; } - + /** Set the hint for the total number of threads in the DatbasePager set up, inclusive of the number of http dedicated threads.*/ void setNumOfDatabaseThreadsHint(unsigned int numThreads) { _numDatabaseThreadsHint = numThreads; } @@ -196,5 +196,5 @@ /** Get the hint for number of threads in the DatbasePager dedicated to reading http requests.*/ unsigned int getNumOfHttpDatabaseThreadsHint() const { return _numHttpDatabaseThreadsHint; } - + void setApplication(const std::string& application) { _application = application; } const std::string& getApplication() { return _application; } @@ -207,9 +207,9 @@ unsigned int getMaxBufferObjectPoolSize() const { return _maxBufferObjectPoolSize; } - /** - Methods used to set and get defaults for Cameras implicit buffer attachments. - For more info: See description of Camera::setImplicitBufferAttachment method - - DisplaySettings implicit buffer attachment selection defaults to: DEPTH and COLOR + /** + Methods used to set and get defaults for Cameras implicit buffer attachments. + For more info: See description of Camera::setImplicitBufferAttachment method + + DisplaySettings implicit buffer attachment selection defaults to: DEPTH and COLOR for both primary (Render) FBO and seconday Multisample (Resolve) FBO ie: IMPLICT_DEPTH_BUFFER_ATTACHMENT | IMPLICIT_COLOR_BUFFER_ATTACHMENT @@ -250,9 +250,9 @@ { SWAP_DEFAULT, // Leave swap method at default returned by choose Pixel Format. - SWAP_EXCHANGE, // Flip front / back buffer. - SWAP_COPY, // Copy back to front buffer. + SWAP_EXCHANGE, // Flip front / back buffer. + SWAP_COPY, // Copy back to front buffer. SWAP_UNDEFINED // Move back to front buffer leaving contents of back buffer undefined. }; - + /** Select preferred swap method */ void setSwapMethod( SwapMethod swapMethod ) { _swapMethod = swapMethod; } @@ -272,5 +272,5 @@ /** Get the hint of the flags to use in when creating graphic contexts.*/ unsigned int getGLContextFlags() const { return _glContextFlags; } - + /** Set the hint of the profile mask to use in when creating graphic contexts.*/ void setGLContextProfileMask(unsigned int mask) { _glContextProfileMask = mask; } @@ -280,5 +280,5 @@ protected: - + virtual ~DisplaySettings(); @@ -297,5 +297,5 @@ int _splitStereoVerticalSeparation; bool _splitStereoAutoAdjustAspectRatio; - + bool _doubleBuffer; bool _RGB; @@ -309,7 +309,7 @@ unsigned int _maxNumOfGraphicsContexts; - + unsigned int _numMultiSamples; - + bool _compileContextsHint; bool _serializeDrawDispatch; @@ -317,5 +317,5 @@ unsigned int _numDatabaseThreadsHint; unsigned int _numHttpDatabaseThreadsHint; - + std::string _application; @@ -325,5 +325,5 @@ ImplicitBufferAttachmentMask _implicitBufferAttachmentRenderMask; ImplicitBufferAttachmentMask _implicitBufferAttachmentResolveMask; - + std::string _glContextVersion; unsigned int _glContextFlags; Index: /OpenSceneGraph/trunk/include/osg/Texture2D =================================================================== --- /OpenSceneGraph/trunk/include/osg/Texture2D (revision 11981) +++ /OpenSceneGraph/trunk/include/osg/Texture2D (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,5 +26,5 @@ public : - + Texture2D(); @@ -33,5 +33,5 @@ /** Copy constructor using CopyOp to manage deep vs shallow copy. */ Texture2D(const Texture2D& text,const CopyOp& copyop=CopyOp::SHALLOW_COPY); - + META_StateAttribute(osg, Texture2D,TEXTURE); @@ -102,7 +102,7 @@ virtual void subload(const Texture2D& texture,State& state) const = 0; }; - + void setSubloadCallback(SubloadCallback* cb) { _subloadCallback = cb;; } - + SubloadCallback* getSubloadCallback() { return _subloadCallback.get(); } @@ -117,5 +117,5 @@ /** Gets the number of mipmap levels created. */ unsigned int getNumMipmapLevels() const { return _numMipmapLevels; } - + /** Copies pixels into a 2D texture image, as per glCopyTexImage2D. @@ -157,6 +157,6 @@ /** Subloaded images can have different texture and image sizes. */ mutable GLsizei _textureWidth, _textureHeight; - - /** Number of mipmap levels created. */ + + /** Number of mipmap levels created. */ mutable GLsizei _numMipmapLevels; Index: /OpenSceneGraph/trunk/include/osg/Camera =================================================================== --- /OpenSceneGraph/trunk/include/osg/Camera (revision 12812) +++ /OpenSceneGraph/trunk/include/osg/Camera (revision 13041) @@ -59,5 +59,5 @@ - /** Set the Stats object used for collect various frame related + /** Set the Stats object used for collect various frame related * timing and scene graph stats. */ void setStats(osg::Stats* stats) { _stats = stats; } @@ -70,5 +70,5 @@ - /** Set whether this camera allows events to be generated by the + /** Set whether this camera allows events to be generated by the * associated graphics window to be associated with this camera. */ void setAllowEventFocus(bool focus) { _allowEventFocus = focus; } @@ -422,12 +422,12 @@ Camera chooses to substitue buffer attachments as defined by DisplaySettings. - Usually DisplaySettings implicit buffer attachment selection defaults to: DEPTH and COLOR + Usually DisplaySettings implicit buffer attachment selection defaults to: DEPTH and COLOR for both primary (Render) FBO and seconday Multisample (Resolve) FBO ie: IMPLICT_DEPTH_BUFFER_ATTACHMENT | IMPLICIT_COLOR_BUFFER_ATTACHMENT - If these masks are not changed and user did not attach depth buffer and/or color buffer + If these masks are not changed and user did not attach depth buffer and/or color buffer to Camera, then OSG implicitly substitues these buffers. By default it does not implicitly allocate a stencil buffer. - Use implicti buffer attachment masks to override default behavior: + Use implicti buffer attachment masks to override default behavior: to turn off DEPTH or COLOR buffer substitution or to enforce STENCIL buffer substitution. @@ -461,11 +461,11 @@ } - /** - Get mask selecting implict buffer attachments for Camera primary FBO + /** + Get mask selecting implict buffer attachments for Camera primary FBO if effectiveMask parameter is set, method follows USE_DISPLAY_SETTINGS_MASK dependence and returns effective mask if effectiveMask parameter is reset, method returns nominal mask set by the Camera */ ImplicitBufferAttachmentMask getImplicitBufferAttachmentRenderMask(bool effectiveMask = false) const - { + { if( effectiveMask && _implicitBufferAttachmentRenderMask == USE_DISPLAY_SETTINGS_MASK ) { @@ -479,11 +479,11 @@ } - /** - Get mask selecting implict buffer attachments for Camera secondary MULTISAMPLE FBO + /** + Get mask selecting implict buffer attachments for Camera secondary MULTISAMPLE FBO if effectiveMask parameter is set, method follows USE_DISPLAY_SETTINGS_MASK dependence and returns effective mask if effectiveMask parameter is reset, method returns nominal mask set by the Camera */ ImplicitBufferAttachmentMask getImplicitBufferAttachmentResolveMask(bool effectiveMask = false) const - { + { if( effectiveMask && _implicitBufferAttachmentResolveMask == USE_DISPLAY_SETTINGS_MASK ) { Index: /OpenSceneGraph/trunk/include/osg/Billboard =================================================================== --- /OpenSceneGraph/trunk/include/osg/Billboard (revision 7648) +++ /OpenSceneGraph/trunk/include/osg/Billboard (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -35,5 +35,5 @@ Billboard(); - + /** Copy constructor using CopyOp to manage deep vs shallow copy. */ Billboard(const Billboard&,const CopyOp& copyop=CopyOp::SHALLOW_COPY); @@ -65,5 +65,5 @@ /** Type definition for pivot point position list. */ typedef std::vector PositionList; - + /** Set the list of pivot point positions. */ inline void setPositionList(PositionList& pl) { _positionList=pl; } @@ -71,5 +71,5 @@ /** Get the list of pivot point positions. */ inline PositionList& getPositionList() { return _positionList; } - + /** Get a const list of pivot point positions. */ inline const PositionList& getPositionList() const { return _positionList; } @@ -94,5 +94,5 @@ * Otherwise, return false. */ virtual bool removeDrawable( Drawable *gset ); - + bool computeMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const; @@ -119,5 +119,5 @@ Matrix _rotateNormalToZAxis; PositionList _positionList; - + // used internally as cache of which what _axis is aligned to help // decide which method of rotation to use. Index: /OpenSceneGraph/trunk/include/osg/BlendEquation =================================================================== --- /OpenSceneGraph/trunk/include/osg/BlendEquation (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/BlendEquation (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -54,5 +54,5 @@ BlendEquation(); - + BlendEquation(Equation equation); @@ -66,5 +66,5 @@ META_StateAttribute(osg, BlendEquation,BLENDEQUATION); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -100,5 +100,5 @@ /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convenience wrappers for - * calling extension functions. */ + * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -107,7 +107,7 @@ Extensions(const Extensions& rhs); - + void lowestCommonDenominator(const Extensions& rhs); - + void setupGLExtensions(unsigned int contextID); @@ -116,5 +116,5 @@ bool isSGIXMinMaxSupported() const { return _isSGIXMinMaxSupported; } bool isLogicOpSupported() const { return _isLogicOpSupported; } - + void glBlendEquation(GLenum mode) const; void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) const; @@ -123,5 +123,5 @@ ~Extensions() {} - + typedef void (GL_APIENTRY * GLBlendEquationProc)(GLenum mode); typedef void (GL_APIENTRY * GLBlendEquationSeparateProc)(GLenum modeRGB, GLenum modeAlpha); @@ -131,9 +131,9 @@ bool _isSGIXMinMaxSupported; bool _isLogicOpSupported; - + GLBlendEquationProc _glBlendEquation; GLBlendEquationSeparateProc _glBlendEquationSeparate; }; - + /** Returns the Extensions object for the given context. * If createIfNotInitalized is true and the Extensions object doesn't Index: /OpenSceneGraph/trunk/include/osg/ShadowVolumeOccluder =================================================================== --- /OpenSceneGraph/trunk/include/osg/ShadowVolumeOccluder (revision 7648) +++ /OpenSceneGraph/trunk/include/osg/ShadowVolumeOccluder (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -28,6 +28,6 @@ public: - - + + typedef std::vector HoleList; @@ -43,16 +43,16 @@ - bool operator < (const ShadowVolumeOccluder& svo) const { return getVolume()>svo.getVolume(); } // not greater volume first. + bool operator < (const ShadowVolumeOccluder& svo) const { return getVolume()>svo.getVolume(); } // not greater volume first. /** compute the shadow volume occluder. */ bool computeOccluder(const NodePath& nodePath,const ConvexPlanarOccluder& occluder,CullStack& cullStack,bool createDrawables=false); - + inline void disableResultMasks(); - + inline void pushCurrentMask(); inline void popCurrentMask(); - - + + /** return true if the matrix passed in matches the projection matrix that this ShadowVolumeOccluder is * associated with.*/ @@ -62,5 +62,5 @@ else return false; } - + /** Set the NodePath which describes which node in the scene graph @@ -71,20 +71,20 @@ - /** get the volume of the occluder minus its holes, in eye coords, the volume is normalized by dividing by + /** get the volume of the occluder minus its holes, in eye coords, the volume is normalized by dividing by * the volume of the view frustum in eye coords.*/ float getVolume() const { return _volume; } - + /** return the occluder polytope.*/ Polytope& getOccluder() { return _occluderVolume; } - + /** return the const occluder polytope.*/ const Polytope& getOccluder() const { return _occluderVolume; } - + /** return the list of holes.*/ HoleList& getHoleList() { return _holeList; } - + /** return the const list of holes.*/ const HoleList& getHoleList() const { return _holeList; } - + /** return true if the specified vertex list is contained entirely @@ -95,5 +95,5 @@ * within this shadow occluder volume.*/ bool contains(const BoundingSphere& bound); - + /** return true if the specified bounding box is contained entirely * within this shadow occluder volume.*/ @@ -110,5 +110,5 @@ } } - + protected: @@ -170,3 +170,3 @@ } // end of namespace -#endif +#endif Index: /OpenSceneGraph/trunk/include/osg/ImageStream =================================================================== --- /OpenSceneGraph/trunk/include/osg/ImageStream (revision 12898) +++ /OpenSceneGraph/trunk/include/osg/ImageStream (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -47,5 +47,5 @@ REWINDING }; - + virtual void seek(double /*time*/) {} @@ -55,9 +55,9 @@ virtual void rewind() { _status=REWINDING; } - + virtual void quit(bool /*waitForThreadToExit*/ = true) {} StreamStatus getStatus() { return _status; } - + enum LoopingMode @@ -66,26 +66,26 @@ LOOPING }; - + void setLoopingMode(LoopingMode mode) { if (_loopingMode == mode) return; - + _loopingMode = mode; applyLoopingMode(); } - + LoopingMode getLoopingMode() const { return _loopingMode; } virtual double getCreationTime() const { return HUGE_VAL; } virtual double getLength() const { return 0.0; } - virtual double getFrameRate() const { return 0.0; } + virtual double getFrameRate() const { return 0.0; } virtual double getCurrentTime() const { return 0.0; } virtual void setReferenceTime(double) {} virtual double getReferenceTime() const { return 0.0; } - + virtual void setTimeMultiplier(double) {} virtual double getTimeMultiplier() const { return 0.0; } - + virtual void setVolume(float) {} virtual float getVolume() const { return 0.0f; } @@ -95,5 +95,5 @@ AudioStreams& getAudioStreams() { return _audioStreams; } const AudioStreams& getAudioStreams() const { return _audioStreams; } - + protected: @@ -104,5 +104,5 @@ StreamStatus _status; LoopingMode _loopingMode; - + AudioStreams _audioStreams; }; Index: /OpenSceneGraph/trunk/include/osg/BufferObject =================================================================== --- /OpenSceneGraph/trunk/include/osg/BufferObject (revision 12912) +++ /OpenSceneGraph/trunk/include/osg/BufferObject (revision 13041) @@ -5,5 +5,5 @@ * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -28,5 +28,5 @@ (defined(GL_VERSION_ES_CM_1_1) && GL_VERSION_ES_CM_1_1 > 0) - #define OPENGLES_1_1_FOUND 1 + #define OPENGLES_1_1_FOUND 1 #endif @@ -51,8 +51,8 @@ #ifndef GL_ARB_vertex_buffer_object #define GL_ARB_vertex_buffer_object - + typedef GLintptr GLintptrARB; typedef GLsizeiptr GLsizeiptrARB; - + #define GL_ARRAY_BUFFER_ARB 0x8892 #define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 @@ -115,5 +115,5 @@ #endif -namespace osg +namespace osg { @@ -227,5 +227,5 @@ inline void unbindBuffer() - { + { _extensions->glBindBuffer(_profile._target,0); } @@ -322,7 +322,7 @@ /** Function to call to get the extension of a specified context. - * If the Extension object for that context has not yet been created + * If the Extension object for that context has not yet been created * and the 'createIfNotInitalized' flag been set to false then returns NULL. - * If 'createIfNotInitalized' is true then the Extensions object is + * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object is * only created with the graphics context associated with ContextID..*/ @@ -724,5 +724,5 @@ META_Object(osg,ElementBufferObject); - + unsigned int addDrawElements(osg::DrawElements* PrimitiveSet); void removeDrawElements(osg::DrawElements* PrimitiveSet); @@ -733,5 +733,5 @@ protected: - + virtual ~ElementBufferObject(); }; @@ -757,5 +757,5 @@ protected: - + virtual ~PixelBufferObject(); }; @@ -778,5 +778,5 @@ inline void setDataSize(unsigned int size) { _profile._size = size; dirty(); } - //! Get data size of the used buffer + //! Get data size of the used buffer inline unsigned int getDataSize() const { return _profile._size; } @@ -790,5 +790,5 @@ virtual void bindBufferInWriteMode(State& state); - //! Unbind the buffer + //! Unbind the buffer virtual void unbindBuffer(unsigned int contextID) const; @@ -815,7 +815,7 @@ typedef osg::buffered_value ModeList; - + mutable ModeList _mode; - + }; Index: /OpenSceneGraph/trunk/include/osg/Texture =================================================================== --- /OpenSceneGraph/trunk/include/osg/Texture (revision 12306) +++ /OpenSceneGraph/trunk/include/osg/Texture (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -73,5 +73,5 @@ #ifndef GL_OES_compressed_ETC1_RGB8_texture - #define GL_ETC1_RGB8_OES 0x8D64 + #define GL_ETC1_RGB8_OES 0x8D64 #endif @@ -165,5 +165,5 @@ #ifndef GL_CLAMP - #define GL_CLAMP 0x2900 + #define GL_CLAMP 0x2900 #endif @@ -327,5 +327,5 @@ /** Fast alternative to dynamic_cast<> for determining if state attribute is a Texture.*/ virtual Texture* asTexture() { return this; } - + /** Fast alternative to dynamic_cast<> for determining if state attribute is a Texture.*/ virtual const Texture* asTexture() const { return this; } @@ -377,5 +377,5 @@ /** Sets the border width. */ void setBorderWidth(GLint width) { _borderWidth = width; dirtyTextureParameters(); } - + GLint getBorderWidth() const { return _borderWidth; } @@ -407,5 +407,5 @@ * depends on the graphics system. */ void setMaxAnisotropy(float anis); - + /** Gets the maximum anisotropy value. */ inline float getMaxAnisotropy() const { return _maxAnisotropy; } @@ -422,5 +422,5 @@ * Texture, apply() will delete the image data. */ inline void setUnRefImageDataAfterApply(bool flag) { _unrefImageDataAfterApply = flag; } - + /** Gets whether or not apply() unreferences image data. */ inline bool getUnRefImageDataAfterApply() const { return _unrefImageDataAfterApply; } @@ -435,5 +435,5 @@ inline bool getClientStorageHint() const { return _clientStorageHint; } - /** Sets whether to force the texture to resize images that have dimensions + /** Sets whether to force the texture to resize images that have dimensions * that are not a power of two. If enabled, NPOT images will be resized, * whether or not NPOT textures are supported by the hardware. If disabled, @@ -482,5 +482,5 @@ /** Gets the internal texture format. */ inline GLint getInternalFormat() const { if (_internalFormat==0) computeInternalFormat(); return _internalFormat; } - + /** Return true if the internal format is one of the compressed formats.*/ bool isCompressedInternalFormat() const; @@ -513,8 +513,8 @@ UNSIGNED_INTEGER = 0x4 }; - + /** Get the internal texture format type. */ inline InternalFormatType getInternalFormatType() const { return _internalFormatType; } - + class TextureObject; @@ -564,5 +564,5 @@ void setShadowComparison(bool flag) { _use_shadow_comparison = flag; } bool getShadowComparison() const { return _use_shadow_comparison; } - + enum ShadowCompareFunc { NEVER = GL_NEVER, @@ -594,5 +594,5 @@ void setShadowAmbient(float shadow_ambient) { _shadow_ambient = shadow_ambient; } float getShadowAmbient() const { return _shadow_ambient; } - + /** Sets the texture image for the specified face. */ @@ -634,5 +634,5 @@ /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convenience wrappers for - * calling extension functions. */ + * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -645,5 +645,5 @@ void setTextureFilterAnisotropicSupported(bool flag) { _isTextureFilterAnisotropicSupported=flag; } bool isTextureFilterAnisotropicSupported() const { return _isTextureFilterAnisotropicSupported; } - + void setTextureCompressionARBSupported(bool flag) { _isTextureCompressionARBSupported=flag; } bool isTextureCompressionARBSupported() const { return _isTextureCompressionARBSupported; } @@ -654,8 +654,8 @@ void setTextureCompressionPVRTC2BPPSupported(bool flag) { _isTextureCompressionPVRTC2BPPSupported=flag; } bool isTextureCompressionPVRTC2BPPSupported() const { return _isTextureCompressionPVRTC2BPPSupported; } - + void setTextureCompressionPVRTC4BPPSupported(bool flag) { _isTextureCompressionPVRTC4BPPSupported=flag; } bool isTextureCompressionPVRTC4BPPSupported() const { return _isTextureCompressionPVRTC4BPPSupported; } - + void setTextureCompressionETCSupported(bool flag) { _isTextureCompressionETCSupported=flag; } bool isTextureCompressionETCSupported() const { return _isTextureCompressionETCSupported; } @@ -699,10 +699,10 @@ bool isCompressedTexImage2DSupported() const { return _glCompressedTexImage2D!=0; } bool isCompressedTexSubImage2DSupported() const { return _glCompressedTexSubImage2D!=0; } - + bool isClientStorageSupported() const { return _isClientStorageSupported; } bool isNonPowerOfTwoTextureSupported(GLenum filter) const { - return (filter==GL_LINEAR || filter==GL_NEAREST) ? + return (filter==GL_LINEAR || filter==GL_NEAREST) ? _isNonPowerOfTwoTextureNonMipMappedSupported : _isNonPowerOfTwoTextureMipMappedSupported; @@ -745,5 +745,5 @@ ~Extensions() {} - + typedef void (GL_APIENTRY * CompressedTexImage2DArbProc) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); typedef void (GL_APIENTRY * CompressedTexSubImage2DArbProc) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); @@ -786,5 +786,5 @@ GLint _numTextureUnits; }; - + /** Gets the extension for the specified context. Creates the * Extensions object for that context if it doesn't exist. @@ -801,5 +801,5 @@ * image format. */ static bool isCompressedInternalFormat(GLint internalFormat); - + /** Determine the size of a compressed image, given the internalFormat, * the width, the height, and the depth of the image. The block size @@ -812,5 +812,5 @@ * you're implementing a subload callback. */ void applyTexImage2D_load(State& state, GLenum target, const Image* image, GLsizei width, GLsizei height,GLsizei numMipmapLevels) const; - + /** Helper method. Subloads images into the texture, but doesn't set * or use a texture binding. Note: Don't call this method directly @@ -833,5 +833,5 @@ virtual void computeInternalFormat() const = 0; - + /** Computes the internal format from Image parameters. */ void computeInternalFormatWithImage(const osg::Image& image) const; @@ -839,5 +839,5 @@ /** Computes the texture dimension for the given Image. */ void computeRequiredTextureDimensions(State& state, const osg::Image& image,GLsizei& width, GLsizei& height,GLsizei& numMipmapLevels) const; - + /** Computes the internal format type. */ void computeInternalFormatType() const; Index: /OpenSceneGraph/trunk/include/osg/fast_back_stack =================================================================== --- /OpenSceneGraph/trunk/include/osg/fast_back_stack (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/fast_back_stack (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,10 +26,10 @@ * The focus of the fast_back_stack is purely to maximize the speed at which the * back can be accessed.*/ - + template class fast_back_stack { public: - + inline fast_back_stack():_value(),_stack(),_size(0) {} @@ -64,5 +64,5 @@ ++_size; } - + inline void push_back(const T& value) { @@ -74,5 +74,5 @@ ++_size; } - + inline void pop_back() { @@ -87,5 +87,5 @@ } // else error condition. } - + T _value; std::vector _stack; Index: /OpenSceneGraph/trunk/include/osg/ImageUtils =================================================================== --- /OpenSceneGraph/trunk/include/osg/ImageUtils (revision 12894) +++ /OpenSceneGraph/trunk/include/osg/ImageUtils (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -21,5 +21,5 @@ namespace osg { -template +template void _readRow(unsigned int num, GLenum pixelFormat, const T* data,float scale, O& operation) { @@ -36,5 +36,5 @@ } -template +template void readRow(unsigned int num, GLenum pixelFormat, GLenum dataType, const unsigned char* data, O& operation) { @@ -51,9 +51,9 @@ } -template +template void readImage(const osg::Image* image, O& operation) { if (!image) return; - + for(int r=0;rr();++r) { @@ -68,7 +68,7 @@ // struct ModifyOperator // { -// inline void luminance(float& l) const {} -// inline void alpha(float& a) const {} -// inline void luminance_alpha(float& l,float& a) const {} +// inline void luminance(float& l) const {} +// inline void alpha(float& a) const {} +// inline void luminance_alpha(float& l,float& a) const {} // inline void rgb(float& r,float& g,float& b) const {} // inline void rgba(float& r,float& g,float& b,float& a) const {} @@ -76,5 +76,5 @@ -template +template void _modifyRow(unsigned int num, GLenum pixelFormat, T* data,float scale, const M& operation) { @@ -92,5 +92,5 @@ } -template +template void modifyRow(unsigned int num, GLenum pixelFormat, GLenum dataType, unsigned char* data, const M& operation) { @@ -107,9 +107,9 @@ } -template +template void modifyImage(osg::Image* image, const M& operation) { if (!image) return; - + for(int r=0;rr();++r) { Index: /OpenSceneGraph/trunk/include/osg/Texture2DMultisample =================================================================== --- /OpenSceneGraph/trunk/include/osg/Texture2DMultisample (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/Texture2DMultisample (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2010 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2010 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -22,5 +22,5 @@ namespace osg { - /** Texture2DMultisample state class which encapsulates OpenGL 2D multisampled texture functionality. + /** Texture2DMultisample state class which encapsulates OpenGL 2D multisampled texture functionality. * Multisampled texture were introduced with OpenGL 3.1 and extension GL_ARB_texture_multisample. * See http://www.opengl.org/registry/specs/ARB/texture_multisample.txt for more info. @@ -30,5 +30,5 @@ { public : - + Texture2DMultisample(); @@ -37,5 +37,5 @@ /** Copy constructor using CopyOp to manage deep vs shallow copy. */ Texture2DMultisample(const Texture2DMultisample& text,const CopyOp& copyop=CopyOp::SHALLOW_COPY); - + META_StateAttribute(osg, Texture2DMultisample,TEXTURE); @@ -43,7 +43,7 @@ virtual int compare(const StateAttribute& rhs) const; - virtual GLenum getTextureTarget() const - { - return GL_TEXTURE_2D_MULTISAMPLE; + virtual GLenum getTextureTarget() const + { + return GL_TEXTURE_2D_MULTISAMPLE; } Index: /OpenSceneGraph/trunk/include/osg/NodeVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osg/NodeVisitor (revision 12080) +++ /OpenSceneGraph/trunk/include/osg/NodeVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -50,5 +50,5 @@ /** Visitor for type safe operations on osg::Nodes. - Based on GOF's Visitor pattern. The NodeVisitor + Based on GOF's Visitor pattern. The NodeVisitor is useful for developing type safe operations to nodes in the scene graph (as per Visitor pattern), and adds to this @@ -62,5 +62,5 @@ myVisitor.apply(*root). The later method will bypass the double dispatch and the appropriate NodeVisitor::apply(..) method will - not be called. */ + not be called. */ class OSG_EXPORT NodeVisitor : public virtual Referenced { @@ -74,5 +74,5 @@ TRAVERSE_ACTIVE_CHILDREN }; - + enum VisitorType { @@ -85,9 +85,9 @@ NodeVisitor(TraversalMode tm=TRAVERSE_NONE); - + NodeVisitor(VisitorType type,TraversalMode tm=TRAVERSE_NONE); - + virtual ~NodeVisitor(); - + /** return the library name/namespapce of the visitor's. Should be defined by derived classes.*/ virtual const char* libraryName() const { return "osg"; } @@ -97,5 +97,5 @@ /** Method to call to reset visitor. Useful if your visitor accumulates - state during a traversal, and you plan to reuse the visitor. + state during a traversal, and you plan to reuse the visitor. To flush that state for the next traversal: call reset() prior to each traversal.*/ @@ -107,5 +107,5 @@ * to select which behaviour to use for different types of traversal/visitors.*/ inline void setVisitorType(VisitorType type) { _visitorType = type; } - + /** Get the VisitorType.*/ inline VisitorType getVisitorType() const { return _visitorType; } @@ -113,5 +113,5 @@ /** Set the traversal number. Typically used to denote the frame count.*/ inline void setTraversalNumber(unsigned int fn) { _traversalNumber = fn; } - + /** Get the traversal number. Typically used to denote the frame count.*/ inline unsigned int getTraversalNumber() const { return _traversalNumber; } @@ -119,5 +119,5 @@ /** Set the FrameStamp that this traversal is associated with.*/ inline void setFrameStamp(FrameStamp* fs) { _frameStamp = fs; } - + /** Get the FrameStamp that this traversal is associated with.*/ inline const FrameStamp* getFrameStamp() const { return _frameStamp.get(); } @@ -139,5 +139,5 @@ /** Set the NodeMaskOverride mask. - * Used in validNodeMask() to determine whether to operate on a node or its + * Used in validNodeMask() to determine whether to operate on a node or its * subgraph, by OR'ing NodeVisitor::_nodeMaskOverride with the Node's own Node::_nodeMask. * Typically used to force on nodes which may have @@ -147,5 +147,5 @@ /** Get the NodeMaskOverride mask.*/ inline Node::NodeMask getNodeMaskOverride() const { return _nodeMaskOverride; } - + /** Method to called by Node and its subclass' Node::accept() method, if the result is true * it is used to cull operations of nodes and their subgraphs. @@ -159,5 +159,5 @@ } - /** Set the traversal mode for Node::traverse() to use when + /** Set the traversal mode for Node::traverse() to use when deciding which children of a node to traverse. If a NodeVisitor has been attached via setTraverseVisitor() @@ -165,5 +165,5 @@ visitor is detached. Default mode is TRAVERSE_NONE.*/ inline void setTraversalMode(TraversalMode mode) { _traversalMode = mode; } - + /** Get the traversal mode.*/ inline TraversalMode getTraversalMode() const { return _traversalMode; } @@ -171,13 +171,13 @@ /** * Set user data, data must be subclassed from Referenced to allow - * automatic memory handling. If your own data isn't directly + * automatic memory handling. If your own data isn't directly * subclassed from Referenced then create an adapter object * which points to your own objects and handles the memory addressing. */ inline void setUserData(Referenced* obj) { _userData = obj; } - + /** Get user data.*/ inline Referenced* getUserData() { return _userData.get(); } - + /** Get const user data.*/ inline const Referenced* getUserData() const { return _userData.get(); } @@ -185,5 +185,5 @@ /** Method for handling traversal of a nodes. - If you intend to use the visitor for actively traversing + If you intend to use the visitor for actively traversing the scene graph then make sure the accept() methods call this method unless they handle traversal directly.*/ @@ -193,14 +193,14 @@ else if (_traversalMode!=TRAVERSE_NONE) node.traverse(*this); } - + /** Method called by osg::Node::accept() method before * a call to the NodeVisitor::apply(..). The back of the list will, * therefore, be the current node being visited inside the apply(..), - * and the rest of the list will be the parental sequence of nodes + * and the rest of the list will be the parental sequence of nodes * from the top most node applied down the graph to the current node. * Note, the user does not typically call pushNodeOnPath() as it * will be called automatically by the Node::accept() method.*/ inline void pushOntoNodePath(Node* node) { if (_traversalMode!=TRAVERSE_PARENTS) _nodePath.push_back(node); else _nodePath.insert(_nodePath.begin(),node); } - + /** Method called by osg::Node::accept() method after * a call to NodeVisitor::apply(..). @@ -208,5 +208,5 @@ * will be called automatically by the Node::accept() method.*/ inline void popFromNodePath() { if (_traversalMode!=TRAVERSE_PARENTS) _nodePath.pop_back(); else _nodePath.erase(_nodePath.begin()); } - + /** Get the non const NodePath from the top most node applied down * to the current Node being visited.*/ @@ -216,5 +216,5 @@ * to the current Node being visited.*/ const NodePath& getNodePath() const { return _nodePath; } - + /** Get the eye point in local coordinates. * Note, not all NodeVisitor implement this method, it is mainly cull visitors which will implement.*/ @@ -239,11 +239,11 @@ * If the getDistanceToViewPoint(pos) is not implemented then a default value of 0.0 is returned.*/ virtual float getDistanceToViewPoint(const Vec3& /*pos*/, bool /*useLODScale*/) const { return 0.0f; } - + virtual void apply(Node& node); - + virtual void apply(Geode& node); virtual void apply(Billboard& node); - + virtual void apply(Group& node); @@ -301,21 +301,21 @@ { public: - + ImageRequestHandler(): Referenced(true) {} virtual double getPreLoadTime() const = 0; - + virtual osg::Image* readImageFile(const std::string& fileName) = 0; - + virtual void requestImageFile(const std::string& fileName,osg::Object* attachmentPoint, int attachmentIndex, double timeToMergeBy, const FrameStamp* framestamp) = 0; - + protected: virtual ~ImageRequestHandler() {} }; - + /** Set the handler for image requests.*/ void setImageRequestHandler(ImageRequestHandler* handler) { _imageRequestHandler = handler; } - + /** Get the handler for image requests.*/ ImageRequestHandler* getImageRequestHandler() { return _imageRequestHandler.get(); } @@ -330,11 +330,11 @@ VisitorType _visitorType; unsigned int _traversalNumber; - + ref_ptr _frameStamp; - + TraversalMode _traversalMode; Node::NodeMask _traversalMask; Node::NodeMask _nodeMaskOverride; - + NodePath _nodePath; @@ -347,5 +347,5 @@ -/** Convenience functor for assisting visiting of arrays of osg::Node's.*/ +/** Convenience functor for assisting visiting of arrays of osg::Node's.*/ class NodeAcceptOp { Index: /OpenSceneGraph/trunk/include/osg/Object =================================================================== --- /OpenSceneGraph/trunk/include/osg/Object (revision 12511) +++ /OpenSceneGraph/trunk/include/osg/Object (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -33,6 +33,6 @@ /** META_Object macro define the standard clone, isSameKindAs and className methods. - * Use when subclassing from Object to make it more convenient to define - * the standard pure virtual clone, isSameKindAs and className methods + * Use when subclassing from Object to make it more convenient to define + * the standard pure virtual clone, isSameKindAs and className methods * which are required for all Object subclasses.*/ #define META_Object(library,name) \ @@ -43,5 +43,5 @@ virtual const char* className() const { return #name; } -/** Base class/standard interface for objects which require IO support, +/** Base class/standard interface for objects which require IO support, cloning and reference counting. Based on GOF Composite, Prototype and Template Method patterns. @@ -107,5 +107,5 @@ UNSPECIFIED }; - + /** Set the data variance of this object. * Can be set to either STATIC for values that do not change over the lifetime of the object, @@ -117,5 +117,5 @@ /** Get the data variance of this object.*/ inline DataVariance getDataVariance() const { return _dataVariance; } - + /** Compute the DataVariance based on an assessment of callback etc.*/ virtual void computeDataVariance() {} @@ -138,5 +138,5 @@ /** * Set user data, data must be subclassed from Referenced to allow - * automatic memory handling. If your own data isn't directly + * automatic memory handling. If your own data isn't directly * subclassed from Referenced then create an adapter object * which points to your own object and handles the memory addressing. @@ -149,5 +149,5 @@ /** Get const user data.*/ virtual const Referenced* getUserData() const; - + @@ -163,5 +163,5 @@ void setUserValue(const std::string& name, const T& value); - + /** Resize any per context GLObject buffers to specified size. */ virtual void resizeGLObjectBuffers(unsigned int /*maxSize*/) {} @@ -183,5 +183,5 @@ = new Node().*/ virtual ~Object(); - + std::string _name; DataVariance _dataVariance; @@ -262,5 +262,5 @@ } } - + } Index: /OpenSceneGraph/trunk/include/osg/FrontFace =================================================================== --- /OpenSceneGraph/trunk/include/osg/FrontFace (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/FrontFace (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -21,14 +21,14 @@ /** Class to specify the orientation of front-facing polygons. -*/ +*/ class OSG_EXPORT FrontFace : public StateAttribute { public : - + enum Mode { CLOCKWISE = GL_CW, COUNTER_CLOCKWISE = GL_CCW }; - + FrontFace(Mode face=COUNTER_CLOCKWISE); @@ -39,5 +39,5 @@ META_StateAttribute(osg, FrontFace, FRONTFACE); - + /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const @@ -52,14 +52,14 @@ return 0; // passed all the above comparison macros, must be equal. } - + inline void setMode(Mode mode) { _mode = mode; } inline Mode getMode() const { return _mode; } - + virtual void apply(State& state) const; - + protected: - + virtual ~FrontFace(); - + Mode _mode; Index: /OpenSceneGraph/trunk/include/osg/Light =================================================================== --- /OpenSceneGraph/trunk/include/osg/Light (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/Light (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -59,5 +59,5 @@ _spot_exponent(light._spot_exponent), _spot_cutoff(light._spot_cutoff) {} - + virtual osg::Object* cloneType() const { return new Light(_lightnum); } virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new Light(*this,copyop); } @@ -97,10 +97,10 @@ return true; } - - + + /** Set which OpenGL light to operate on. */ void setLightNum(int num); - + /** Get which OpenGL light this osg::Light operates on. */ int getLightNum() const { return _lightnum; } @@ -124,14 +124,14 @@ inline const Vec4& getSpecular() const { return _specular; } - /** Set the position of the light. */ + /** Set the position of the light. */ inline void setPosition( const Vec4& position ) { _position = position; } - /** Get the position of the light. */ + /** Get the position of the light. */ inline const Vec4& getPosition() const { return _position; } - /** Set the direction of the light. */ + /** Set the direction of the light. */ inline void setDirection( const Vec3& direction ) { _direction = direction; } - /** Get the direction of the light. */ + /** Get the direction of the light. */ inline const Vec3& getDirection() const { return _direction; } @@ -175,5 +175,5 @@ protected : - + virtual ~Light(); Index: /OpenSceneGraph/trunk/include/osg/FrameBufferObject =================================================================== --- /OpenSceneGraph/trunk/include/osg/FrameBufferObject (revision 12298) +++ /OpenSceneGraph/trunk/include/osg/FrameBufferObject (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -167,5 +167,5 @@ TglBindRenderbuffer* glBindRenderbuffer; TglGenRenderbuffers* glGenRenderbuffers; - TglDeleteRenderbuffers* glDeleteRenderbuffers; + TglDeleteRenderbuffers* glDeleteRenderbuffers; TglRenderbufferStorage* glRenderbufferStorage; TglRenderbufferStorageMultisample* glRenderbufferStorageMultisample; @@ -377,8 +377,8 @@ explicit FrameBufferAttachment(TextureRectangle* target); explicit FrameBufferAttachment(Camera::Attachment& attachment); - + ~FrameBufferAttachment(); - FrameBufferAttachment&operator = (const FrameBufferAttachment& copy); + FrameBufferAttachment&operator = (const FrameBufferAttachment& copy); bool isMultisample() const; @@ -413,5 +413,5 @@ typedef std::map AttachmentMap; typedef std::vector MultipleRenderingTargets; - + typedef Camera::BufferComponent BufferComponent; @@ -422,10 +422,10 @@ inline const AttachmentMap& getAttachmentMap() const; - + void setAttachment(BufferComponent attachment_point, const FrameBufferAttachment &attachment); inline const FrameBufferAttachment& getAttachment(BufferComponent attachment_point) const; inline bool hasAttachment(BufferComponent attachment_point) const; - + inline bool hasMultipleRenderingTargets() const { return !_drawBuffers.empty(); } inline const MultipleRenderingTargets& getMultipleRenderingTargets() const { return _drawBuffers; } @@ -434,5 +434,5 @@ int compare(const StateAttribute &sa) const; - + void apply(State &state) const; @@ -473,10 +473,10 @@ void updateDrawBuffers(); - + inline void dirtyAll(); GLenum convertBufferComponentToGLenum(BufferComponent attachment_point) const; - private: + private: AttachmentMap _attachments; @@ -487,5 +487,5 @@ mutable buffered_value _unsupported; mutable buffered_value _fboID; - + }; Index: /OpenSceneGraph/trunk/include/osg/observer_ptr =================================================================== --- /OpenSceneGraph/trunk/include/osg/observer_ptr (revision 11763) +++ /OpenSceneGraph/trunk/include/osg/observer_ptr (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/BoundingSphere =================================================================== --- /OpenSceneGraph/trunk/include/osg/BoundingSphere (revision 10228) +++ /OpenSceneGraph/trunk/include/osg/BoundingSphere (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -36,12 +36,12 @@ public: typedef VT vec_type; - typedef typename VT::value_type value_type; + typedef typename VT::value_type value_type; vec_type _center; value_type _radius; - /** Construct a default bounding sphere with radius to -1.0f, representing an invalid/unset bounding sphere.*/ + /** Construct a default bounding sphere with radius to -1.0f, representing an invalid/unset bounding sphere.*/ BoundingSphereImpl() : _center(0.0,0.0,0.0),_radius(-1.0) {} - + /** Creates a bounding sphere initialized to the given extents. */ BoundingSphereImpl(const vec_type& center, value_type radius) : _center(center),_radius(radius) {} @@ -64,5 +64,5 @@ inline bool valid() const { return _radius>=0.0; } - /** Set the bounding sphere to the given center/radius using floats. */ + /** Set the bounding sphere to the given center/radius using floats. */ inline void set(const vec_type& center,value_type radius) { @@ -73,5 +73,5 @@ /** Returns the center of the bounding sphere. */ inline vec_type& center() { return _center; } - + /** Returns the const center of the bounding sphere. */ inline const vec_type& center() const { return _center; } @@ -81,5 +81,5 @@ /** Returns the const radius of the bounding sphere. */ inline value_type radius() const { return _radius; } - + /** Returns the squared length of the radius. Note, For performance * reasons, the calling method is responsible for checking to make @@ -131,5 +131,5 @@ ((_center - bs._center).length2() <= (_radius + bs._radius)*(_radius + bs._radius)); } - + }; @@ -188,17 +188,17 @@ return; } - - - // Calculate d == The distance between the sphere centers + + + // Calculate d == The distance between the sphere centers double d = ( _center - sh.center() ).length(); // New sphere is already inside this one - if ( d + sh.radius() <= _radius ) + if ( d + sh.radius() <= _radius ) { return; } - // New sphere completely contains this one - if ( d + _radius <= sh.radius() ) + // New sphere completely contains this one + if ( d + _radius <= sh.radius() ) { _center = sh._center; @@ -207,5 +207,5 @@ } - + // Build a new sphere that completely contains the other two: // @@ -244,5 +244,5 @@ } -template +template void BoundingSphereImpl::expandBy(const BoundingBoxImpl& bb) { @@ -261,8 +261,8 @@ newbb.expandBy(v); // add it into the new bounding box. } - + _center = newbb.center(); _radius = newbb.radius(); - + } else @@ -300,5 +300,5 @@ typedef BoundingSpheref BoundingSphere; #else - typedef BoundingSphered BoundingSphere; + typedef BoundingSphered BoundingSphere; #endif } Index: /OpenSceneGraph/trunk/include/osg/Uniform =================================================================== --- /OpenSceneGraph/trunk/include/osg/Uniform (revision 11959) +++ /OpenSceneGraph/trunk/include/osg/Uniform (revision 13041) @@ -1,10 +1,10 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * Copyright (C) 2003-2005 3Dlabs Inc. Ltd. * Copyright (C) 2008 Zebra Imaging * - * This application is open source and may be redistributed and/or modified + * This application is open source and may be redistributed and/or modified * freely and without restriction, both in commercial and non commercial * applications, as long as this copyright notice is maintained. - * + * * This application is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -185,5 +185,5 @@ SAMPLER_1D_SHADOW = GL_SAMPLER_1D_SHADOW, SAMPLER_2D_SHADOW = GL_SAMPLER_2D_SHADOW, - + SAMPLER_1D_ARRAY = GL_SAMPLER_1D_ARRAY_EXT, SAMPLER_2D_ARRAY = GL_SAMPLER_2D_ARRAY_EXT, @@ -312,5 +312,5 @@ inline const ParentList& getParents() const { return _parents; } - /** Get the a copy of parent list of node. A copy is returned to + /** Get the a copy of parent list of node. A copy is returned to * prevent modification of the parent list.*/ inline ParentList getParents() { return _parents; } @@ -483,5 +483,5 @@ protected: - + virtual ~Uniform(); Uniform& operator=(const Uniform&) { return *this; } @@ -510,5 +510,5 @@ ref_ptr _updateCallback; ref_ptr _eventCallback; - + unsigned int _modifiedCount; }; Index: /OpenSceneGraph/trunk/include/osg/Texture3D =================================================================== --- /OpenSceneGraph/trunk/include/osg/Texture3D (revision 11830) +++ /OpenSceneGraph/trunk/include/osg/Texture3D (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -30,5 +30,5 @@ public : - + Texture3D(); @@ -37,5 +37,5 @@ /** Copy constructor using CopyOp to manage deep vs shallow copy. */ Texture3D(const Texture3D& text,const CopyOp& copyop=CopyOp::SHALLOW_COPY); - + META_StateAttribute(osg, Texture3D,TEXTURE); @@ -106,7 +106,7 @@ virtual void subload(const Texture3D& texture,State& state) const = 0; }; - + void setSubloadCallback(SubloadCallback* cb) { _subloadCallback = cb;; } - + SubloadCallback* getSubloadCallback() { return _subloadCallback.get(); } @@ -121,5 +121,5 @@ /** Gets the number of mipmap levels created. */ unsigned int getNumMipmapLevels() const { return _numMipmapLevels; } - + /** Copies a two-dimensional texture subimage, as per @@ -136,9 +136,9 @@ * compiled, create the texture mipmap levels. */ virtual void apply(State& state) const; - + /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convenience wrappers for - * calling extension functions. */ + * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -147,12 +147,12 @@ Extensions(const Extensions& rhs); - + void lowestCommonDenominator(const Extensions& rhs); - + void setupGLExtensions(unsigned int contextID); void setTexture3DSupported(bool flag) { _isTexture3DSupported=flag; } bool isTexture3DSupported() const { return _isTexture3DSupported; } - + void setTexture3DFast(bool flag) { _isTexture3DFast=flag; } bool isTexture3DFast() const { return _isTexture3DFast; } @@ -185,8 +185,8 @@ GLint _maxTexture3DSize; }; - + /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convenience wrappers for - * calling extension functions. */ + * calling extension functions. */ static Extensions* getExtensions(unsigned int contextID,bool createIfNotInitalized); @@ -215,5 +215,5 @@ /** Subloaded images can have different texture and image sizes. */ mutable GLsizei _textureWidth, _textureHeight, _textureDepth; - + /** Number of mip map levels the the texture has been created with, */ mutable GLsizei _numMipmapLevels; Index: /OpenSceneGraph/trunk/include/osg/GLU =================================================================== --- /OpenSceneGraph/trunk/include/osg/GLU (revision 11838) +++ /OpenSceneGraph/trunk/include/osg/GLU (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/Vec4ub =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec4ub (revision 11770) +++ /OpenSceneGraph/trunk/include/osg/Vec4ub (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -34,8 +34,8 @@ /** Number of vector components. */ enum { num_components = 4 }; - + /** Vec member variable. */ value_type _v[4]; - + /** Constructor that sets all components of the vector to zero */ Vec4ub() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; } Index: /OpenSceneGraph/trunk/include/osg/ApplicationUsage =================================================================== --- /OpenSceneGraph/trunk/include/osg/ApplicationUsage (revision 10504) +++ /OpenSceneGraph/trunk/include/osg/ApplicationUsage (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,5 +26,5 @@ { public: - + static ApplicationUsage* instance(); @@ -34,5 +34,5 @@ typedef std::map UsageMap; - + /** The ApplicationName is often displayed when logging errors, and frequently incorporated into the Description (below). */ @@ -53,7 +53,7 @@ HELP_ALL = KEYBOARD_MOUSE_BINDING|ENVIRONMENTAL_VARIABLE|COMMAND_LINE_OPTION }; - + void addUsageExplanation(Type type,const std::string& option,const std::string& explanation); - + void setCommandLineUsage(const std::string& explanation) { _commandLineUsage=explanation; } const std::string& getCommandLineUsage() const { return _commandLineUsage; } @@ -61,5 +61,5 @@ void addCommandLineOption(const std::string& option,const std::string& explanation, const std::string &defaultValue = ""); - + void setCommandLineOptions(const UsageMap& usageMap) { _commandLineOptions=usageMap; } const UsageMap& getCommandLineOptions() const { return _commandLineOptions; } @@ -70,5 +70,5 @@ void addEnvironmentalVariable(const std::string& option,const std::string& explanation, const std::string& defaultValue = ""); - + void setEnvironmentalVariables(const UsageMap& usageMap) { _environmentalVariables=usageMap; } const UsageMap& getEnvironmentalVariables() const { return _environmentalVariables; } @@ -87,5 +87,5 @@ 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, unsigned int widthOfOutput=80,bool showDefaults=false); @@ -93,5 +93,5 @@ protected: - + virtual ~ApplicationUsage() {} @@ -104,9 +104,9 @@ UsageMap _environmentalVariablesDefaults; UsageMap _commandLineOptionsDefaults; - + }; class ApplicationUsageProxy -{ +{ public: Index: /OpenSceneGraph/trunk/include/osg/Math =================================================================== --- /OpenSceneGraph/trunk/include/osg/Math (revision 12877) +++ /OpenSceneGraph/trunk/include/osg/Math (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -22,6 +22,6 @@ //so this code checks the version so it can add in workarounds for older versions. #ifdef __APPLE__ -// Using std::isnan will work for OS X, but use of -// and std:: are not necessarily portible with other systems so +// Using std::isnan will work for OS X, but use of +// and std:: are not necessarily portible with other systems so // the include of is isolated here. #include @@ -34,5 +34,5 @@ // The reason for this extra check is that if the user relies on default // settings, MAC_OS_X_VERSION_MIN_REQUIRED will be set to 1010 and hit - // this code path, but this is probably not what they want if using gcc 4+. + // this code path, but this is probably not what they want if using gcc 4+. #if (__GNUC__ < 4) #define APPLE_PRE_10_2 @@ -42,5 +42,5 @@ #define APPLE_PRE_10_6 #endif - + #endif #endif @@ -83,5 +83,5 @@ inline float sqrtf(float value) { return static_cast(sqrt(value)); } #endif - + #ifndef fabsf inline float fabsf(float value) { return static_cast(fabs(value)); } Index: /OpenSceneGraph/trunk/include/osg/Geometry =================================================================== --- /OpenSceneGraph/trunk/include/osg/Geometry (revision 12064) +++ /OpenSceneGraph/trunk/include/osg/Geometry (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -33,7 +33,7 @@ /** Copy constructor using CopyOp to manage deep vs shallow copy. */ Geometry(const Geometry& geometry,const CopyOp& copyop=CopyOp::SHALLOW_COPY); - + virtual Object* cloneType() const { return new Geometry(); } - virtual Object* clone(const CopyOp& copyop) const { return new Geometry(*this,copyop); } + virtual Object* clone(const CopyOp& copyop) const { return new Geometry(*this,copyop); } virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast(obj)!=NULL; } virtual const char* libraryName() const { return "osg"; } @@ -53,5 +53,5 @@ BIND_PER_VERTEX }; - + struct OSG_EXPORT ArrayData { @@ -59,5 +59,5 @@ binding(BIND_OFF), normalize(GL_FALSE) {} - + ArrayData(const ArrayData& data,const CopyOp& copyop=CopyOp::SHALLOW_COPY); @@ -82,6 +82,6 @@ return *this; } - - inline bool empty() const { return !array.valid(); } + + inline bool empty() const { return !array.valid(); } ref_ptr array; @@ -90,5 +90,5 @@ GLboolean normalize; }; - + struct OSG_EXPORT Vec3ArrayData { @@ -96,5 +96,5 @@ binding(BIND_OFF), normalize(GL_FALSE) {} - + Vec3ArrayData(const Vec3ArrayData& data,const CopyOp& copyop=CopyOp::SHALLOW_COPY); @@ -120,5 +120,5 @@ } - inline bool empty() const { return !array.valid(); } + inline bool empty() const { return !array.valid(); } ref_ptr array; @@ -128,11 +128,11 @@ }; - /** Static ArrayData which is returned from getTexCoordData(i) const and getVertexAttribData(i) const + /** Static ArrayData which is returned from getTexCoordData(i) const and getVertexAttribData(i) const * when i is out of range. */ static const ArrayData s_InvalidArrayData; - + typedef std::vector< ArrayData > ArrayDataList; - + void setVertexArray(Array* array); @@ -143,5 +143,5 @@ ArrayData& getVertexData() { return _vertexData; } const ArrayData& getVertexData() const { return _vertexData; } - + void setNormalBinding(AttributeBinding ab); @@ -190,5 +190,5 @@ ArrayData& getFogCoordData() { return _fogCoordData; } const ArrayData& getFogCoordData() const { return _fogCoordData; } - + void setTexCoordArray(unsigned int unit,Array*); @@ -229,5 +229,5 @@ void setPrimitiveSetList(const PrimitiveSetList& primitives); - + PrimitiveSetList& getPrimitiveSetList() { return _primitives; } const PrimitiveSetList& getPrimitiveSetList() const { return _primitives; } @@ -236,14 +236,14 @@ PrimitiveSet* getPrimitiveSet(unsigned int pos) { return _primitives[pos].get(); } const PrimitiveSet* getPrimitiveSet(unsigned int pos) const { return _primitives[pos].get(); } - + /** Add a primitive set to the geometry. */ bool addPrimitiveSet(PrimitiveSet* primitiveset); - + /** Set a primitive set to the specified position in geometry's primitive set list. */ bool setPrimitiveSet(unsigned int i,PrimitiveSet* primitiveset); - + /** Insert a primitive set to the specified position in geometry's primitive set list. */ bool insertPrimitiveSet(unsigned int i,PrimitiveSet* primitiveset); - + /** Remove primitive set(s) from the specified position in geometry's primitive set list. */ bool removePrimitiveSet(unsigned int i,unsigned int numElementsToRemove=1); @@ -261,5 +261,5 @@ IndexArray* getVertexIndices() { return _vertexData.indices.get(); } const IndexArray* getVertexIndices() const { return _vertexData.indices.get(); } - + /** deprecated - forces OpenGL slow path, just kept for backwards compatibility.*/ void setNormalIndices(IndexArray* array); @@ -295,5 +295,5 @@ - /** When set to true, ignore the setUseDisplayList() settings, and hints to the drawImplementation + /** When set to true, ignore the setUseDisplayList() settings, and hints to the drawImplementation method to use OpenGL vertex buffer objects for rendering.*/ virtual void setUseVertexBufferObjects(bool flag); @@ -359,7 +359,7 @@ bool containsSharedArrays() const; - + void duplicateSharedArrays(); - + void computeInternalOptimizedGeometry(); @@ -419,14 +419,14 @@ virtual ~Geometry(); - + bool verifyBindings(const ArrayData& arrayData) const; bool verifyBindings(const Vec3ArrayData& arrayData) const; - + void computeCorrectBindingsAndArraySizes(ArrayData& arrayData,const char* arrayName); void computeCorrectBindingsAndArraySizes(Vec3ArrayData& arrayData,const char* arrayName); - + void addVertexBufferObjectIfRequired(osg::Array* array); void addElementBufferObjectIfRequired(osg::PrimitiveSet* primitiveSet); - + PrimitiveSetList _primitives; Index: /OpenSceneGraph/trunk/include/osg/RenderInfo =================================================================== --- /OpenSceneGraph/trunk/include/osg/RenderInfo (revision 11559) +++ /OpenSceneGraph/trunk/include/osg/RenderInfo (revision 13041) @@ -36,5 +36,5 @@ _state(state), _view(view) {} - + RenderInfo& operator = (const RenderInfo& rhs) { @@ -47,16 +47,16 @@ unsigned int getContextID() const { return _state.valid() ? _state->getContextID() : 0; } - + void setState(State* state) { _state = state; } State* getState() { return _state.get(); } const State* getState() const { return _state.get(); } - + void setView(View* view) { _view = view; } View* getView() { return _view; } const View* getView() const { return _view; } - - void pushCamera(Camera* camera) { _cameras.push_back(camera); } + + void pushCamera(Camera* camera) { _cameras.push_back(camera); } void popCamera() { if (!_cameras.empty()) _cameras.pop_back(); } - + Camera* getCurrentCamera() { return _cameras.empty() ? 0 : _cameras.back(); } Index: /OpenSceneGraph/trunk/include/osg/AnimationPath =================================================================== --- /OpenSceneGraph/trunk/include/osg/AnimationPath (revision 11790) +++ /OpenSceneGraph/trunk/include/osg/AnimationPath (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -34,5 +34,5 @@ { public: - + AnimationPath():_loopMode(LOOP) {} @@ -64,5 +64,5 @@ _rotation(rotation), _scale(scale) {} - + void setPosition(const osg::Vec3d& position) { _position = position; } const osg::Vec3d& getPosition() const { return _position; } @@ -81,5 +81,5 @@ _scale = first._scale*one_minus_ratio + second._scale*ratio; } - + inline void interpolate(double ratio,const ControlPoint& first, const ControlPoint& second) { @@ -125,5 +125,5 @@ }; - + /** Given a specific time, return the transformation matrix for a point. */ @@ -153,5 +153,5 @@ return true; } - + bool getInverse(double time,Matrixd& matrix) const { @@ -164,12 +164,12 @@ /** Given a specific time, return the local ControlPoint frame for a point. */ virtual bool getInterpolatedControlPoint(double time,ControlPoint& controlPoint) const; - + /** Insert a control point into the AnimationPath.*/ void insert(double time,const ControlPoint& controlPoint); - + double getFirstTime() const { if (!_timeControlPointMap.empty()) return _timeControlPointMap.begin()->first; else return 0.0;} double getLastTime() const { if (!_timeControlPointMap.empty()) return _timeControlPointMap.rbegin()->first; else return 0.0;} double getPeriod() const { return getLastTime()-getFirstTime();} - + enum LoopMode { @@ -178,20 +178,20 @@ NO_LOOPING }; - + void setLoopMode(LoopMode lm) { _loopMode = lm; } - + LoopMode getLoopMode() const { return _loopMode; } typedef std::map TimeControlPointMap; - + void setTimeControlPointMap(TimeControlPointMap& tcpm) { _timeControlPointMap=tcpm; } TimeControlPointMap& getTimeControlPointMap() { return _timeControlPointMap; } - + const TimeControlPointMap& getTimeControlPointMap() const { return _timeControlPointMap; } - + bool empty() const { return _timeControlPointMap.empty(); } - + void clear() { _timeControlPointMap.clear(); } @@ -206,5 +206,5 @@ protected: - + virtual ~AnimationPath() {} @@ -241,5 +241,5 @@ _pauseTime(apc._pauseTime) {} - + META_Object(osg,AnimationPathCallback); @@ -258,6 +258,6 @@ /** Construct an AnimationPathCallback and automatically create an animation path to produce a rotation about a point.*/ AnimationPathCallback(const osg::Vec3d& pivot,const osg::Vec3d& axis,float angularVelocity); - - + + void setAnimationPath(AnimationPath* path) { _animationPath = path; } AnimationPath* getAnimationPath() { return _animationPath.get(); } @@ -272,5 +272,5 @@ void setTimeOffset(double offset) { _timeOffset = offset; } double getTimeOffset() const { return _timeOffset; } - + void setTimeMultiplier(double multiplier) { _timeMultiplier = multiplier; } double getTimeMultiplier() const { return _timeMultiplier; } @@ -289,5 +289,5 @@ /** Implements the callback. */ virtual void operator()(Node* node, NodeVisitor* nv); - + void update(osg::Node& node); @@ -305,5 +305,5 @@ protected: - + ~AnimationPathCallback(){} Index: /OpenSceneGraph/trunk/include/osg/BufferIndexBinding =================================================================== --- /OpenSceneGraph/trunk/include/osg/BufferIndexBinding (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/BufferIndexBinding (revision 13041) @@ -2,12 +2,12 @@ * Copyright (C) 2010 Tim Moore * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -46,5 +46,5 @@ // track the bindings for many different index targets. virtual unsigned getMember() const { return static_cast(_index); } - + GLenum getTarget() const { return _target; } /** Get the index target. Index: /OpenSceneGraph/trunk/include/osg/TextureCubeMap =================================================================== --- /OpenSceneGraph/trunk/include/osg/TextureCubeMap (revision 11834) +++ /OpenSceneGraph/trunk/include/osg/TextureCubeMap (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -25,5 +25,5 @@ public : - + TextureCubeMap(); @@ -32,5 +32,5 @@ META_StateAttribute(osg, TextureCubeMap,TEXTURE); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& rhs) const; @@ -87,7 +87,7 @@ virtual void subload(const TextureCubeMap& texture,State& state) const = 0; }; - + void setSubloadCallback(SubloadCallback* cb) { _subloadCallback = cb;; } - + SubloadCallback* getSubloadCallback() { return _subloadCallback.get(); } @@ -101,5 +101,5 @@ /** Get the number of mip map levels the the texture has been created with. */ - unsigned int getNumMipmapLevels() const { return _numMipmapLevels; } + unsigned int getNumMipmapLevels() const { return _numMipmapLevels; } /** Copies a two-dimensional texture subimage, as per @@ -117,8 +117,8 @@ */ virtual void apply(State& state) const; - + /** Extensions class which encapsulates the querying of extensions and - * associated function pointers, and provides convenience wrappers to + * associated function pointers, and provides convenience wrappers to * check for the extensions or use the associated functions. */ @@ -129,7 +129,7 @@ Extensions(const Extensions& rhs); - + void lowestCommonDenominator(const Extensions& rhs); - + void setupGLExtensions(unsigned int contextID); @@ -140,13 +140,13 @@ ~Extensions() {} - + bool _isCubeMapSupported; }; - + /** Function to call to get the extension of a specified context. * If the Extensions object for that context has not yet been created * and the 'createIfNotInitalized' flag been set to false then returns NULL. - * If 'createIfNotInitalized' is true then the Extensions object is + * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object will * only be created with the graphics context associated with ContextID. @@ -164,7 +164,7 @@ virtual ~TextureCubeMap(); - + bool imagesValid() const; - + virtual void computeInternalFormat() const; void allocateMipmap(State& state) const; @@ -174,6 +174,6 @@ // subloaded images can have different texture and image sizes. mutable GLsizei _textureWidth, _textureHeight; - - // number of mip map levels the the texture has been created with, + + // number of mip map levels the the texture has been created with, mutable GLsizei _numMipmapLevels; Index: /OpenSceneGraph/trunk/include/osg/Vec2 =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec2 (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/Vec2 (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/TexGenNode =================================================================== --- /OpenSceneGraph/trunk/include/osg/TexGenNode (revision 11790) +++ /OpenSceneGraph/trunk/include/osg/TexGenNode (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,6 +32,6 @@ META_Node(osg, TexGenNode); - - + + enum ReferenceFrame { @@ -39,9 +39,9 @@ ABSOLUTE_RF }; - + /** Set the TexGenNode's ReferenceFrame, either to be relative to its * parent reference frame. */ void setReferenceFrame(ReferenceFrame rf); - + /** Get the TexGenNode's ReferenceFrame.*/ ReferenceFrame getReferenceFrame() const { return _referenceFrame; } @@ -54,5 +54,5 @@ /** Set the TexGen. */ void setTexGen(TexGen* texgen); - + /** Get the TexGen. */ inline TexGen* getTexGen() { return _texgen.get(); } Index: /OpenSceneGraph/trunk/include/osg/Vec3 =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec3 (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/Vec3 (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/Vec4 =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec4 (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/Vec4 (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/CoordinateSystemNode =================================================================== --- /OpenSceneGraph/trunk/include/osg/CoordinateSystemNode (revision 10536) +++ /OpenSceneGraph/trunk/include/osg/CoordinateSystemNode (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -25,5 +25,5 @@ /** EllipsoidModel encapsulates the ellipsoid used to model astronomical bodies, - * such as sun, planets, moon etc. + * such as sun, planets, moon etc. * All distance quantities (i.e. heights + radius) are in meters, * and latitude and longitude are in radians.*/ @@ -88,5 +88,5 @@ }; -/** CoordinateFrame encapsulates the orientation of east, north and up.*/ +/** CoordinateFrame encapsulates the orientation of east, north and up.*/ typedef Matrixd CoordinateFrame; @@ -103,14 +103,14 @@ /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ CoordinateSystemNode(const CoordinateSystemNode&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - + META_Node(osg,CoordinateSystemNode); - - + + /** Set the coordinate system node up by copying the format, coordinate system string, and ellipsoid model of another coordinate system node.*/ void set(const CoordinateSystemNode& csn); - + /** Set the coordinate system format string. Typical values would be WKT, PROJ4, USGS etc.*/ void setFormat(const std::string& format) { _format = format; } - + /** Get the coordinate system format string.*/ const std::string& getFormat() const { return _format; } @@ -118,21 +118,21 @@ /** Set the CoordinateSystem reference string, should be stored in a form consistent with the Format.*/ void setCoordinateSystem(const std::string& cs) { _cs = cs; } - + /** Get the CoordinateSystem reference string.*/ const std::string& getCoordinateSystem() const { return _cs; } - - + + /** Set EllipsoidModel to describe the model used to map lat, long and height into geocentric XYZ and back. */ void setEllipsoidModel(EllipsoidModel* ellipsode) { _ellipsoidModel = ellipsode; } - + /** Get the EllipsoidModel.*/ EllipsoidModel* getEllipsoidModel() { return _ellipsoidModel.get(); } - + /** Get the const EllipsoidModel.*/ const EllipsoidModel* getEllipsoidModel() const { return _ellipsoidModel.get(); } - + /** Compute the local coordinate frame for specified point.*/ CoordinateFrame computeLocalCoordinateFrame(const Vec3d& position) const; - + /** Compute the local up-vector for specified point.*/ osg::Vec3d computeLocalUpVector(const Vec3d& position) const; @@ -141,5 +141,5 @@ virtual ~CoordinateSystemNode() {} - + std::string _format; std::string _cs; Index: /OpenSceneGraph/trunk/include/osg/Matrix =================================================================== --- /OpenSceneGraph/trunk/include/osg/Matrix (revision 8477) +++ /OpenSceneGraph/trunk/include/osg/Matrix (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/GraphicsContext =================================================================== --- /OpenSceneGraph/trunk/include/osg/GraphicsContext (revision 13038) +++ /OpenSceneGraph/trunk/include/osg/GraphicsContext (revision 13041) @@ -30,5 +30,5 @@ { public: - + struct OSG_EXPORT ScreenIdentifier { @@ -38,8 +38,8 @@ ScreenIdentifier(const std::string& in_hostName,int in_displayNum, int in_screenNum); - - /** Return the display name in the form hostName::displayNum:screenNum. */ + + /** Return the display name in the form hostName::displayNum:screenNum. */ std::string displayName() const; - + /** Read the DISPLAY environmental variable, and set the ScreenIdentifier accordingly. * Note, if either of displayNum or screenNum are not defined then -1 is set respectively to @@ -47,5 +47,5 @@ * call setUndefinedScreenDetailsToDefaultScreen() after readDISPLAY() to ensure valid values. */ void readDISPLAY(); - + /** Set the screenIndentifier from the displayName string. * Note, if either of displayNum or screenNum are not defined then -1 is set to @@ -65,10 +65,10 @@ int screenNum; }; - + /** GraphicsContext Traits object provides the specification of what type of graphics context is required.*/ struct OSG_EXPORT Traits : public osg::Referenced, public ScreenIdentifier { Traits(DisplaySettings* ds=0); - + // graphics context original and size int x; @@ -76,10 +76,10 @@ int width; int height; - + // window decoration and behaviour std::string windowName; bool windowDecoration; bool supportsResize; - + // buffer depths, 0 equals off. unsigned int red; @@ -105,8 +105,8 @@ unsigned int face; unsigned int mipMapGeneration; - + // V-sync bool vsync; - + // Swap Group bool swapGroupEnabled; @@ -116,5 +116,5 @@ // use multithreaded OpenGL-engine (OS X only) bool useMultiThreadedOpenGLEngine; - + // enable cursor bool useCursor; @@ -127,13 +127,13 @@ /** return true if glContextVersion is set in the form major.minor, and assign the appropriate major and minor values to the associated parameters.*/ bool getContextVersion(unsigned int& major, unsigned int& minor) const; - + // shared context GraphicsContext* sharedContext; - + osg::ref_ptr inheritedWindowData; - + // ask the GraphicsWindow implementation to set the pixel format of an inherited window bool setInheritedWindowPixelFormat; - + // X11 hint whether to override the window managers window size/position redirection bool overrideRedirect; @@ -178,5 +178,5 @@ virtual GraphicsContext* createGraphicsContext(Traits* traits) = 0; - + virtual ~WindowingSystemInterface() {} @@ -208,15 +208,15 @@ } }; - - + + /** Set the query the windowing system for screens and create graphics context - this functor should be supplied by the windows toolkit. */ static void setWindowingSystemInterface(WindowingSystemInterface* wsInterface); - + /** Get the WindowingSystemInterface*/ static WindowingSystemInterface* getWindowingSystemInterface(); - + /** Create a graphics context for a specified set of traits.*/ static GraphicsContext* createGraphicsContext(Traits* traits); - + /** Create a contextID for a new graphics context, this contextID is used to set up the osg::State associate with context. * Automatically increments the usage count of the contextID to 1.*/ @@ -231,13 +231,13 @@ /** Decrement the usage count associate with a contextID. Once the contextID goes to 0 the contextID is then free to be reused.*/ static void decrementContextIDUsageCount(unsigned int contextID); - + typedef std::vector GraphicsContexts; - + /** Get all the registered graphics contexts.*/ static GraphicsContexts getAllRegisteredGraphicsContexts(); - + /** Get all the registered graphics contexts associated with a specific contextID.*/ static GraphicsContexts getRegisteredGraphicsContexts(unsigned int contextID); - + /** Get the GraphicsContext for doing background compilation for GraphicsContexts associated with specified contextID.*/ static void setCompileContext(unsigned int contextID, GraphicsContext* gc); @@ -245,13 +245,13 @@ /** Get existing or create a new GraphicsContext to do background compilation for GraphicsContexts associated with specified contextID.*/ static GraphicsContext* getOrCreateCompileContext(unsigned int contextID); - + /** Get the GraphicsContext for doing background compilation for GraphicsContexts associated with specified contextID.*/ static GraphicsContext* getCompileContext(unsigned int contextID); public: - + /** Add operation to end of OperationQueue.*/ void add(Operation* operation); - + /** Remove operation from OperationQueue.*/ void remove(Operation* operation); @@ -267,5 +267,5 @@ typedef std::list< ref_ptr > GraphicsOperationQueue; - + /** Get the operations queue, not you must use the OperationsMutex when accessing the queue.*/ GraphicsOperationQueue& getOperationsQueue() { return _operations; } @@ -282,5 +282,5 @@ public: - + /** Get the traits of the GraphicsContext.*/ inline const Traits* getTraits() const { return _traits.get(); } @@ -292,8 +292,8 @@ /** Set the State object which tracks the current OpenGL state for this graphics context.*/ inline void setState(State* state) { _state = state; } - + /** Get the State object which tracks the current OpenGL state for this graphics context.*/ inline State* getState() { return _state.get(); } - + /** Get the const State object which tracks the current OpenGL state for this graphics context.*/ inline const State* getState() const { return _state.get(); } @@ -305,5 +305,5 @@ /** Returns the clear color. */ inline const Vec4& getClearColor() const { return _clearColor; } - + /** Set the clear mask used in glClear(..). * Defaults to 0 - so no clear is done by default by the GraphicsContext, instead the Cameras attached to the GraphicsContext will do the clear. @@ -313,11 +313,11 @@ /** Get the clear mask.*/ inline GLbitfield getClearMask() const { return _clearMask; } - + /** Do an OpenGL clear of the full graphics context/window. * Note, must only be called from a thread with this context current.*/ virtual void clear(); - + double getTimeSinceLastClear() const { return osg::Timer::instance()->delta_s(_lastClearTick, osg::Timer::instance()->tick()); } - + /** Realize the GraphicsContext.*/ @@ -339,17 +339,17 @@ /** Make this graphics context current. - * Implemented by calling makeCurrentImplementation(). + * Implemented by calling makeCurrentImplementation(). * Returns true on success. */ bool makeCurrent(); - + /** Make this graphics context current with specified read context. * Implemented by calling makeContextCurrentImplementation(). * Returns true on success. */ bool makeContextCurrent(GraphicsContext* readContext); - + /** Release the graphics context. * Returns true on success. */ bool releaseContext(); - + /** Return true if the current thread has this OpenGL graphics context.*/ inline bool isCurrent() const { return _threadOfLastMakeCurrent == OpenThreads::Thread::CurrentThread(); } @@ -373,5 +373,5 @@ - /** Realize the GraphicsContext implementation, + /** Realize the GraphicsContext implementation, * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ virtual bool realizeImplementation() = 0; @@ -388,5 +388,5 @@ * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ virtual bool makeCurrentImplementation() = 0; - + /** Make this graphics context current with specified read context implementation. * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ @@ -408,5 +408,5 @@ * developers to provide custom behavior for swap. * The callback must call - * GraphicsContext::swapBuffersImplementation() */ + * GraphicsContext::swapBuffersImplementation() */ void setSwapCallback(SwapCallback* rc) { _swapCallback = rc; } @@ -468,8 +468,8 @@ /** Get the the const list of cameras associated with this graphics context.*/ const Cameras& getCameras() const { return _cameras; } - + /** set the default FBO-id, this id will be used when the rendering-backend is finished with RTT FBOs */ void setDefaultFboId(GLuint i) { _defaultFboId = i; } - + GLuint getDefaultFboId() const { return _defaultFboId; } @@ -481,5 +481,5 @@ protected: - + GraphicsContext(); GraphicsContext(const GraphicsContext&, const osg::CopyOp&); @@ -499,10 +499,10 @@ void addCamera(osg::Camera* camera); void removeCamera(osg::Camera* camera); - + Cameras _cameras; friend class osg::Camera; - ref_ptr _traits; + ref_ptr _traits; ref_ptr _state; @@ -511,5 +511,5 @@ OpenThreads::Thread* _threadOfLastMakeCurrent; - + OpenThreads::Mutex _operationsMutex; osg::ref_ptr _operationsBlock; @@ -518,10 +518,10 @@ ref_ptr _graphicsThread; - + ref_ptr _resizedCallback; ref_ptr _swapCallback; - + Timer_t _lastClearTick; - + GLuint _defaultFboId; }; Index: /OpenSceneGraph/trunk/include/osg/VertexProgram =================================================================== --- /OpenSceneGraph/trunk/include/osg/VertexProgram (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/VertexProgram (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -151,9 +151,9 @@ } - + /** Set the vertex program using a C style string. */ - inline void setVertexProgram( const char* program ) - { - _vertexProgram = program; + inline void setVertexProgram( const char* program ) + { + _vertexProgram = program; dirtyVertexProgramObject(); } @@ -204,5 +204,5 @@ /** Force a recompile on next apply() of associated OpenGL vertex program objects. */ - void dirtyVertexProgramObject(); + void dirtyVertexProgramObject(); /** Use deleteVertexProgramObject instead of glDeletePrograms to allow @@ -239,5 +239,5 @@ /** Extensions class which encapsulates the querying of extensions and - * associated function pointers, and provide convenience wrappers to + * associated function pointers, and provide convenience wrappers to * check for the extensions or use the associated functions. */ @@ -248,7 +248,7 @@ Extensions(const Extensions& rhs); - + void lowestCommonDenominator(const Extensions& rhs); - + void setupGLExtensions(unsigned int contextID); @@ -259,5 +259,5 @@ void glGenPrograms(GLsizei n, GLuint *programs) const; void glDeletePrograms(GLsizei n, GLuint *programs) const; - void glProgramString(GLenum target, GLenum format, GLsizei len, const void *string) const; + void glProgramString(GLenum target, GLenum format, GLsizei len, const void *string) const; void glProgramLocalParameter4fv(GLenum target, GLuint index, const GLfloat *params) const; @@ -265,11 +265,11 @@ ~Extensions() {} - + bool _isVertexProgramSupported; - + typedef void (GL_APIENTRY * BindProgramProc) (GLenum target, GLuint id); typedef void (GL_APIENTRY * GenProgramsProc) (GLsizei n, GLuint *programs); typedef void (GL_APIENTRY * DeleteProgramsProc) (GLsizei n, GLuint *programs); - typedef void (GL_APIENTRY * ProgramStringProc) (GLenum target, GLenum format, GLsizei len, const void *string); + typedef void (GL_APIENTRY * ProgramStringProc) (GLenum target, GLenum format, GLsizei len, const void *string); typedef void (GL_APIENTRY * ProgramLocalParameter4fvProc) (GLenum target, GLuint index, const GLfloat *params); @@ -279,7 +279,7 @@ ProgramStringProc _glProgramString; ProgramLocalParameter4fvProc _glProgramLocalParameter4fv; - + }; - + /** Function to call to get the extension of a specified context. * If the Extension object for that context has not yet been created Index: /OpenSceneGraph/trunk/include/osg/Shader =================================================================== --- /OpenSceneGraph/trunk/include/osg/Shader (revision 11942) +++ /OpenSceneGraph/trunk/include/osg/Shader (revision 13041) @@ -1,3 +1,3 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * Copyright (C) 2003-2005 3Dlabs Inc. Ltd. * Copyright (C) 2004-2005 Nathan Cournia @@ -5,8 +5,8 @@ * Copyright (C) 2010 VIRES Simulationstechnologie GmbH * - * This application is open source and may be redistributed and/or modified + * This application is open source and may be redistributed and/or modified * freely and without restriction, both in commercial and non commercial * applications, as long as this copyright notice is maintained. - * + * * This application is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -34,5 +34,5 @@ class Program; -/** Simple class for wrapping up the data used in OpenGL ES 2's glShaderBinary calls. +/** Simple class for wrapping up the data used in OpenGL ES 2's glShaderBinary calls. * ShaderBinary is set up with the binary data then assigned to one or more osg::Shader. */ class OSG_EXPORT ShaderBinary : public osg::Object @@ -115,5 +115,5 @@ /** Get the Shader type as a descriptive string. */ const char* getTypename() const; - + /** Set file name for the shader source code. */ @@ -132,11 +132,11 @@ /** Set the Shader using a ShaderBinary. */ - void setShaderBinary(ShaderBinary* shaderBinary) { _shaderBinary = shaderBinary; } - + void setShaderBinary(ShaderBinary* shaderBinary) { _shaderBinary = shaderBinary; } + /** Get the Shader's ShaderBinary, return NULL if none is assigned. */ - ShaderBinary* getShaderBinary() { return _shaderBinary.get(); } + ShaderBinary* getShaderBinary() { return _shaderBinary.get(); } /** Get the const Shader's ShaderBinary, return NULL if none is assigned. */ - const ShaderBinary* getShaderBinary() const { return _shaderBinary.get(); } + const ShaderBinary* getShaderBinary() const { return _shaderBinary.get(); } @@ -178,5 +178,5 @@ /** Mark our PCSs as needing recompilation. * Also mark Programs that depend on us as needing relink */ - void dirtyShader(); + void dirtyShader(); /** If needed, compile the PCS's glShader */ @@ -268,5 +268,5 @@ CodeInjectionMap _codeInjectionMap; - + /** osg::Programs that this osg::Shader is attached to */ typedef std::set< osg::Program* > ProgramSet; Index: /OpenSceneGraph/trunk/include/osg/ClipPlane =================================================================== --- /OpenSceneGraph/trunk/include/osg/ClipPlane (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/ClipPlane (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -52,5 +52,5 @@ _clipPlaneNum=cp._clipPlaneNum; } - + virtual osg::Object* cloneType() const { return new ClipPlane( _clipPlaneNum ); } virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new ClipPlane(*this,copyop); } @@ -59,5 +59,5 @@ virtual const char* className() const { return "ClipPlane"; } virtual Type getType() const { return CLIPPLANE; } - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -87,5 +87,5 @@ /** Set the clip plane with the given Plane. */ - void setClipPlane(const Plane& plane) + void setClipPlane(const Plane& plane) { _clipPlane.set(plane[0],plane[1],plane[2],plane[3]); @@ -115,7 +115,7 @@ protected : - + virtual ~ClipPlane(); - + Vec4d _clipPlane; unsigned int _clipPlaneNum; Index: /OpenSceneGraph/trunk/include/osg/Notify =================================================================== --- /OpenSceneGraph/trunk/include/osg/Notify (revision 11560) +++ /OpenSceneGraph/trunk/include/osg/Notify (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -58,5 +58,5 @@ /** notify messaging function for providing fatal through to verbose * debugging messages. Level of messages sent to the console can - * be controlled by setting the NotifyLevel either within your + * be controlled by setting the NotifyLevel either within your * application or via the an environmental variable i.e. * - setenv OSGNOTIFYLEVEL DEBUG (for tsh) @@ -67,8 +67,8 @@ * to the notification stream (useful for debugging) setting ALWAYS will force * all messages to be absorbed, which might be appropriate for final - * applications. Default NotifyLevel is NOTICE. Check the enum + * applications. Default NotifyLevel is NOTICE. Check the enum * #NotifySeverity for full range of possibilities. To use the notify * with your code simply use the notify function as a normal file - * stream (like std::cout) i.e + * stream (like std::cout) i.e * @code * osg::notify(osg::DEBUG) << "Hello Bugs!" << std::endl; @@ -89,13 +89,13 @@ #define OSG_DEBUG_FP OSG_NOTIFY(osg::DEBUG_FP) -/** Handler processing output of notification stream. It acts as a sink to - * notification messages. It is called when notification stream needs to be +/** Handler processing output of notification stream. It acts as a sink to + * notification messages. It is called when notification stream needs to be * synchronized (i.e. after osg::notify() << std::endl). - * StandardNotifyHandler is used by default, it writes notifications to stderr + * StandardNotifyHandler is used by default, it writes notifications to stderr * (severity <= WARN) or stdout (severity > WARN). - * Notifications can be redirected to other sinks such as GUI widgets or + * Notifications can be redirected to other sinks such as GUI widgets or * windows debugger (WinDebugNotifyHandler) with custom handlers. * Use setNotifyHandler to set custom handler. - * Note that osg notification API is not thread safe although notification + * Note that osg notification API is not thread safe although notification * handler is called from many threads. When incorporating handlers into GUI * widgets you must take care of thread safety on your own. @@ -129,5 +129,5 @@ #if defined(WIN32) && !defined(__CYGWIN__) -/** Redirects notification stream to windows debugger with use of +/** Redirects notification stream to windows debugger with use of * OuputDebugString functions. * @see setNotifyHandler Index: /OpenSceneGraph/trunk/include/osg/Matrixd =================================================================== --- /OpenSceneGraph/trunk/include/osg/Matrixd (revision 13008) +++ /OpenSceneGraph/trunk/include/osg/Matrixd (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ { public: - + typedef double value_type; typedef float other_value_type; @@ -66,5 +66,5 @@ return *this; } - + Matrixd& operator = (const Matrixf& other); @@ -78,5 +78,5 @@ for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr[i]; } - + inline void set(double const * const ptr) { @@ -89,5 +89,5 @@ value_type a20, value_type a21, value_type a22,value_type a23, value_type a30, value_type a31, value_type a32,value_type a33); - + value_type * ptr() { return (value_type*)_mat; } const value_type * ptr() const { return (const value_type *)_mat; } @@ -102,13 +102,13 @@ void makeIdentity(); - + void makeScale( const Vec3f& ); void makeScale( const Vec3d& ); void makeScale( value_type, value_type, value_type ); - + void makeTranslate( const Vec3f& ); void makeTranslate( const Vec3d& ); void makeTranslate( value_type, value_type, value_type ); - + void makeRotate( const Vec3f& from, const Vec3f& to ); void makeRotate( const Vec3d& from, const Vec3d& to ); @@ -117,22 +117,22 @@ void makeRotate( value_type angle, value_type x, value_type y, value_type z ); void makeRotate( const Quat& ); - void makeRotate( value_type angle1, const Vec3f& axis1, + void makeRotate( value_type angle1, const Vec3f& axis1, value_type angle2, const Vec3f& axis2, value_type angle3, const Vec3f& axis3); - void makeRotate( value_type angle1, const Vec3d& axis1, + void makeRotate( value_type angle1, const Vec3d& axis1, value_type angle2, const Vec3d& axis2, value_type angle3, const Vec3d& axis3); - /** decompose the matrix into translation, rotation, scale and scale orientation.*/ + /** decompose the matrix into translation, rotation, scale and scale orientation.*/ void decompose( osg::Vec3f& translation, - osg::Quat& rotation, - osg::Vec3f& scale, + osg::Quat& rotation, + osg::Vec3f& scale, osg::Quat& so ) const; - /** decompose the matrix into translation, rotation, scale and scale orientation.*/ + /** decompose the matrix into translation, rotation, scale and scale orientation.*/ void decompose( osg::Vec3d& translation, - osg::Quat& rotation, - osg::Vec3d& scale, + osg::Quat& rotation, + osg::Vec3d& scale, osg::Quat& so ) const; @@ -243,6 +243,6 @@ bool invert_4x4( const Matrixd& rhs); - /** ortho-normalize the 3x3 rotation & scale matrix */ - void orthoNormalize(const Matrixd& rhs); + /** ortho-normalize the 3x3 rotation & scale matrix */ + void orthoNormalize(const Matrixd& rhs); // basic utility functions to create new matrices @@ -259,13 +259,13 @@ inline static Matrixd rotate( value_type angle, const Vec3f& axis); inline static Matrixd rotate( value_type angle, const Vec3d& axis); - inline static Matrixd rotate( value_type angle1, const Vec3f& axis1, + inline static Matrixd rotate( value_type angle1, const Vec3f& axis1, value_type angle2, const Vec3f& axis2, value_type angle3, const Vec3f& axis3); - inline static Matrixd rotate( value_type angle1, const Vec3d& axis1, + inline static Matrixd rotate( value_type angle1, const Vec3d& axis1, value_type angle2, const Vec3d& axis2, value_type angle3, const Vec3d& axis3); inline static Matrixd rotate( const Quat& quat); inline static Matrixd inverse( const Matrixd& matrix); - inline static Matrixd orthoNormal(const Matrixd& matrix); + inline static Matrixd orthoNormal(const Matrixd& matrix); /** Create an orthographic projection matrix. * See glOrtho for further details. @@ -337,14 +337,14 @@ void setTrans( const Vec3f& v ); void setTrans( const Vec3d& v ); - - inline Vec3d getTrans() const { return Vec3d(_mat[3][0],_mat[3][1],_mat[3][2]); } - + + inline Vec3d getTrans() const { return Vec3d(_mat[3][0],_mat[3][1],_mat[3][2]); } + inline Vec3d getScale() const { - Vec3d x_vec(_mat[0][0],_mat[1][0],_mat[2][0]); - Vec3d y_vec(_mat[0][1],_mat[1][1],_mat[2][1]); - Vec3d z_vec(_mat[0][2],_mat[1][2],_mat[2][2]); - return Vec3d(x_vec.length(), y_vec.length(), z_vec.length()); + Vec3d x_vec(_mat[0][0],_mat[1][0],_mat[2][0]); + Vec3d y_vec(_mat[0][1],_mat[1][1],_mat[2][1]); + Vec3d z_vec(_mat[0][2],_mat[1][2],_mat[2][2]); + return Vec3d(x_vec.length(), y_vec.length(), z_vec.length()); } - + /** apply a 3x3 transform of v*M[0..2,0..2]. */ inline static Vec3f transform3x3(const Vec3f& v,const Matrixd& m); @@ -383,10 +383,10 @@ inline void postMultRotate( const Quat& q ); - inline void operator *= ( const Matrixd& other ) + inline void operator *= ( const Matrixd& other ) { if( this == &other ) { Matrixd temp(other); postMult( temp ); } - else postMult( other ); + else postMult( other ); } @@ -406,5 +406,5 @@ { public: - + RefMatrixd():Object(false), Matrixd() {} RefMatrixd( const Matrixd& other) : Object(false), Matrixd(other) {} @@ -416,5 +416,5 @@ Matrixd::value_type a20, Matrixd::value_type a21, Matrixd::value_type a22, Matrixd::value_type a23, Matrixd::value_type a30, Matrixd::value_type a31, Matrixd::value_type a32, Matrixd::value_type a33): - Object(false), + Object(false), Matrixd(a00, a01, a02, a03, a10, a11, a12, a13, @@ -422,13 +422,13 @@ a30, a31, a32, a33) {} - virtual Object* cloneType() const { return new RefMatrixd(); } + virtual Object* cloneType() const { return new RefMatrixd(); } virtual Object* clone(const CopyOp&) const { return new RefMatrixd(*this); } virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast(obj)!=NULL; } virtual const char* libraryName() const { return "osg"; } virtual const char* className() const { return "Matrix"; } - - + + protected: - + virtual ~RefMatrixd() {} }; @@ -499,5 +499,5 @@ return m; } -inline Matrixd Matrixd::rotate( value_type angle1, const Vec3f& axis1, +inline Matrixd Matrixd::rotate( value_type angle1, const Vec3f& axis1, value_type angle2, const Vec3f& axis2, value_type angle3, const Vec3f& axis3) @@ -507,5 +507,5 @@ return m; } -inline Matrixd Matrixd::rotate( value_type angle1, const Vec3d& axis1, +inline Matrixd Matrixd::rotate( value_type angle1, const Vec3d& axis1, value_type angle2, const Vec3d& axis2, value_type angle3, const Vec3d& axis3) @@ -539,5 +539,5 @@ Matrixd m; m.orthoNormalize(matrix); - return m; + return m; } Index: /OpenSceneGraph/trunk/include/osg/Matrixf =================================================================== --- /OpenSceneGraph/trunk/include/osg/Matrixf (revision 13008) +++ /OpenSceneGraph/trunk/include/osg/Matrixf (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ { public: - + typedef float value_type; typedef double other_value_type; @@ -66,5 +66,5 @@ return *this; } - + Matrixf& operator = (const Matrixd& other); @@ -78,5 +78,5 @@ for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr[i]; } - + inline void set(double const * const ptr) { @@ -89,5 +89,5 @@ value_type a20, value_type a21, value_type a22,value_type a23, value_type a30, value_type a31, value_type a32,value_type a33); - + value_type * ptr() { return (value_type*)_mat; } const value_type * ptr() const { return (const value_type *)_mat; } @@ -102,13 +102,13 @@ void makeIdentity(); - + void makeScale( const Vec3f& ); void makeScale( const Vec3d& ); void makeScale( value_type, value_type, value_type ); - + void makeTranslate( const Vec3f& ); void makeTranslate( const Vec3d& ); void makeTranslate( value_type, value_type, value_type ); - + void makeRotate( const Vec3f& from, const Vec3f& to ); void makeRotate( const Vec3d& from, const Vec3d& to ); @@ -117,22 +117,22 @@ void makeRotate( value_type angle, value_type x, value_type y, value_type z ); void makeRotate( const Quat& ); - void makeRotate( value_type angle1, const Vec3f& axis1, + void makeRotate( value_type angle1, const Vec3f& axis1, value_type angle2, const Vec3f& axis2, value_type angle3, const Vec3f& axis3); - void makeRotate( value_type angle1, const Vec3d& axis1, + void makeRotate( value_type angle1, const Vec3d& axis1, value_type angle2, const Vec3d& axis2, value_type angle3, const Vec3d& axis3); - - /** decompose the matrix into translation, rotation, scale and scale orientation.*/ + + /** decompose the matrix into translation, rotation, scale and scale orientation.*/ void decompose( osg::Vec3f& translation, - osg::Quat& rotation, - osg::Vec3f& scale, + osg::Quat& rotation, + osg::Vec3f& scale, osg::Quat& so ) const; - /** decompose the matrix into translation, rotation, scale and scale orientation.*/ + /** decompose the matrix into translation, rotation, scale and scale orientation.*/ void decompose( osg::Vec3d& translation, - osg::Quat& rotation, - osg::Vec3d& scale, + osg::Quat& rotation, + osg::Vec3d& scale, osg::Quat& so ) const; @@ -243,6 +243,6 @@ bool invert_4x4( const Matrixf& rhs); - /** ortho-normalize the 3x3 rotation & scale matrix */ - void orthoNormalize(const Matrixf& rhs); + /** ortho-normalize the 3x3 rotation & scale matrix */ + void orthoNormalize(const Matrixf& rhs); //basic utility functions to create new matrices @@ -259,14 +259,14 @@ inline static Matrixf rotate( value_type angle, const Vec3f& axis); inline static Matrixf rotate( value_type angle, const Vec3d& axis); - inline static Matrixf rotate( value_type angle1, const Vec3f& axis1, + inline static Matrixf rotate( value_type angle1, const Vec3f& axis1, value_type angle2, const Vec3f& axis2, value_type angle3, const Vec3f& axis3); - inline static Matrixf rotate( value_type angle1, const Vec3d& axis1, + inline static Matrixf rotate( value_type angle1, const Vec3d& axis1, value_type angle2, const Vec3d& axis2, value_type angle3, const Vec3d& axis3); inline static Matrixf rotate( const Quat& quat); inline static Matrixf inverse( const Matrixf& matrix); - inline static Matrixf orthoNormal(const Matrixf& matrix); - + inline static Matrixf orthoNormal(const Matrixf& matrix); + /** Create an orthographic projection matrix. * See glOrtho for further details. @@ -339,14 +339,14 @@ void setTrans( const Vec3f& v ); void setTrans( const Vec3d& v ); - - inline Vec3d getTrans() const { return Vec3d(_mat[3][0],_mat[3][1],_mat[3][2]); } - + + inline Vec3d getTrans() const { return Vec3d(_mat[3][0],_mat[3][1],_mat[3][2]); } + inline Vec3d getScale() const { - Vec3d x_vec(_mat[0][0],_mat[1][0],_mat[2][0]); - Vec3d y_vec(_mat[0][1],_mat[1][1],_mat[2][1]); - Vec3d z_vec(_mat[0][2],_mat[1][2],_mat[2][2]); - return Vec3d(x_vec.length(), y_vec.length(), z_vec.length()); - } - + Vec3d x_vec(_mat[0][0],_mat[1][0],_mat[2][0]); + Vec3d y_vec(_mat[0][1],_mat[1][1],_mat[2][1]); + Vec3d z_vec(_mat[0][2],_mat[1][2],_mat[2][2]); + return Vec3d(x_vec.length(), y_vec.length(), z_vec.length()); + } + /** apply a 3x3 transform of v*M[0..2,0..2]. */ inline static Vec3f transform3x3(const Vec3f& v,const Matrixf& m); @@ -385,10 +385,10 @@ inline void postMultRotate( const Quat& q ); - inline void operator *= ( const Matrixf& other ) + inline void operator *= ( const Matrixf& other ) { if( this == &other ) { Matrixf temp(other); postMult( temp ); } - else postMult( other ); + else postMult( other ); } @@ -430,5 +430,5 @@ _mat[3][3]*=rhs; return *this; - } + } /** Divide by scalar. */ @@ -462,5 +462,5 @@ _mat[3][3]/=rhs; return *this; - } + } /** Binary vector add. */ @@ -483,5 +483,5 @@ _mat[3][1] + rhs._mat[3][1], _mat[3][2] + rhs._mat[3][2], - _mat[3][3] + rhs._mat[3][3]); + _mat[3][3] + rhs._mat[3][3]); } @@ -508,5 +508,5 @@ _mat[3][3] += rhs._mat[3][3]; return *this; - } + } protected: @@ -518,5 +518,5 @@ { public: - + RefMatrixf():Object(false), Matrixf() {} RefMatrixf( const Matrixf& other) : Object(false), Matrixf(other) {} @@ -528,5 +528,5 @@ Matrixf::value_type a20, Matrixf::value_type a21, Matrixf::value_type a22, Matrixf::value_type a23, Matrixf::value_type a30, Matrixf::value_type a31, Matrixf::value_type a32, Matrixf::value_type a33): - Object(false), + Object(false), Matrixf(a00, a01, a02, a03, a10, a11, a12, a13, @@ -534,13 +534,13 @@ a30, a31, a32, a33) {} - virtual Object* cloneType() const { return new RefMatrixf(); } + virtual Object* cloneType() const { return new RefMatrixf(); } virtual Object* clone(const CopyOp&) const { return new RefMatrixf(*this); } virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast(obj)!=NULL; } virtual const char* libraryName() const { return "osg"; } virtual const char* className() const { return "Matrix"; } - - + + protected: - + virtual ~RefMatrixf() {} }; @@ -611,5 +611,5 @@ return m; } -inline Matrixf Matrixf::rotate( value_type angle1, const Vec3f& axis1, +inline Matrixf Matrixf::rotate( value_type angle1, const Vec3f& axis1, value_type angle2, const Vec3f& axis2, value_type angle3, const Vec3f& axis3) @@ -619,5 +619,5 @@ return m; } -inline Matrixf Matrixf::rotate( value_type angle1, const Vec3d& axis1, +inline Matrixf Matrixf::rotate( value_type angle1, const Vec3d& axis1, value_type angle2, const Vec3d& axis2, value_type angle3, const Vec3d& axis3) @@ -651,5 +651,5 @@ Matrixf m; m.orthoNormalize(matrix); - return m; + return m; } Index: /OpenSceneGraph/trunk/include/osg/Timer =================================================================== --- /OpenSceneGraph/trunk/include/osg/Timer (revision 11790) +++ /OpenSceneGraph/trunk/include/osg/Timer (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -43,5 +43,5 @@ Timer_t getStartTick() const { return _startTick; } - + /** Get elapsed time in seconds.*/ inline double time_s() const { return delta_s(_startTick, tick()); } @@ -55,5 +55,5 @@ /** Get elapsed time in nanoseconds.*/ inline double time_n() const { return delta_n(_startTick, tick()); } - + /** Get the time in seconds between timer ticks t1 and t2.*/ inline double delta_s( Timer_t t1, Timer_t t2 ) const { return (double)(t2 - t1)*_secsPerTick; } @@ -67,5 +67,5 @@ /** Get the time in nanoseconds between timer ticks t1 and t2.*/ inline double delta_n( Timer_t t1, Timer_t t2 ) const { return delta_s(t1,t2)*1e9; } - + /** Get the the number of seconds per tick. */ inline double getSecondsPerTick() const { return _secsPerTick; } Index: /OpenSceneGraph/trunk/include/osg/CameraView =================================================================== --- /OpenSceneGraph/trunk/include/osg/CameraView (revision 11763) +++ /OpenSceneGraph/trunk/include/osg/CameraView (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -39,5 +39,5 @@ _fieldOfViewMode(pat._fieldOfViewMode), _focalLength(pat._focalLength) {} - + META_Node(osg, CameraView); @@ -63,5 +63,5 @@ /** Get the field of view.*/ inline double getFieldOfView() const { return _fieldOfView; } - + enum FieldOfViewMode { @@ -84,5 +84,5 @@ /** Get the focal length of the camera.*/ inline double getFocalLength() const { return _focalLength; } - + virtual bool computeLocalToWorldMatrix(Matrix& matrix,NodeVisitor* nv) const; @@ -91,5 +91,5 @@ protected : - + virtual ~CameraView() {} Index: /OpenSceneGraph/trunk/include/osg/PrimitiveSet =================================================================== --- /OpenSceneGraph/trunk/include/osg/PrimitiveSet (revision 12912) +++ /OpenSceneGraph/trunk/include/osg/PrimitiveSet (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -152,5 +152,5 @@ { public: - + enum Type { @@ -175,7 +175,7 @@ QUAD_STRIP = GL_QUAD_STRIP, POLYGON = GL_POLYGON, - LINES_ADJACENCY = GL_LINES_ADJACENCY_EXT, - LINE_STRIP_ADJACENCY = GL_LINE_STRIP_ADJACENCY_EXT, - TRIANGLES_ADJACENCY = GL_TRIANGLES_ADJACENCY_EXT, + LINES_ADJACENCY = GL_LINES_ADJACENCY_EXT, + LINE_STRIP_ADJACENCY = GL_LINE_STRIP_ADJACENCY_EXT, + TRIANGLES_ADJACENCY = GL_TRIANGLES_ADJACENCY_EXT, TRIANGLE_STRIP_ADJACENCY = GL_TRIANGLE_STRIP_ADJACENCY_EXT, PATCHES = GL_PATCHES @@ -186,5 +186,5 @@ _numInstances(numInstances), _mode(mode) {} - + PrimitiveSet(const PrimitiveSet& prim,const CopyOp& copyop=CopyOp::SHALLOW_COPY): BufferData(prim,copyop), @@ -196,5 +196,5 @@ virtual const char* libraryName() const { return "osg"; } virtual const char* className() const { return "PrimitiveSet"; } - + Type getType() const { return _primitiveType; } @@ -208,5 +208,5 @@ virtual DrawElements* getDrawElements() { return 0; } virtual const DrawElements* getDrawElements() const { return 0; } - + void setNumInstances(int n) { _numInstances = n; } int getNumInstances() const { return _numInstances; } @@ -216,13 +216,13 @@ virtual void draw(State& state, bool useVertexBufferObjects) const = 0; - + virtual void accept(PrimitiveFunctor& functor) const = 0; virtual void accept(PrimitiveIndexFunctor& functor) const = 0; - + virtual unsigned int index(unsigned int pos) const = 0; virtual unsigned int getNumIndices() const = 0; virtual void offsetIndices(int offset) = 0; - virtual unsigned int getNumPrimitives() const; + virtual unsigned int getNumPrimitives() const; virtual void computeRange() const {} @@ -245,5 +245,5 @@ _first(0), _count(0) {} - + DrawArrays(GLenum mode, GLint first, GLsizei count, int numInstances=0): PrimitiveSet(DrawArraysPrimitiveType, mode, numInstances), @@ -257,9 +257,9 @@ virtual Object* cloneType() const { return new DrawArrays(); } - virtual Object* clone(const CopyOp& copyop) const { return new DrawArrays(*this,copyop); } + virtual Object* clone(const CopyOp& copyop) const { return new DrawArrays(*this,copyop); } virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast(obj)!=NULL; } virtual const char* libraryName() const { return "osg"; } virtual const char* className() const { return "DrawArrays"; } - + void set(GLenum mode,GLint first, GLsizei count) @@ -272,13 +272,13 @@ void setFirst(GLint first) { _first = first; } GLint getFirst() const { return _first; } - + void setCount(GLsizei count) { _count = count; } GLsizei getCount() const { return _count; } virtual void draw(State& state, bool useVertexBufferObjects) const; - + virtual void accept(PrimitiveFunctor& functor) const; virtual void accept(PrimitiveIndexFunctor& functor) const; - + virtual unsigned int getNumIndices() const { return static_cast(_count); } virtual unsigned int index(unsigned int pos) const { return static_cast(_first)+pos; } @@ -302,5 +302,5 @@ PrimitiveSet(DrawArrayLengthsPrimitiveType,mode), _first(0) {} - + DrawArrayLengths(const DrawArrayLengths& dal,const CopyOp& copyop=CopyOp::SHALLOW_COPY): PrimitiveSet(dal,copyop), @@ -308,15 +308,15 @@ _first(dal._first) {} - DrawArrayLengths(GLenum mode, GLint first, unsigned int no, GLsizei* ptr) : + DrawArrayLengths(GLenum mode, GLint first, unsigned int no, GLsizei* ptr) : PrimitiveSet(DrawArrayLengthsPrimitiveType,mode), vector_type(ptr,ptr+no), _first(first) {} - DrawArrayLengths(GLenum mode,GLint first, unsigned int no) : + DrawArrayLengths(GLenum mode,GLint first, unsigned int no) : PrimitiveSet(DrawArrayLengthsPrimitiveType,mode), vector_type(no), _first(first) {} - DrawArrayLengths(GLenum mode,GLint first) : + DrawArrayLengths(GLenum mode,GLint first) : PrimitiveSet(DrawArrayLengthsPrimitiveType,mode), vector_type(), @@ -325,18 +325,18 @@ virtual Object* cloneType() const { return new DrawArrayLengths(); } - virtual Object* clone(const CopyOp& copyop) const { return new DrawArrayLengths(*this,copyop); } + virtual Object* clone(const CopyOp& copyop) const { return new DrawArrayLengths(*this,copyop); } virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast(obj)!=NULL; } virtual const char* libraryName() const { return "osg"; } virtual const char* className() const { return "DrawArrayLengths"; } - + void setFirst(GLint first) { _first = first; } GLint getFirst() const { return _first; } - + virtual void draw(State& state, bool useVertexBufferObjects) const; - + virtual void accept(PrimitiveFunctor& functor) const; virtual void accept(PrimitiveIndexFunctor& functor) const; - + virtual unsigned int getNumIndices() const; virtual unsigned int index(unsigned int pos) const { return _first+pos; } @@ -355,8 +355,8 @@ { public: - + DrawElements(Type primType=PrimitiveType, GLenum mode=0, int numInstances=0): PrimitiveSet(primType,mode, numInstances) {} - + DrawElements(const DrawElements& copy,const CopyOp& copyop=CopyOp::SHALLOW_COPY): PrimitiveSet(copy,copyop) {} @@ -388,10 +388,10 @@ { public: - + typedef VectorGLubyte vector_type; DrawElementsUByte(GLenum mode=0): DrawElements(DrawElementsUBytePrimitiveType,mode) {} - + DrawElementsUByte(const DrawElementsUByte& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY): DrawElements(array,copyop), @@ -401,5 +401,5 @@ * \param no Number of intended elements. This will be the size of the underlying vector. */ - DrawElementsUByte(GLenum mode, unsigned int no, const GLubyte* ptr, int numInstances=0) : + DrawElementsUByte(GLenum mode, unsigned int no, const GLubyte* ptr, int numInstances=0) : DrawElements(DrawElementsUBytePrimitiveType,mode,numInstances), vector_type(ptr,ptr+no) {} @@ -408,10 +408,10 @@ * \param no Number of intended elements. This will be the size of the underlying vector. */ - DrawElementsUByte(GLenum mode, unsigned int no) : + DrawElementsUByte(GLenum mode, unsigned int no) : DrawElements(DrawElementsUBytePrimitiveType,mode), vector_type(no) {} virtual Object* cloneType() const { return new DrawElementsUByte(); } - virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUByte(*this,copyop); } + virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUByte(*this,copyop); } virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast(obj)!=NULL; } virtual const char* libraryName() const { return "osg"; } @@ -423,5 +423,5 @@ virtual void draw(State& state, bool useVertexBufferObjects) const ; - + virtual void accept(PrimitiveFunctor& functor) const; virtual void accept(PrimitiveIndexFunctor& functor) const; @@ -430,9 +430,9 @@ virtual unsigned int index(unsigned int pos) const { return (*this)[pos]; } virtual void offsetIndices(int offset); - + virtual void reserveElements(unsigned int numIndices) { reserve(numIndices); } virtual void setElement(unsigned int i, unsigned int v) { (*this)[i] = v; } - virtual unsigned int getElement(unsigned int i) { return (*this)[i]; } - virtual void addElement(unsigned int v) { push_back(GLubyte(v)); } + virtual unsigned int getElement(unsigned int i) { return (*this)[i]; } + virtual void addElement(unsigned int v) { push_back(GLubyte(v)); } protected: @@ -450,5 +450,5 @@ DrawElementsUShort(GLenum mode=0): DrawElements(DrawElementsUShortPrimitiveType,mode) {} - + DrawElementsUShort(const DrawElementsUShort& array,const CopyOp& copyop=CopyOp::SHALLOW_COPY): DrawElements(array,copyop), @@ -458,5 +458,5 @@ * \param no Number of intended elements. This will be the size of the underlying vector. */ - DrawElementsUShort(GLenum mode, unsigned int no, const GLushort* ptr, int numInstances=0) : + DrawElementsUShort(GLenum mode, unsigned int no, const GLushort* ptr, int numInstances=0) : DrawElements(DrawElementsUShortPrimitiveType,mode,numInstances), vector_type(ptr,ptr+no) {} @@ -465,15 +465,15 @@ * \param no Number of intended elements. This will be the size of the underlying vector. */ - DrawElementsUShort(GLenum mode, unsigned int no) : + DrawElementsUShort(GLenum mode, unsigned int no) : DrawElements(DrawElementsUShortPrimitiveType,mode), vector_type(no) {} template - DrawElementsUShort(GLenum mode, InputIterator first,InputIterator last) : + DrawElementsUShort(GLenum mode, InputIterator first,InputIterator last) : DrawElements(DrawElementsUShortPrimitiveType,mode), vector_type(first,last) {} virtual Object* cloneType() const { return new DrawElementsUShort(); } - virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUShort(*this,copyop); } + virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUShort(*this,copyop); } virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast(obj)!=NULL; } virtual const char* libraryName() const { return "osg"; } @@ -485,5 +485,5 @@ virtual void draw(State& state, bool useVertexBufferObjects) const; - + virtual void accept(PrimitiveFunctor& functor) const; virtual void accept(PrimitiveIndexFunctor& functor) const; @@ -511,5 +511,5 @@ DrawElementsUInt(GLenum mode=0): DrawElements(DrawElementsUIntPrimitiveType,mode) {} - + DrawElementsUInt(const DrawElementsUInt& array,const CopyOp& copyop=CopyOp::SHALLOW_COPY): DrawElements(array,copyop), @@ -520,5 +520,5 @@ * \param no Number of intended elements. This will be the size of the underlying vector. */ - DrawElementsUInt(GLenum mode, unsigned int no, const GLuint* ptr, int numInstances=0) : + DrawElementsUInt(GLenum mode, unsigned int no, const GLuint* ptr, int numInstances=0) : DrawElements(DrawElementsUIntPrimitiveType,mode,numInstances), vector_type(ptr,ptr+no) {} @@ -527,15 +527,15 @@ * \param no Number of intended elements. This will be the size of the underlying vector. */ - DrawElementsUInt(GLenum mode, unsigned int no) : + DrawElementsUInt(GLenum mode, unsigned int no) : DrawElements(DrawElementsUIntPrimitiveType,mode), vector_type(no) {} template - DrawElementsUInt(GLenum mode, InputIterator first,InputIterator last) : + DrawElementsUInt(GLenum mode, InputIterator first,InputIterator last) : DrawElements(DrawElementsUIntPrimitiveType,mode), vector_type(first,last) {} virtual Object* cloneType() const { return new DrawElementsUInt(); } - virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUInt(*this,copyop); } + virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUInt(*this,copyop); } virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast(obj)!=NULL; } virtual const char* libraryName() const { return "osg"; } @@ -547,5 +547,5 @@ virtual void draw(State& state, bool useVertexBufferObjects) const; - + virtual void accept(PrimitiveFunctor& functor) const; virtual void accept(PrimitiveIndexFunctor& functor) const; Index: /OpenSceneGraph/trunk/include/osg/Scissor =================================================================== --- /OpenSceneGraph/trunk/include/osg/Scissor (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/Scissor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -19,10 +19,10 @@ namespace osg { -/** Encapsulate OpenGL glScissor. */ +/** Encapsulate OpenGL glScissor. */ class OSG_EXPORT Scissor : public StateAttribute { public : Scissor(); - + Scissor(int x,int y,int width,int height): _x(x), @@ -30,5 +30,5 @@ _width(width), _height(height) {} - + /** Copy constructor using CopyOp to manage deep vs shallow copy. */ @@ -41,5 +41,5 @@ META_StateAttribute(osg, Scissor, SCISSOR); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -54,5 +54,5 @@ COMPARE_StateAttribute_Parameter(_width) COMPARE_StateAttribute_Parameter(_height) - + return 0; // passed all the above comparison macros, must be equal. } @@ -72,5 +72,5 @@ _height = height; } - + void getScissor(int& x,int& y,int& width,int& height) const { @@ -83,5 +83,5 @@ inline int& x() { return _x; } inline int x() const { return _x; } - + inline int& y() { return _y; } inline int y() const { return _y; } @@ -96,5 +96,5 @@ protected: - + virtual ~Scissor(); Index: /OpenSceneGraph/trunk/include/osg/Texture2DArray =================================================================== --- /OpenSceneGraph/trunk/include/osg/Texture2DArray (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/Texture2DArray (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -20,7 +20,7 @@ namespace osg { -/** Texture2DArray state class which encapsulates OpenGL 2D array texture functionality. +/** Texture2DArray state class which encapsulates OpenGL 2D array texture functionality. * Texture arrays were introduced with Shader Model 4.0 hardware. - * + * * A 2D texture array does contain textures sharing the same properties (e.g. size, bitdepth,...) * in a layered structure. See http://www.opengl.org/registry/specs/EXT/texture_array.txt for more info. @@ -30,5 +30,5 @@ public : - + Texture2DArray(); @@ -37,5 +37,5 @@ META_StateAttribute(osg, Texture2DArray, TEXTURE); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& rhs) const; @@ -52,10 +52,10 @@ virtual const Image* getImage(unsigned int layer) const; - /** Get the number of images that are assigned to the Texture. + /** Get the number of images that are assigned to the Texture. * The number is equal to the texture depth. To get the maximum possible * image/layer count, you have to use the extension subclass, since it provides * graphic context dependent information. */ - virtual unsigned int getNumImages() const { return getTextureDepth(); } + virtual unsigned int getNumImages() const { return getTextureDepth(); } /** Check how often was a certain layer in the given context modified */ @@ -86,13 +86,13 @@ virtual void subload(const Texture2DArray& texture,State& state) const = 0; }; - - + + void setSubloadCallback(SubloadCallback* cb) { _subloadCallback = cb;; } - + SubloadCallback* getSubloadCallback() { return _subloadCallback.get(); } const SubloadCallback* getSubloadCallback() const { return _subloadCallback.get(); } - - + + /** Set the number of mip map levels the the texture has been created with. @@ -102,5 +102,5 @@ /** Get the number of mip map levels the the texture has been created with. */ - unsigned int getNumMipmapLevels() const { return _numMipmapLevels; } + unsigned int getNumMipmapLevels() const { return _numMipmapLevels; } /** Copies a two-dimensional texture subimage, as per @@ -109,6 +109,6 @@ * contents at position \a x, \a y with width \a width and height * \a height. Loads framebuffer data into the texture using offsets - * \a xoffset and \a yoffset. \a zoffset specifies the layer of the texture - * array to which the result is copied. + * \a xoffset and \a yoffset. \a zoffset specifies the layer of the texture + * array to which the result is copied. */ void copyTexSubImage2DArray(State& state, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height ); @@ -117,8 +117,8 @@ */ virtual void apply(State& state) const; - + /** Extensions class which encapsulates the querying of extensions and - * associated function pointers, and provides convenience wrappers to + * associated function pointers, and provides convenience wrappers to * check for the extensions or use the associated functions. */ @@ -129,12 +129,12 @@ Extensions(const Extensions& rhs); - + void lowestCommonDenominator(const Extensions& rhs); - + void setupGLExtensions(unsigned int contextID); void setTexture2DArraySupported(bool flag) { _isTexture2DArraySupported=flag; } bool isTexture2DArraySupported() const { return _isTexture2DArraySupported; } - + void setTexture3DSupported(bool flag) { _isTexture3DSupported=flag; } bool isTexture3DSupported() const { return _isTexture3DSupported; } @@ -142,14 +142,14 @@ void setMaxLayerCount(GLint count) { _maxLayerCount = count; } GLint maxLayerCount() const { return _maxLayerCount; } - + void setMax2DSize(GLint size) { _max2DSize = size; } GLint max2DSize() const { return _max2DSize; } - + void glTexImage3D( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels) const; void glTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels) const; - + void glCopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) const; - + bool isCompressedTexImage3DSupported() const { return _glCompressedTexImage3D!=0; } void glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data) const; @@ -161,8 +161,8 @@ ~Extensions() {} - + bool _isTexture2DArraySupported; bool _isTexture3DSupported; - + GLint _maxLayerCount; GLint _max2DSize; @@ -179,11 +179,11 @@ CompressedTexSubImage3DArbProc _glCompressedTexSubImage3D; GLCopyTexSubImageProc _glCopyTexSubImage3D; - + }; - + /** Function to call to get the extension of a specified context. * If the Extension object for that context has not yet been created * and the 'createIfNotInitalized' flag been set to false then returns NULL. - * If 'createIfNotInitalized' is true then the Extensions object is + * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object will * only be created with the graphics context associated with ContextID. @@ -201,7 +201,7 @@ virtual ~Texture2DArray(); - + bool imagesValid() const; - + virtual void computeInternalFormat() const; void allocateMipmap(State& state) const; @@ -216,6 +216,6 @@ // subloaded images can have different texture and image sizes. mutable GLsizei _textureWidth, _textureHeight, _textureDepth; - - // number of mip map levels the the texture has been created with, + + // number of mip map levels the the texture has been created with, mutable GLsizei _numMipmapLevels; Index: /OpenSceneGraph/trunk/include/osg/TransferFunction =================================================================== --- /OpenSceneGraph/trunk/include/osg/TransferFunction (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/TransferFunction (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -24,6 +24,6 @@ /** TransferFunction is a class that provide a 1D,2D or 3D colour look up table - * that can be used on the GPU as a 1D, 2D or 3D texture. - * Typically uses include mapping heights to colours when contouring terrain, + * that can be used on the GPU as a 1D, 2D or 3D texture. + * Typically uses include mapping heights to colours when contouring terrain, * or mapping intensities to colours when volume rendering. */ @@ -31,5 +31,5 @@ { public : - + TransferFunction(); @@ -44,7 +44,7 @@ /** Get the const image that is used for passing the transfer function data to the GPU.*/ const osg::Image* getImage() const { return _image.get(); } - + protected: - + virtual ~TransferFunction(); @@ -56,15 +56,15 @@ { public: - + TransferFunction1D(); - + /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ TransferFunction1D(const TransferFunction1D& tf, const CopyOp& copyop=CopyOp::SHALLOW_COPY); META_Object(osg, TransferFunction1D) - + /** Get the minimum transfer function value.*/ float getMinimum() const { return _colorMap.empty() ? 0.0f : _colorMap.begin()->first; } - + /** Get the maximum transfer function value.*/ float getMaximum() const { return _colorMap.empty() ? 0.0f : _colorMap.rbegin()->first; } @@ -76,10 +76,10 @@ /** Clear the whole range to just represent a single color.*/ void clear(const osg::Vec4& color = osg::Vec4(1.0f,1.0f,1.0f,1.0f)); - + /** Get pixel value from the image. */ osg::Vec4 getPixelValue(unsigned int i) const { if (_image.valid() && i(_image->s())) - { + { return *reinterpret_cast(_image->data(i)); } @@ -97,15 +97,15 @@ * tracks the color map. Pass in false as the updateImage parameter if you are setting up many values * at once to avoid recomputation of the image data, then once all setColor calls are made explictly call - * updateImage() to bring the osg::Image back into sync with the color map. */ + * updateImage() to bring the osg::Image back into sync with the color map. */ void setColor(float v, const osg::Vec4& color, bool updateImage=true); - + /** Get the color for a specified transfer function value, interpolating the value if no exact match is found.*/ osg::Vec4 getColor(float v) const; - + typedef std::map ColorMap; - + /** Get the color map that stores the mapping between the the transfer function value and the colour it maps to.*/ ColorMap& getColorMap() { return _colorMap; } - + /** Get the const color map that stores the mapping between the the transfer function value and the colour it maps to.*/ const ColorMap& getColorMap() const { return _colorMap; } @@ -113,12 +113,12 @@ /** Assign a color map and automatically update the image to make sure they are in sync.*/ void assign(const ColorMap& vcm); - + /** Manually update the associate osg::Image to represent the colors assigned in the color map.*/ void updateImage(); protected: - + ColorMap _colorMap; - + void assignToImage(float lower_v, const osg::Vec4& lower_c, float upper_v, const osg::Vec4& upper_c); }; Index: /OpenSceneGraph/trunk/include/osg/FragmentProgram =================================================================== --- /OpenSceneGraph/trunk/include/osg/FragmentProgram (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/FragmentProgram (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -151,12 +151,12 @@ } - + /** Set the fragment program using a C style string.*/ - inline void setFragmentProgram( const char* program ) - { - _fragmentProgram = program; + inline void setFragmentProgram( const char* program ) + { + _fragmentProgram = program; dirtyFragmentProgramObject(); } - + /** Set the fragment program using C++ style string.*/ inline void setFragmentProgram( const std::string& program ) @@ -205,5 +205,5 @@ /** Force a recompile on next apply() of associated OpenGL vertex program objects.*/ - void dirtyFragmentProgramObject(); + void dirtyFragmentProgramObject(); /** use deleteFragmentProgramObject instead of glDeletePrograms to allow @@ -236,6 +236,6 @@ /** Extensions class which encapsulates the querying of extensions and - * associated function pointers, and provide convenience wrappers to - * check for the extensions or use the associated functions.*/ + * associated function pointers, and provide convenience wrappers to + * check for the extensions or use the associated functions.*/ class OSG_EXPORT Extensions : public osg::Referenced { @@ -244,7 +244,7 @@ Extensions(const Extensions& rhs); - + void lowestCommonDenominator(const Extensions& rhs); - + void setupGLExtensions(unsigned int contextID); @@ -255,5 +255,5 @@ void glGenPrograms(GLsizei n, GLuint *programs) const; void glDeletePrograms(GLsizei n, GLuint *programs) const; - void glProgramString(GLenum target, GLenum format, GLsizei len, const void *string) const; + void glProgramString(GLenum target, GLenum format, GLsizei len, const void *string) const; void glProgramLocalParameter4fv(GLenum target, GLuint index, const GLfloat *params) const; @@ -261,11 +261,11 @@ ~Extensions() {} - + bool _isFragmentProgramSupported; - + typedef void (GL_APIENTRY * BindProgramProc) (GLenum target, GLuint id); typedef void (GL_APIENTRY * GenProgramsProc) (GLsizei n, GLuint *programs); typedef void (GL_APIENTRY * DeleteProgramsProc) (GLsizei n, GLuint *programs); - typedef void (GL_APIENTRY * ProgramStringProc) (GLenum target, GLenum format, GLsizei len, const void *string); + typedef void (GL_APIENTRY * ProgramStringProc) (GLenum target, GLenum format, GLsizei len, const void *string); typedef void (GL_APIENTRY * ProgramLocalParameter4fvProc) (GLenum target, GLuint index, const GLfloat *params); @@ -276,9 +276,9 @@ ProgramLocalParameter4fvProc _glProgramLocalParameter4fv; }; - + /** Function to call to get the extension of a specified context. - * If the Extension object for that context has not yet been created and the + * If the Extension object for that context has not yet been created and the * 'createIfNotInitalized' flag has been set to false then returns NULL. - * If 'createIfNotInitalized' is true then the Extensions object is + * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object will * only be created with the graphics context associated with ContextID..*/ Index: /OpenSceneGraph/trunk/include/osg/Endian =================================================================== --- /OpenSceneGraph/trunk/include/osg/Endian (revision 10410) +++ /OpenSceneGraph/trunk/include/osg/Endian (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -36,7 +36,7 @@ if (u.is_it_really_1 == 1) return BigEndian; - else + else return LittleEndian; -} +} inline void swapBytes( char* in, unsigned int size ) Index: /OpenSceneGraph/trunk/include/osg/FrameStamp =================================================================== --- /OpenSceneGraph/trunk/include/osg/FrameStamp (revision 12056) +++ /OpenSceneGraph/trunk/include/osg/FrameStamp (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -31,5 +31,5 @@ * and other machines when using a graphics cluster. Note the calendar * time can be an artificial simulation time or capture the real time - * of day etc.*/ + * of day etc.*/ class OSG_EXPORT FrameStamp : public Referenced { @@ -38,34 +38,34 @@ FrameStamp(); FrameStamp(const FrameStamp& fs); - + FrameStamp& operator = (const FrameStamp& fs); - + void setFrameNumber(unsigned int fnum) { _frameNumber = fnum; } unsigned int getFrameNumber() const { return _frameNumber; } - + void setReferenceTime(double refTime) { _referenceTime = refTime; } double getReferenceTime() const { return _referenceTime; } - + void setSimulationTime(double refTime) { _simulationTime = refTime; } double getSimulationTime() const { return _simulationTime; } - + void setCalendarTime(const tm& calendarTime); void getCalendarTime(tm& calendarTime) const; - // keep public to allow it to be permit allocation which is + // keep public to allow it to be permit allocation which is // not on the heap used osgcluster virtual ~FrameStamp(); protected: - + // note no dynamic memory is used so that data can be passed // via a simple memory copy or within a data packet across // the network. - + unsigned int _frameNumber; double _referenceTime; - double _simulationTime; - + double _simulationTime; + // member variables of time.h's tm structure, copied here to // ensure that all data is not dynamic. The tm structure itself @@ -82,6 +82,6 @@ int tm_yday; /* Days in year. [0-365] */ int tm_isdst; /* DST. [-1/0/1]*/ - - + + }; Index: /OpenSceneGraph/trunk/include/osg/GLBeginEndAdapter =================================================================== --- /OpenSceneGraph/trunk/include/osg/GLBeginEndAdapter (revision 12844) +++ /OpenSceneGraph/trunk/include/osg/GLBeginEndAdapter (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/ShapeDrawable =================================================================== --- /OpenSceneGraph/trunk/include/osg/ShapeDrawable (revision 8767) +++ /OpenSceneGraph/trunk/include/osg/ShapeDrawable (revision 13041) @@ -44,5 +44,5 @@ - TessellationHints(const TessellationHints& tess, const CopyOp& copyop=CopyOp::SHALLOW_COPY): + TessellationHints(const TessellationHints& tess, const CopyOp& copyop=CopyOp::SHALLOW_COPY): Object(tess,copyop), _TessellationMode(tess._TessellationMode), Index: /OpenSceneGraph/trunk/include/osg/NodeCallback =================================================================== --- /OpenSceneGraph/trunk/include/osg/NodeCallback (revision 5829) +++ /OpenSceneGraph/trunk/include/osg/NodeCallback (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,5 +26,5 @@ public : - + NodeCallback(){} @@ -33,11 +33,11 @@ _nestedCallback(nc._nestedCallback) {} - + META_Object(osg,NodeCallback); - - + + /** Callback method called by the NodeVisitor when visiting a node.*/ virtual void operator()(Node* node, NodeVisitor* nv) - { + { // note, callback is responsible for scenegraph traversal so // they must call traverse(node,nv) to ensure that the @@ -45,12 +45,12 @@ traverse(node,nv); } - + /** Call any nested callbacks and then traverse the scene graph. */ void traverse(Node* node,NodeVisitor* nv); - + void setNestedCallback(NodeCallback* nc) { _nestedCallback = nc; } NodeCallback* getNestedCallback() { return _nestedCallback.get(); } const NodeCallback* getNestedCallback() const { return _nestedCallback.get(); } - + inline void addNestedCallback(NodeCallback* nc) { @@ -68,5 +68,5 @@ } } - + inline void removeNestedCallback(NodeCallback* nc) { @@ -83,11 +83,11 @@ } } - + public: ref_ptr _nestedCallback; - + protected: - + virtual ~NodeCallback() {} }; Index: /OpenSceneGraph/trunk/include/osg/StateAttribute =================================================================== --- /OpenSceneGraph/trunk/include/osg/StateAttribute (revision 11965) +++ /OpenSceneGraph/trunk/include/osg/StateAttribute (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -43,6 +43,6 @@ /** META_StateAttribute macro define the standard clone, isSameKindAs, * className and getType methods. - * Use when subclassing from Object to make it more convenient to define - * the standard pure virtual methods which are required for all Object + * Use when subclassing from Object to make it more convenient to define + * the standard pure virtual methods which are required for all Object * subclasses.*/ #define META_StateAttribute(library,name,type) \ @@ -73,25 +73,25 @@ /** Base class for state attributes. -*/ +*/ class OSG_EXPORT StateAttribute : public Object { public : - + /** GLMode is the value used in glEnable/glDisable(mode) */ typedef GLenum GLMode; /** GLModeValue is used to specify whether a mode is enabled (ON) or disabled (OFF). - * GLMoveValue is also used to specify the override behavior of modes from parent to children. + * GLMoveValue is also used to specify the override behavior of modes from parent to children. * See enum Value description for more details.*/ typedef unsigned int GLModeValue; /** Override is used to specify the override behavior of StateAttributes - * from parent to children. + * from parent to children. * See enum Value description for more details.*/ typedef unsigned int OverrideValue; /** list values which can be used to set either GLModeValues or OverrideValues. - * When using in conjunction with GLModeValues, all Values have meaning. - * When using in conjunction with StateAttribute OverrideValue only + * When using in conjunction with GLModeValues, all Values have meaning. + * When using in conjunction with StateAttribute OverrideValue only * OFF,OVERRIDE and INHERIT are meaningful. - * However, they are useful when using GLModeValue + * However, they are useful when using GLModeValue * and OverrideValue in conjunction with each other as when using * StateSet::setAttributeAndModes(..).*/ @@ -105,9 +105,9 @@ OVERRIDE = 0x2, /** Protecting of GLMode's or StateAttributes is enabled, so that state from above cannot override this and below state.*/ - PROTECTED = 0x4, + PROTECTED = 0x4, /** means that GLMode or StateAttribute should be inherited from above.*/ INHERIT = 0x8 }; - + /** Type identifier to differentiate between different state types. */ // typedef unsigned int Type; @@ -115,14 +115,14 @@ /** Values of StateAttribute::Type used to aid identification * of different StateAttribute subclasses. Each subclass defines - * its own value in the virtual Type getType() method. When + * its own value in the virtual Type getType() method. When * extending the osg's StateAttribute's simply define your * own Type value which is unique, using the StateAttribute::Type * enum as a guide of what values to use. If your new subclass - * needs to override a standard StateAttriubte then simply use + * needs to override a standard StateAttriubte then simply use * that type's value. */ enum Type { TEXTURE, - + POLYGONMODE, POLYGONOFFSET, @@ -134,5 +134,5 @@ FOG, FRONTFACE, - + LIGHT, @@ -169,5 +169,5 @@ VALIDATOR, VIEWMATRIXEXTRACTOR, - + /// osgNV namespace OSGNV_PARAMETER_BLOCK, @@ -190,11 +190,11 @@ TRANSFORMFEEDBACKBUFFERBINDING }; - + /** Simple pairing between an attribute type and the member within that attribute type group.*/ typedef std::pair TypeMemberPair; StateAttribute(); - - StateAttribute(const StateAttribute& sa,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + + StateAttribute(const StateAttribute& sa,const CopyOp& copyop=CopyOp::SHALLOW_COPY): Object(sa,copyop), _shaderComponent(sa._shaderComponent), @@ -202,5 +202,5 @@ _eventCallback(copyop(sa._eventCallback.get())) {} - + /** Clone the type of an attribute, with Object* return type. @@ -220,13 +220,13 @@ /** Return the name of the attribute's class type.*/ virtual const char* className() const { return "StateAttribute"; } - - + + /** Fast alternative to dynamic_cast<> for determining if state attribute is a Texture.*/ virtual Texture* asTexture() { return 0; } - + /** Fast alternative to dynamic_cast<> for determining if state attribute is a Texture.*/ virtual const Texture* asTexture() const { return 0; } - + /** Return the Type identifier of the attribute's class type.*/ virtual Type getType() const = 0; @@ -243,10 +243,10 @@ /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const = 0; - + bool operator < (const StateAttribute& rhs) const { return compare(rhs)<0; } bool operator == (const StateAttribute& rhs) const { return compare(rhs)==0; } bool operator != (const StateAttribute& rhs) const { return compare(rhs)!=0; } - + /** A vector of osg::StateSet pointers which is used to store the parent(s) of this StateAttribute.*/ typedef std::vector ParentList; @@ -280,5 +280,5 @@ }; - /** Return the modes associated with this StateAttribute.*/ + /** Return the modes associated with this StateAttribute.*/ virtual bool getModeUsage(ModeUsage&) const { @@ -286,5 +286,5 @@ return false; } - + /** Check the modes associated with this StateAttribute are supported by current OpenGL drivers, * and if not set the associated mode in osg::State to be black listed/invalid. @@ -318,6 +318,6 @@ const StateAttributeCallback* getEventCallback() const { return _eventCallback.get(); } - - /** apply the OpenGL state attributes. + + /** apply the OpenGL state attributes. * The render info for the current OpenGL context is passed * in to allow the StateAttribute to obtain details on the @@ -339,5 +339,5 @@ protected: - + virtual ~StateAttribute() {} Index: /OpenSceneGraph/trunk/include/osg/Depth =================================================================== --- /OpenSceneGraph/trunk/include/osg/Depth (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/Depth (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -20,10 +20,10 @@ /** Encapsulate OpenGL glDepthFunc/Mask/Range functions. -*/ +*/ class OSG_EXPORT Depth : public StateAttribute { public : - - + + enum Function { @@ -40,5 +40,5 @@ Depth(Function func=LESS,double zNear=0.0, double zFar=1.0,bool writeMask=true); - + /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ Depth(const Depth& dp,const CopyOp& copyop=CopyOp::SHALLOW_COPY): @@ -48,8 +48,8 @@ _zFar(dp._zFar), _depthWriteMask(dp._depthWriteMask) {} - - + + META_StateAttribute(osg, Depth, DEPTH); - + /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const @@ -74,7 +74,7 @@ } - inline void setFunction(Function func) { _func = func; } + inline void setFunction(Function func) { _func = func; } inline Function getFunction() const { return _func; } - + inline void setRange(double zNear, double zFar) @@ -86,9 +86,9 @@ inline void setZNear(double zNear) { _zNear=zNear; } inline double getZNear() const { return _zNear; } - + inline void setZFar(double zFar) { _zFar=zFar; } inline double getZFar() const { return _zFar; } - inline void setWriteMask(bool mask) { _depthWriteMask = mask; } + inline void setWriteMask(bool mask) { _depthWriteMask = mask; } inline bool getWriteMask() const { return _depthWriteMask; } @@ -97,9 +97,9 @@ protected: - + virtual ~Depth(); Function _func; - + double _zNear; double _zFar; Index: /OpenSceneGraph/trunk/include/osg/ComputeBoundsVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osg/ComputeBoundsVisitor (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/ComputeBoundsVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,29 +26,29 @@ ComputeBoundsVisitor(TraversalMode traversalMode = TRAVERSE_ALL_CHILDREN); - + META_NodeVisitor("osg","ComputeBoundsVisitor") virtual void reset(); - + osg::BoundingBox& getBoundingBox() { return _bb; } void getPolytope(osg::Polytope& polytope, float margin=0.1) const; - + void getBase(osg::Polytope& polytope, float margin=0.1) const; - + void apply(osg::Node& node); - + void apply(osg::Transform& transform); - + void apply(osg::Geode& geode); - + inline void pushMatrix(osg::Matrix& matrix) { _matrixStack.push_back(matrix); } - + inline void popMatrix() { _matrixStack.pop_back(); } void applyDrawable(osg::Drawable* drawable); - + protected: - + typedef std::vector MatrixStack; Index: /OpenSceneGraph/trunk/include/osg/ArrayDispatchers =================================================================== --- /OpenSceneGraph/trunk/include/osg/ArrayDispatchers (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/ArrayDispatchers (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/TexEnv =================================================================== --- /OpenSceneGraph/trunk/include/osg/TexEnv (revision 11790) +++ /OpenSceneGraph/trunk/include/osg/TexEnv (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -43,5 +43,5 @@ TexEnv(Mode mode=MODULATE); - + /** Copy constructor using CopyOp to manage deep vs shallow copy. */ TexEnv(const TexEnv& texenv,const CopyOp& copyop=CopyOp::SHALLOW_COPY): @@ -71,9 +71,9 @@ void setMode( Mode mode ) { _mode = mode; } - + Mode getMode() const { return _mode; } - + void setColor( const Vec4& color ) { _color = color; } - + Vec4& getColor() { return _color; } Index: /OpenSceneGraph/trunk/include/osg/CollectOccludersVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osg/CollectOccludersVisitor (revision 9377) +++ /OpenSceneGraph/trunk/include/osg/CollectOccludersVisitor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -40,5 +40,5 @@ virtual float getDistanceToEyePoint(const Vec3& pos, bool withLODScale) const; virtual float getDistanceToViewPoint(const Vec3& pos, bool withLODScale) const; - + virtual float getDistanceFromEyePoint(const Vec3& pos, bool withLODScale) const; @@ -82,5 +82,5 @@ /** Prevents unwanted copy operator. */ CollectOccludersVisitor& operator = (const CollectOccludersVisitor&) { return *this; } - + inline void handle_cull_callbacks_and_traverse(osg::Node& node) { Index: /OpenSceneGraph/trunk/include/osg/Quat =================================================================== --- /OpenSceneGraph/trunk/include/osg/Quat (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/Quat (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -71,5 +71,5 @@ } - inline Quat( value_type angle1, const Vec3f& axis1, + inline Quat( value_type angle1, const Vec3f& axis1, value_type angle2, const Vec3f& axis2, value_type angle3, const Vec3f& axis3) @@ -78,5 +78,5 @@ } - inline Quat( value_type angle1, const Vec3d& axis1, + inline Quat( value_type angle1, const Vec3d& axis1, value_type angle2, const Vec3d& axis2, value_type angle3, const Vec3d& axis3) @@ -123,5 +123,5 @@ _v[3]=w; } - + inline void set(const osg::Vec4f& v) { @@ -139,13 +139,13 @@ _v[3]=v.w(); } - + void set(const Matrixf& matrix); - + void set(const Matrixd& matrix); - + void get(Matrixf& matrix) const; void get(Matrixd& matrix) const; - + inline value_type & operator [] (int i) { return _v[i]; } @@ -163,15 +163,15 @@ /** return true if the Quat represents a zero rotation, and therefore can be ignored in computations.*/ - bool zeroRotation() const { return _v[0]==0.0 && _v[1]==0.0 && _v[2]==0.0 && _v[3]==1.0; } - - - /* ------------------------------------------------------------- - BASIC ARITHMETIC METHODS + bool zeroRotation() const { return _v[0]==0.0 && _v[1]==0.0 && _v[2]==0.0 && _v[3]==1.0; } + + + /* ------------------------------------------------------------- + BASIC ARITHMETIC METHODS Implemented in terms of Vec4s. Some Vec4 operators, e.g. operator* are not appropriate for quaternions (as mathematical objects) so they are implemented differently. - Also define methods for conjugate and the multiplicative inverse. + Also define methods for conjugate and the multiplicative inverse. ------------------------------------------------------------- */ - /// Multiply by scalar + /// Multiply by scalar inline const Quat operator * (value_type rhs) const { @@ -179,5 +179,5 @@ } - /// Unary multiply by scalar + /// Unary multiply by scalar inline Quat& operator *= (value_type rhs) { @@ -189,5 +189,5 @@ } - /// Binary multiply + /// Binary multiply inline const Quat operator*(const Quat& rhs) const { @@ -198,5 +198,5 @@ } - /// Unary multiply + /// Unary multiply inline Quat& operator*=(const Quat& rhs) { @@ -213,5 +213,5 @@ } - /// Divide by scalar + /// Divide by scalar inline Quat operator / (value_type rhs) const { @@ -220,5 +220,5 @@ } - /// Unary divide by scalar + /// Unary divide by scalar inline Quat& operator /= (value_type rhs) { @@ -231,5 +231,5 @@ } - /// Binary divide + /// Binary divide inline const Quat operator/(const Quat& denom) const { @@ -237,5 +237,5 @@ } - /// Unary divide + /// Unary divide inline Quat& operator/=(const Quat& denom) { @@ -244,5 +244,5 @@ } - /// Binary addition + /// Binary addition inline const Quat operator + (const Quat& rhs) const { @@ -261,5 +261,5 @@ } - /// Binary subtraction + /// Binary subtraction inline const Quat operator - (const Quat& rhs) const { @@ -268,5 +268,5 @@ } - /// Unary subtraction + /// Unary subtraction inline Quat& operator -= (const Quat& rhs) { @@ -297,7 +297,7 @@ } - /// Conjugate + /// Conjugate inline Quat conj () const - { + { return Quat( -_v[0], -_v[1], -_v[2], _v[3] ); } @@ -309,5 +309,5 @@ } - /* -------------------------------------------------------- + /* -------------------------------------------------------- METHODS RELATED TO ROTATIONS Set a quaternion which will perform a rotation of an @@ -319,13 +319,13 @@ Not inlined - see the Quat.cpp file for implementation -------------------------------------------------------- */ - void makeRotate( value_type angle, + void makeRotate( value_type angle, value_type x, value_type y, value_type z ); void makeRotate ( value_type angle, const Vec3f& vec ); void makeRotate ( value_type angle, const Vec3d& vec ); - void makeRotate ( value_type angle1, const Vec3f& axis1, + void makeRotate ( value_type angle1, const Vec3f& axis1, value_type angle2, const Vec3f& axis2, value_type angle3, const Vec3f& axis3); - void makeRotate ( value_type angle1, const Vec3d& axis1, + void makeRotate ( value_type angle1, const Vec3d& axis1, value_type angle2, const Vec3d& axis2, value_type angle3, const Vec3d& axis3); @@ -343,5 +343,5 @@ are co-incident or opposite in direction.*/ void makeRotate( const Vec3d& vec1, const Vec3d& vec2 ); - + void makeRotate_original( const Vec3d& vec1, const Vec3d& vec2 ); @@ -358,36 +358,36 @@ As t goes from 0 to 1, the Quat object goes from "from" to "to". */ void slerp ( value_type t, const Quat& from, const Quat& to); - + /** Rotate a vector by this quaternion.*/ Vec3f operator* (const Vec3f& v) const { // nVidia SDK implementation - Vec3f uv, uuv; + Vec3f uv, uuv; Vec3f qvec(_v[0], _v[1], _v[2]); uv = qvec ^ v; - uuv = qvec ^ uv; - uv *= ( 2.0f * _v[3] ); - uuv *= 2.0f; + uuv = qvec ^ uv; + uv *= ( 2.0f * _v[3] ); + uuv *= 2.0f; return v + uv + uuv; } - + /** Rotate a vector by this quaternion.*/ Vec3d operator* (const Vec3d& v) const { // nVidia SDK implementation - Vec3d uv, uuv; + Vec3d uv, uuv; Vec3d qvec(_v[0], _v[1], _v[2]); uv = qvec ^ v; - uuv = qvec ^ uv; - uv *= ( 2.0f * _v[3] ); - uuv *= 2.0f; + uuv = qvec ^ uv; + uv *= ( 2.0f * _v[3] ); + uuv *= 2.0f; return v + uv + uuv; } - + protected: - + }; // end of class prototype } // end of namespace -#endif +#endif Index: /OpenSceneGraph/trunk/include/osg/AudioStream =================================================================== --- /OpenSceneGraph/trunk/include/osg/AudioStream (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/AudioStream (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -64,7 +64,7 @@ virtual void setAudioSink(osg::AudioSink* audio_sink) = 0; - + virtual void consumeAudioBuffer(void * const buffer, const size_t size) = 0; - + virtual int audioFrequency() const = 0; virtual int audioNbChannels() const = 0; Index: /OpenSceneGraph/trunk/include/osg/CullSettings =================================================================== --- /OpenSceneGraph/trunk/include/osg/CullSettings (revision 12805) +++ /OpenSceneGraph/trunk/include/osg/CullSettings (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -45,5 +45,5 @@ virtual ~CullSettings() {} - + CullSettings& operator = (const CullSettings& settings) { @@ -56,5 +56,5 @@ virtual void setDefaults(); - + enum VariablesMask { @@ -90,5 +90,5 @@ /** Get the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object.*/ InheritanceMask getInheritanceMask() const { return _inheritanceMask; } - + /** Set the local cull settings values from specified CullSettings object.*/ void setCullSettings(const CullSettings& settings); @@ -112,5 +112,5 @@ DO_NOT_MODIFY_INHERITANCE_MASK }; - + void setInheritanceMaskActionOnAttributeSetting(InheritanceMaskActionOnAttributeSetting action) { _inheritanceMaskActionOnAttributeSetting = action; } InheritanceMaskActionOnAttributeSetting getInheritanceMaskActionOnAttributeSetting() const { return _inheritanceMaskActionOnAttributeSetting; } @@ -166,6 +166,6 @@ }; - void setComputeNearFarMode(ComputeNearFarMode cnfm) { _computeNearFar=cnfm; applyMaskAction(COMPUTE_NEAR_FAR_MODE); } - ComputeNearFarMode getComputeNearFarMode() const { return _computeNearFar;} + void setComputeNearFarMode(ComputeNearFarMode cnfm) { _computeNearFar=cnfm; applyMaskAction(COMPUTE_NEAR_FAR_MODE); } + ComputeNearFarMode getComputeNearFarMode() const { return _computeNearFar;} void setNearFarRatio(double ratio) { _nearFarRatio = ratio; applyMaskAction(NEAR_FAR_RATIO); } @@ -193,10 +193,10 @@ CLUSTER_CULLING }; - + typedef int CullingMode; /** Set the culling mode for the CullVisitor to use.*/ void setCullingMode(CullingMode mode) { _cullingMode = mode; applyMaskAction(CULLING_MODE); } - + /** Returns the current CullingMode.*/ CullingMode getCullingMode() const { return _cullingMode; } @@ -214,5 +214,5 @@ /** Set the LOD bias for the CullVisitor to use.*/ void setLODScale(float scale) { _LODScale = scale; applyMaskAction(LOD_SCALE); } - + /** Get the LOD bias.*/ float getLODScale() const { return _LODScale; } @@ -235,5 +235,5 @@ virtual bool clampProjectionMatrixImplementation(osg::Matrixd& projection, double& znear, double& zfar) const = 0; }; - + /** set the ClampProjectionMatrixCallback.*/ void setClampProjectionMatrixCallback(ClampProjectionMatrixCallback* cpmc) { _clampProjectionMatrixCallback = cpmc; applyMaskAction(CLAMP_PROJECTION_MATRIX_CALLBACK); } @@ -262,10 +262,10 @@ bool _depthSortImpostorSprites; float _impostorPixelErrorThreshold; - int _numFramesToKeepImpostorSprites; + int _numFramesToKeepImpostorSprites; Node::NodeMask _cullMask; Node::NodeMask _cullMaskLeft; Node::NodeMask _cullMaskRight; - + }; Index: /OpenSceneGraph/trunk/include/osg/Image =================================================================== --- /OpenSceneGraph/trunk/include/osg/Image (revision 13025) +++ /OpenSceneGraph/trunk/include/osg/Image (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -94,5 +94,5 @@ #ifndef GL_OES_compressed_ETC1_RGB8_texture - #define GL_ETC1_RGB8_OES 0x8D64 + #define GL_ETC1_RGB8_OES 0x8D64 #endif @@ -109,5 +109,5 @@ Image(); - + /** Copy constructor using CopyOp to manage deep vs shallow copy. */ Image(const Image& image,const CopyOp& copyop=CopyOp::SHALLOW_COPY); @@ -130,5 +130,5 @@ void setFileName(const std::string& fileName); inline const std::string& getFileName() const { return _fileName; } - + enum WriteHint { NO_PREFERENCE, @@ -136,8 +136,8 @@ EXTERNAL_FILE }; - + void setWriteHint(WriteHint writeHint) { _writeHint = writeHint; } WriteHint getWriteHint() const { return _writeHint; } - + enum AllocationMode { NO_DELETE, @@ -145,5 +145,5 @@ USE_MALLOC_FREE }; - + /** Set the method used for deleting data once it goes out of scope. */ void setAllocationMode(AllocationMode mode) { _allocationMode = mode; } @@ -157,6 +157,6 @@ GLenum pixelFormat,GLenum type, int packing=1); - - + + /** Set the image dimensions, format and data. */ virtual void setImage(int s,int t,int r, @@ -166,5 +166,5 @@ AllocationMode mode, int packing=1, int rowLength=0); - + /** Read pixels from current frame buffer at specified position and size, using glReadPixels. * Create memory for storage if required, reuse existing pixel coords if possible. @@ -172,5 +172,5 @@ virtual void readPixels(int x,int y,int width,int height, GLenum pixelFormat,GLenum type); - + /** Read the contents of the current bound texture, handling compressed pixelFormats if present. @@ -196,10 +196,10 @@ - enum Origin + enum Origin { BOTTOM_LEFT, TOP_LEFT }; - + /** Set the origin of the image. * The default value is BOTTOM_LEFT and is consistent with OpenGL. @@ -208,8 +208,8 @@ * to handle this origin position. */ void setOrigin(Origin origin) { _origin = origin; } - + /** Get the origin of the image.*/ Origin getOrigin() const { return _origin; } - + /** Width of image. */ @@ -218,5 +218,5 @@ /** Height of image. */ inline int t() const { return _t; } - + /** Depth of image. */ inline int r() const { return _r; } @@ -224,14 +224,14 @@ void setRowLength(int length); inline int getRowLength() const { return _rowLength; } - + void setInternalTextureFormat(GLint internalFormat); inline GLint getInternalTextureFormat() const { return _internalTextureFormat; } - + void setPixelFormat(GLenum pixelFormat); inline GLenum getPixelFormat() const { return _pixelFormat; } - + void setDataType(GLenum dataType); - inline GLenum getDataType() const { return _dataType; } - + inline GLenum getDataType() const { return _dataType; } + void setPacking(unsigned int packing) { _packing = packing; } inline unsigned int getPacking() const { return _packing; } @@ -245,5 +245,5 @@ /** Get the pixel aspect ratio.*/ inline float getPixelAspectRatio() const { return _pixelAspectRatio; } - + /** Return the number of bits required for each pixel. */ inline unsigned int getPixelSizeInBits() const { return computePixelSizeInBits(_pixelFormat,_dataType); } @@ -258,6 +258,6 @@ /** Return the number of bytes each image (_s*_t) of pixels occupies. */ inline unsigned int getImageSizeInBytes() const { return getRowSizeInBytes()*_t; } - - /** Return the number of bytes between each successive image. + + /** Return the number of bytes between each successive image. * Note, getImageSizeInBytes() will only equal getImageStepInBytes() when isDataContiguous() return true. */ inline unsigned int getImageStepInBytes() const { return getRowStepInBytes()*_t; } @@ -276,5 +276,5 @@ * take care to access the data per row rather than treating the whole data as a single block. */ inline unsigned char* data() { return _data; } - + /** Raw const image data. * Note, data in successive rows may not be contiguous, isDataContiguous() return false then you should @@ -287,5 +287,5 @@ return _data+(column*getPixelSizeInBits())/8+row*getRowStepInBytes()+image*getImageSizeInBytes(); } - + inline const unsigned char* data(int column, int row=0,int image=0) const { @@ -319,7 +319,7 @@ protected: - + void assign(); - + const osg::Image* _image; int _rowNum; @@ -342,5 +342,5 @@ /** Flip the image horizontally, around s dimension. */ void flipHorizontal(); - + /** Flip the image vertically, around t dimension. */ void flipVertical(); @@ -379,5 +379,5 @@ /** Send offsets into data. It is assumed that first mipmap offset (index 0) is 0.*/ inline void setMipmapLevels(const MipmapDataType& mipmapDataVector) { _mipmapData = mipmapDataVector; } - + inline const MipmapDataType& getMipmapLevels() const { return _mipmapData; } @@ -390,5 +390,5 @@ return 0; }; - + inline unsigned char* getMipmapData(unsigned int mipmapLevel) { @@ -407,5 +407,5 @@ virtual bool isImageTranslucent() const; - /** Set the optional PixelBufferObject used to map the image memory efficiently to graphics memory. */ + /** Set the optional PixelBufferObject used to map the image memory efficiently to graphics memory. */ void setPixelBufferObject(PixelBufferObject* buffer) { setBufferObject(buffer); } @@ -465,11 +465,11 @@ AllocationMode _allocationMode; unsigned char* _data; - + void deallocateData(); - + void setData(unsigned char* data,AllocationMode allocationMode); MipmapDataType _mipmapData; - + ref_ptr _bufferObject; }; Index: /OpenSceneGraph/trunk/include/osg/GLExtensions =================================================================== --- /OpenSceneGraph/trunk/include/osg/GLExtensions (revision 11817) +++ /OpenSceneGraph/trunk/include/osg/GLExtensions (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -50,5 +50,5 @@ * is compiled locally to the calling code. This should get by Windows' * dumb implementation of having different GL function ptr's for each - * library when linked to it. + * library when linked to it. */ extern OSG_EXPORT void* getGLExtensionFuncPtr(const char *funcName); @@ -110,10 +110,10 @@ { memcpy(&t, &data, sizeof(T)); - return true; + return true; } else { t = 0; - return false; + return false; } } @@ -126,10 +126,10 @@ { memcpy(&t, &data, sizeof(T)); - return true; + return true; } else { t = 0; - return false; + return false; } } @@ -142,10 +142,10 @@ { memcpy(&t, &data, sizeof(T)); - return true; + return true; } else { t = 0; - return false; + return false; } } Index: /OpenSceneGraph/trunk/include/osg/LineWidth =================================================================== --- /OpenSceneGraph/trunk/include/osg/LineWidth (revision 4021) +++ /OpenSceneGraph/trunk/include/osg/LineWidth (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -30,7 +30,7 @@ StateAttribute(lw,copyop), _width(lw._width) {} - + META_StateAttribute(osg, LineWidth, LINEWIDTH); - + /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -47,5 +47,5 @@ void setWidth(float width); - + inline float getWidth() const { return _width; } Index: /OpenSceneGraph/trunk/include/osg/Multisample =================================================================== --- /OpenSceneGraph/trunk/include/osg/Multisample (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/Multisample (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -46,11 +46,11 @@ enum Mode { - FASTEST = GL_FASTEST, + FASTEST = GL_FASTEST, NICEST = GL_NICEST, - DONT_CARE = GL_DONT_CARE + DONT_CARE = GL_DONT_CARE }; Multisample(); - + /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ Multisample(const Multisample& trans,const CopyOp& copyop=CopyOp::SHALLOW_COPY): @@ -61,5 +61,5 @@ META_StateAttribute(osg, Multisample,MULTISAMPLE); - + /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const @@ -77,12 +77,12 @@ } - void setSampleCoverage(float coverage, bool invert) + void setSampleCoverage(float coverage, bool invert) { - _coverage = coverage; + _coverage = coverage; _invert = invert; } inline void setCoverage(float coverage) { _coverage=coverage; } inline float getCoverage() const { return _coverage; } - + inline void setInvert(bool invert) { _invert=invert; } inline bool getInvert() const { return _invert; } @@ -95,6 +95,6 @@ /** Extensions class which encapsulates the querying of extensions and - * associated function pointers, and provide convenience wrappers to - * check for the extensions or use the associated functions.*/ + * associated function pointers, and provide convenience wrappers to + * check for the extensions or use the associated functions.*/ class OSG_EXPORT Extensions : public osg::Referenced { @@ -103,7 +103,7 @@ Extensions(const Extensions& rhs); - + void lowestCommonDenominator(const Extensions& rhs); - + void setupGLExtensions(unsigned int contextID); @@ -112,5 +112,5 @@ bool isMultisampleSupported() const { return _isMultisampleSupported; } bool isMultisampleFilterHintSupported() const { return _isMultisampleFilterHintSupported; } - + void glSampleCoverage(GLclampf value, GLboolean invert) const; @@ -118,17 +118,17 @@ ~Extensions() {} - + bool _isMultisampleSupported; bool _isMultisampleFilterHintSupported; - + typedef void (GL_APIENTRY * GLSampleCoverageProc) (GLclampf value, GLboolean invert); GLSampleCoverageProc _glSampleCoverage; }; - + /** Function to call to get the extension of a specified context. - * If the Extension object for that context has not yet been created + * If the Extension object for that context has not yet been created * and the 'createIfNotInitalized' flag been set to false then returns NULL. - * If 'createIfNotInitalized' is true then the Extensions object is + * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object will * only be created with the graphics context associated with ContextID..*/ Index: /OpenSceneGraph/trunk/include/osg/Material =================================================================== --- /OpenSceneGraph/trunk/include/osg/Material (revision 10691) +++ /OpenSceneGraph/trunk/include/osg/Material (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -34,5 +34,5 @@ Material(); - + /** Copy constructor using CopyOp to manage deep vs shallow copy. */ Material(const Material& mat,const CopyOp& copyop=CopyOp::SHALLOW_COPY): @@ -56,5 +56,5 @@ META_StateAttribute(osg, Material, MATERIAL); - + /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -109,5 +109,5 @@ EMISSION = GL_EMISSION, AMBIENT_AND_DIFFUSE = GL_AMBIENT_AND_DIFFUSE, - OFF + OFF }; @@ -123,12 +123,12 @@ inline bool getDiffuseFrontAndBack() const { return _diffuseFrontAndBack; } - /** Set specular value of specified face(s) of the material, + /** Set specular value of specified face(s) of the material, * valid specular[0..3] range is 0.0 to 1.0. */ void setSpecular( Face face, const Vec4& specular ); - + /** Get the specular value for specified face. */ const Vec4& getSpecular(Face face) const; - + /** Return whether specular values are equal for front and back faces * or not. @@ -136,12 +136,12 @@ inline bool getSpecularFrontAndBack() const { return _specularFrontAndBack; } - /** Set emission value of specified face(s) of the material, + /** Set emission value of specified face(s) of the material, * valid emission[0..3] range is 0.0 to 1.0. */ void setEmission( Face face, const Vec4& emission ); - + /** Get the emission value for specified face. */ const Vec4& getEmission(Face face) const; - + /** Return whether emission values are equal for front and back faces * or not. @@ -153,13 +153,13 @@ */ void setShininess(Face face, float shininess ); - + /** Get the shininess value for specified face. */ float getShininess(Face face) const; - + /** Return whether shininess values are equal for front and back faces * or not. */ inline bool getShininessFrontAndBack() const { return _shininessFrontAndBack; } - + /** Set the alpha value of ambient, diffuse, specular and emission * colors of specified face, to 1-transparency. Index: /OpenSceneGraph/trunk/include/osg/Plane =================================================================== --- /OpenSceneGraph/trunk/include/osg/Plane (revision 11927) +++ /OpenSceneGraph/trunk/include/osg/Plane (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -28,5 +28,5 @@ /** @brief A plane class. It can be used to represent an infinite plane. - * + * * The infinite plane is described by an implicit plane equation a*x+b*y+c*z+d = 0. Though it is not mandatory that * a^2+b^2+c^2 = 1 is fulfilled in general some methods require it (@see osg::Plane::distance). */ @@ -194,5 +194,5 @@ inline Vec3_type getNormal() const { return Vec3_type(_fv[0],_fv[1],_fv[2]); } - + /** Calculate the distance between a point and the plane. * @remark This method only leads to real distance values if the plane's norm is 1. @@ -323,5 +323,5 @@ /** Transform the plane by matrix. Note, this operation carries out - * the calculation of the inverse of the matrix since a plane + * the calculation of the inverse of the matrix since a plane * must be multiplied by the inverse transposed to transform it. This * make this operation expensive. If the inverse has been already @@ -360,3 +360,3 @@ } // end of namespace -#endif +#endif Index: /OpenSceneGraph/trunk/include/osg/GL =================================================================== --- /OpenSceneGraph/trunk/include/osg/GL (revision 13040) +++ /OpenSceneGraph/trunk/include/osg/GL (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -43,5 +43,5 @@ #ifndef WIN32 - // Required for compatibility with glext.h sytle function definitions of + // Required for compatibility with glext.h sytle function definitions of // OpenGL extensions, such as in src/osg/Point.cpp. #ifndef APIENTRY @@ -57,5 +57,5 @@ #define APIENTRY __stdcall #endif - // XXX This is from Win32's + // XXX This is from Win32's #ifndef CALLBACK #define CALLBACK __stdcall @@ -65,7 +65,7 @@ // Under Windows avoid including - // to avoid name space pollution, but Win32's - // needs APIENTRY and WINGDIAPI defined properly. - // XXX This is from Win32's + // to avoid name space pollution, but Win32's + // needs APIENTRY and WINGDIAPI defined properly. + // XXX This is from Win32's #ifndef APIENTRY #define GLUT_APIENTRY_DEFINED @@ -78,5 +78,5 @@ #endif - // XXX This is from Win32's + // XXX This is from Win32's #ifndef CALLBACK #if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) @@ -89,5 +89,5 @@ #endif // __CYGWIN__ - // XXX This is from Win32's and + // XXX This is from Win32's and #ifndef WINGDIAPI #define GLUT_WINGDIAPI_DEFINED @@ -95,5 +95,5 @@ #define WINGDIAPI DECLSPEC_IMPORT #endif - + // XXX This is from Win32's #if !defined(_WCHAR_T_DEFINED) && !(defined(__GNUC__)&&((__GNUC__ == 3)||(__GNUC__ == 4))) @@ -190,5 +190,5 @@ #ifdef OSG_GL1_AVAILABLE #define OSG_GL1_FEATURES true -#else +#else #define OSG_GL1_FEATURES false #endif @@ -196,5 +196,5 @@ #ifdef OSG_GL2_AVAILABLE #define OSG_GL2_FEATURES true -#else +#else #define OSG_GL2_FEATURES false #endif @@ -202,5 +202,5 @@ #ifdef OSG_GL3_AVAILABLE #define OSG_GL3_FEATURES true -#else +#else #define OSG_GL3_FEATURES false #endif @@ -208,5 +208,5 @@ #ifdef OSG_GLES1_AVAILABLE #define OSG_GLES1_FEATURES true -#else +#else #define OSG_GLES1_FEATURES false #endif @@ -214,5 +214,5 @@ #ifdef OSG_GLES2_AVAILABLE #define OSG_GLES2_FEATURES true -#else +#else #define OSG_GLES2_FEATURES false #endif Index: /OpenSceneGraph/trunk/include/osg/ColorMatrix =================================================================== --- /OpenSceneGraph/trunk/include/osg/ColorMatrix (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/ColorMatrix (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -24,5 +24,5 @@ { public : - + ColorMatrix(); @@ -33,5 +33,5 @@ META_StateAttribute(osg, ColorMatrix, COLORMATRIX); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const Index: /OpenSceneGraph/trunk/include/osg/GL2Extensions =================================================================== --- /OpenSceneGraph/trunk/include/osg/GL2Extensions (revision 12161) +++ /OpenSceneGraph/trunk/include/osg/GL2Extensions (revision 13041) @@ -1,3 +1,3 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * Copyright (C) 2003-2005 3Dlabs Inc. Ltd. * Copyright (C) 2004-2005 Nathan Cournia @@ -6,8 +6,8 @@ * Copyright (C) 2010 VIRES Simulationstechnologie GmbH * - * This application is open source and may be redistributed and/or modified + * This application is open source and may be redistributed and/or modified * freely and without restriction, both in commercial and non commercial * applications, as long as this copyright notice is maintained. - * + * * This application is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -536,78 +536,78 @@ typedef void (GL_APIENTRY * GetObjectParameterivARBProc)(GLuint program, GLenum pname, GLint *params); typedef void (GL_APIENTRY * GetProgramInfoLogProc)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); - typedef void (GL_APIENTRY * GetInfoLogARBProc)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); - typedef void (GL_APIENTRY * GetShaderivProc)(GLuint shader, GLenum pname, GLint *params); - typedef void (GL_APIENTRY * GetShaderInfoLogProc)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); - typedef void (GL_APIENTRY * GetShaderSourceProc)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); - typedef GLint (GL_APIENTRY * GetUniformLocationProc)(GLuint program, const GLchar *name); - typedef void (GL_APIENTRY * GetUniformfvProc)(GLuint program, GLint location, GLfloat *params); - typedef void (GL_APIENTRY * GetUniformivProc)(GLuint program, GLint location, GLint *params); - typedef void (GL_APIENTRY * GetVertexAttribdvProc)(GLuint index, GLenum pname, GLdouble *params); - typedef void (GL_APIENTRY * GetVertexAttribfvProc)(GLuint index, GLenum pname, GLfloat *params); - typedef void (GL_APIENTRY * GetVertexAttribivProc)(GLuint index, GLenum pname, GLint *params); - typedef void (GL_APIENTRY * GetVertexAttribPointervProc)(GLuint index, GLenum pname, GLvoid* *pointer); - typedef GLboolean (GL_APIENTRY * IsProgramProc)(GLuint program); - typedef GLboolean (GL_APIENTRY * IsShaderProc)(GLuint shader); - typedef void (GL_APIENTRY * LinkProgramProc)(GLuint program); + typedef void (GL_APIENTRY * GetInfoLogARBProc)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); + typedef void (GL_APIENTRY * GetShaderivProc)(GLuint shader, GLenum pname, GLint *params); + typedef void (GL_APIENTRY * GetShaderInfoLogProc)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); + typedef void (GL_APIENTRY * GetShaderSourceProc)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); + typedef GLint (GL_APIENTRY * GetUniformLocationProc)(GLuint program, const GLchar *name); + typedef void (GL_APIENTRY * GetUniformfvProc)(GLuint program, GLint location, GLfloat *params); + typedef void (GL_APIENTRY * GetUniformivProc)(GLuint program, GLint location, GLint *params); + typedef void (GL_APIENTRY * GetVertexAttribdvProc)(GLuint index, GLenum pname, GLdouble *params); + typedef void (GL_APIENTRY * GetVertexAttribfvProc)(GLuint index, GLenum pname, GLfloat *params); + typedef void (GL_APIENTRY * GetVertexAttribivProc)(GLuint index, GLenum pname, GLint *params); + typedef void (GL_APIENTRY * GetVertexAttribPointervProc)(GLuint index, GLenum pname, GLvoid* *pointer); + typedef GLboolean (GL_APIENTRY * IsProgramProc)(GLuint program); + typedef GLboolean (GL_APIENTRY * IsShaderProc)(GLuint shader); + typedef void (GL_APIENTRY * LinkProgramProc)(GLuint program); typedef void (GL_APIENTRY * ShaderSourceProc)(GLuint shader, GLsizei count, const GLchar* *string, const GLint *length); - typedef void (GL_APIENTRY * UseProgramProc)(GLuint program); - typedef void (GL_APIENTRY * Uniform1fProc)(GLint location, GLfloat v0); - typedef void (GL_APIENTRY * Uniform2fProc)(GLint location, GLfloat v0, GLfloat v1); - typedef void (GL_APIENTRY * Uniform3fProc)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); - typedef void (GL_APIENTRY * Uniform4fProc)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); - typedef void (GL_APIENTRY * Uniform1iProc)(GLint location, GLint v0); - typedef void (GL_APIENTRY * Uniform2iProc)(GLint location, GLint v0, GLint v1); - typedef void (GL_APIENTRY * Uniform3iProc)(GLint location, GLint v0, GLint v1, GLint v2); - typedef void (GL_APIENTRY * Uniform4iProc)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); - typedef void (GL_APIENTRY * Uniform1fvProc)(GLint location, GLsizei count, const GLfloat *value); - typedef void (GL_APIENTRY * Uniform2fvProc)(GLint location, GLsizei count, const GLfloat *value); - typedef void (GL_APIENTRY * Uniform3fvProc)(GLint location, GLsizei count, const GLfloat *value); - typedef void (GL_APIENTRY * Uniform4fvProc)(GLint location, GLsizei count, const GLfloat *value); - typedef void (GL_APIENTRY * Uniform1ivProc)(GLint location, GLsizei count, const GLint *value); - typedef void (GL_APIENTRY * Uniform2ivProc)(GLint location, GLsizei count, const GLint *value); - typedef void (GL_APIENTRY * Uniform3ivProc)(GLint location, GLsizei count, const GLint *value); - typedef void (GL_APIENTRY * Uniform4ivProc)(GLint location, GLsizei count, const GLint *value); + typedef void (GL_APIENTRY * UseProgramProc)(GLuint program); + typedef void (GL_APIENTRY * Uniform1fProc)(GLint location, GLfloat v0); + typedef void (GL_APIENTRY * Uniform2fProc)(GLint location, GLfloat v0, GLfloat v1); + typedef void (GL_APIENTRY * Uniform3fProc)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); + typedef void (GL_APIENTRY * Uniform4fProc)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); + typedef void (GL_APIENTRY * Uniform1iProc)(GLint location, GLint v0); + typedef void (GL_APIENTRY * Uniform2iProc)(GLint location, GLint v0, GLint v1); + typedef void (GL_APIENTRY * Uniform3iProc)(GLint location, GLint v0, GLint v1, GLint v2); + typedef void (GL_APIENTRY * Uniform4iProc)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); + typedef void (GL_APIENTRY * Uniform1fvProc)(GLint location, GLsizei count, const GLfloat *value); + typedef void (GL_APIENTRY * Uniform2fvProc)(GLint location, GLsizei count, const GLfloat *value); + typedef void (GL_APIENTRY * Uniform3fvProc)(GLint location, GLsizei count, const GLfloat *value); + typedef void (GL_APIENTRY * Uniform4fvProc)(GLint location, GLsizei count, const GLfloat *value); + typedef void (GL_APIENTRY * Uniform1ivProc)(GLint location, GLsizei count, const GLint *value); + typedef void (GL_APIENTRY * Uniform2ivProc)(GLint location, GLsizei count, const GLint *value); + typedef void (GL_APIENTRY * Uniform3ivProc)(GLint location, GLsizei count, const GLint *value); + typedef void (GL_APIENTRY * Uniform4ivProc)(GLint location, GLsizei count, const GLint *value); typedef void (GL_APIENTRY * UniformMatrix2fvProc)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); typedef void (GL_APIENTRY * UniformMatrix3fvProc)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - typedef void (GL_APIENTRY * UniformMatrix4fvProc)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - typedef void (GL_APIENTRY * ValidateProgramProc)(GLuint program); - typedef void (GL_APIENTRY * VertexAttrib1dProc)(GLuint index, GLdouble x); - typedef void (GL_APIENTRY * VertexAttrib1dvProc)(GLuint index, const GLdouble *v); - typedef void (GL_APIENTRY * VertexAttrib1fProc)(GLuint index, GLfloat x); - typedef void (GL_APIENTRY * VertexAttrib1fvProc)(GLuint index, const GLfloat *v); - typedef void (GL_APIENTRY * VertexAttrib1sProc)(GLuint index, GLshort x); - typedef void (GL_APIENTRY * VertexAttrib1svProc)(GLuint index, const GLshort *v); - typedef void (GL_APIENTRY * VertexAttrib2dProc)(GLuint index, GLdouble x, GLdouble y); - typedef void (GL_APIENTRY * VertexAttrib2dvProc)(GLuint index, const GLdouble *v); - typedef void (GL_APIENTRY * VertexAttrib2fProc)(GLuint index, GLfloat x, GLfloat y); - typedef void (GL_APIENTRY * VertexAttrib2fvProc)(GLuint index, const GLfloat *v); - typedef void (GL_APIENTRY * VertexAttrib2sProc)(GLuint index, GLshort x, GLshort y); - typedef void (GL_APIENTRY * VertexAttrib2svProc)(GLuint index, const GLshort *v); - typedef void (GL_APIENTRY * VertexAttrib3dProc)(GLuint index, GLdouble x, GLdouble y, GLdouble z); - typedef void (GL_APIENTRY * VertexAttrib3dvProc)(GLuint index, const GLdouble *v); - typedef void (GL_APIENTRY * VertexAttrib3fProc)(GLuint index, GLfloat x, GLfloat y, GLfloat z); - typedef void (GL_APIENTRY * VertexAttrib3fvProc)(GLuint index, const GLfloat *v); - typedef void (GL_APIENTRY * VertexAttrib3sProc)(GLuint index, GLshort x, GLshort y, GLshort z); - typedef void (GL_APIENTRY * VertexAttrib3svProc)(GLuint index, const GLshort *v); - typedef void (GL_APIENTRY * VertexAttrib4NbvProc)(GLuint index, const GLbyte *v); - typedef void (GL_APIENTRY * VertexAttrib4NivProc)(GLuint index, const GLint *v); - typedef void (GL_APIENTRY * VertexAttrib4NsvProc)(GLuint index, const GLshort *v); - typedef void (GL_APIENTRY * VertexAttrib4NubProc)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); - typedef void (GL_APIENTRY * VertexAttrib4NubvProc)(GLuint index, const GLubyte *v); - typedef void (GL_APIENTRY * VertexAttrib4NuivProc)(GLuint index, const GLuint *v); - typedef void (GL_APIENTRY * VertexAttrib4NusvProc)(GLuint index, const GLushort *v); - typedef void (GL_APIENTRY * VertexAttrib4bvProc)(GLuint index, const GLbyte *v); - typedef void (GL_APIENTRY * VertexAttrib4dProc)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); - typedef void (GL_APIENTRY * VertexAttrib4dvProc)(GLuint index, const GLdouble *v); - typedef void (GL_APIENTRY * VertexAttrib4fProc)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); - typedef void (GL_APIENTRY * VertexAttrib4fvProc)(GLuint index, const GLfloat *v); - typedef void (GL_APIENTRY * VertexAttrib4ivProc)(GLuint index, const GLint *v); - typedef void (GL_APIENTRY * VertexAttrib4sProc)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); - typedef void (GL_APIENTRY * VertexAttrib4svProc)(GLuint index, const GLshort *v); - typedef void (GL_APIENTRY * VertexAttrib4ubvProc)(GLuint index, const GLubyte *v); - typedef void (GL_APIENTRY * VertexAttrib4uivProc)(GLuint index, const GLuint *v); - typedef void (GL_APIENTRY * VertexAttrib4usvProc)(GLuint index, const GLushort *v); + typedef void (GL_APIENTRY * UniformMatrix4fvProc)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); + typedef void (GL_APIENTRY * ValidateProgramProc)(GLuint program); + typedef void (GL_APIENTRY * VertexAttrib1dProc)(GLuint index, GLdouble x); + typedef void (GL_APIENTRY * VertexAttrib1dvProc)(GLuint index, const GLdouble *v); + typedef void (GL_APIENTRY * VertexAttrib1fProc)(GLuint index, GLfloat x); + typedef void (GL_APIENTRY * VertexAttrib1fvProc)(GLuint index, const GLfloat *v); + typedef void (GL_APIENTRY * VertexAttrib1sProc)(GLuint index, GLshort x); + typedef void (GL_APIENTRY * VertexAttrib1svProc)(GLuint index, const GLshort *v); + typedef void (GL_APIENTRY * VertexAttrib2dProc)(GLuint index, GLdouble x, GLdouble y); + typedef void (GL_APIENTRY * VertexAttrib2dvProc)(GLuint index, const GLdouble *v); + typedef void (GL_APIENTRY * VertexAttrib2fProc)(GLuint index, GLfloat x, GLfloat y); + typedef void (GL_APIENTRY * VertexAttrib2fvProc)(GLuint index, const GLfloat *v); + typedef void (GL_APIENTRY * VertexAttrib2sProc)(GLuint index, GLshort x, GLshort y); + typedef void (GL_APIENTRY * VertexAttrib2svProc)(GLuint index, const GLshort *v); + typedef void (GL_APIENTRY * VertexAttrib3dProc)(GLuint index, GLdouble x, GLdouble y, GLdouble z); + typedef void (GL_APIENTRY * VertexAttrib3dvProc)(GLuint index, const GLdouble *v); + typedef void (GL_APIENTRY * VertexAttrib3fProc)(GLuint index, GLfloat x, GLfloat y, GLfloat z); + typedef void (GL_APIENTRY * VertexAttrib3fvProc)(GLuint index, const GLfloat *v); + typedef void (GL_APIENTRY * VertexAttrib3sProc)(GLuint index, GLshort x, GLshort y, GLshort z); + typedef void (GL_APIENTRY * VertexAttrib3svProc)(GLuint index, const GLshort *v); + typedef void (GL_APIENTRY * VertexAttrib4NbvProc)(GLuint index, const GLbyte *v); + typedef void (GL_APIENTRY * VertexAttrib4NivProc)(GLuint index, const GLint *v); + typedef void (GL_APIENTRY * VertexAttrib4NsvProc)(GLuint index, const GLshort *v); + typedef void (GL_APIENTRY * VertexAttrib4NubProc)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); + typedef void (GL_APIENTRY * VertexAttrib4NubvProc)(GLuint index, const GLubyte *v); + typedef void (GL_APIENTRY * VertexAttrib4NuivProc)(GLuint index, const GLuint *v); + typedef void (GL_APIENTRY * VertexAttrib4NusvProc)(GLuint index, const GLushort *v); + typedef void (GL_APIENTRY * VertexAttrib4bvProc)(GLuint index, const GLbyte *v); + typedef void (GL_APIENTRY * VertexAttrib4dProc)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); + typedef void (GL_APIENTRY * VertexAttrib4dvProc)(GLuint index, const GLdouble *v); + typedef void (GL_APIENTRY * VertexAttrib4fProc)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); + typedef void (GL_APIENTRY * VertexAttrib4fvProc)(GLuint index, const GLfloat *v); + typedef void (GL_APIENTRY * VertexAttrib4ivProc)(GLuint index, const GLint *v); + typedef void (GL_APIENTRY * VertexAttrib4sProc)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); + typedef void (GL_APIENTRY * VertexAttrib4svProc)(GLuint index, const GLshort *v); + typedef void (GL_APIENTRY * VertexAttrib4ubvProc)(GLuint index, const GLubyte *v); + typedef void (GL_APIENTRY * VertexAttrib4uivProc)(GLuint index, const GLuint *v); + typedef void (GL_APIENTRY * VertexAttrib4usvProc)(GLuint index, const GLushort *v); typedef void (GL_APIENTRY * VertexAttribPointerProc)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - typedef void (GL_APIENTRY * UniformMatrix2x3fvProc)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ); + typedef void (GL_APIENTRY * UniformMatrix2x3fvProc)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ); typedef void (GL_APIENTRY * UniformMatrix3x2fvProc)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ); typedef void (GL_APIENTRY * UniformMatrix2x4fvProc)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ); @@ -643,5 +643,5 @@ typedef void (GL_APIENTRY * ProgramBinaryProc)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length); - BlendEquationSeparateProc _glBlendEquationSeparate; + BlendEquationSeparateProc _glBlendEquationSeparate; DrawBuffersProc _glDrawBuffers; StencilOpSeparateProc _glStencilOpSeparate; Index: /OpenSceneGraph/trunk/include/osg/OccluderNode =================================================================== --- /OpenSceneGraph/trunk/include/osg/OccluderNode (revision 11763) +++ /OpenSceneGraph/trunk/include/osg/OccluderNode (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ { public : - + OccluderNode(); @@ -34,13 +34,13 @@ META_Node(osg, OccluderNode); - - /** Attach a ConvexPlanarOccluder to an OccluderNode.*/ + + /** Attach a ConvexPlanarOccluder to an OccluderNode.*/ void setOccluder(ConvexPlanarOccluder* occluder) { _occluder = occluder; } - + /** Get the ConvexPlanarOccluder* attached to a OccluderNode. */ ConvexPlanarOccluder* getOccluder() { return _occluder.get(); } - - /** Get the const ConvexPlanarOccluder* attached to a OccluderNode.*/ + + /** Get the const ConvexPlanarOccluder* attached to a OccluderNode.*/ const ConvexPlanarOccluder* getOccluder() const { return _occluder.get(); } @@ -49,7 +49,7 @@ protected : - + virtual ~OccluderNode() {} - + ref_ptr _occluder; }; Index: /OpenSceneGraph/trunk/include/osg/MixinVector =================================================================== --- /OpenSceneGraph/trunk/include/osg/MixinVector (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/MixinVector (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -85,5 +85,5 @@ void resize(size_type new_size, const value_type& fill_value = value_type()) { _impl.resize(new_size, fill_value); } void reserve(size_type new_capacity) { _impl.reserve(new_capacity); } - + void swap(vector_type& other) { _impl.swap(other); } void swap(MixinVector& other) { _impl.swap(other._impl); } Index: /OpenSceneGraph/trunk/include/osg/Sequence =================================================================== --- /OpenSceneGraph/trunk/include/osg/Sequence (revision 10950) +++ /OpenSceneGraph/trunk/include/osg/Sequence (revision 13041) @@ -1,12 +1,12 @@ /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -17,7 +17,7 @@ #include -namespace osg +namespace osg { - + /** Sequence is a Group node which allows automatic, time based switching between children. @@ -64,12 +64,12 @@ /** Get time for child. */ double getTime(unsigned int frame) const; - + /** Set the time list for children. */ void setTimeList(const std::vector& timeList) { _frameTime = timeList; } - + /** Get the time list for children. */ const std::vector& getTimeList() const { return _frameTime; } - /** Set default time in seconds for new child. + /** Set default time in seconds for new child. if t<0, t=0 */ void setDefaultTime(double t) {_defaultTime = (t<0.?0.:t);} @@ -78,5 +78,5 @@ double getDefaultTime(void) const {return _defaultTime;}; - /** Set time of last frame of last loop, in seconds. + /** Set time of last frame of last loop, in seconds. if t<= 0, then ignored */ void setLastFrameTime(double t) {_lastFrameTime = (t<0.?0.:t);} @@ -94,20 +94,20 @@ SWING }; - + /** Set sequence mode. */ void setLoopMode(LoopMode mode) { _loopMode = mode; _value = -1; } - + /** Get sequence mode. */ LoopMode getLoopMode() const { return _loopMode; } - + /** Set interval beginning. */ void setBegin(int begin) { _begin = begin; _value = -1; } - + /** Get interval beginning. */ int getBegin() const { return _begin; } - + /** Set interval ending. */ void setEnd(int end) { _end = end; _value = -1; } - + /** Get interval ending. */ int getEnd() const { return _end; } @@ -123,14 +123,14 @@ end = _end; } - + /** Set speed. */ void setSpeed(float speed) { _speed = speed; } - + /** Get speed. */ float getSpeed() const { return _speed; } - + /** Set number of repeats. */ void setNumRepeats(int nreps) { _nreps = (nreps<0?-1:nreps); _nrepsRemain = _nreps; } - + /** Get number of repeats. */ int getNumRepeats() const { return _nreps; } @@ -218,5 +218,5 @@ // _nreps: how many times to repeat- default param is -1, repeat forever // init to 0, no repetitions - // _nrepsRemain: set to nreps and counts down every traversal, + // _nrepsRemain: set to nreps and counts down every traversal, // stopping when it gets to zero. init to 0 int _nreps, _nrepsRemain; @@ -247,5 +247,5 @@ }; - + } Index: /OpenSceneGraph/trunk/include/osg/CullingSet =================================================================== --- /OpenSceneGraph/trunk/include/osg/CullingSet (revision 12805) +++ /OpenSceneGraph/trunk/include/osg/CullingSet (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -33,6 +33,6 @@ typedef std::pair< osg::ref_ptr, osg::Polytope > StateFrustumPair; - typedef std::vector< StateFrustumPair > StateFrustumList; - + typedef std::vector< StateFrustumPair > StateFrustumList; + CullingSet(); @@ -64,9 +64,9 @@ } } - + CullingSet& operator = (const CullingSet& cs) { if (this==&cs) return *this; - + _mask = cs._mask; _frustum = cs._frustum; @@ -75,5 +75,5 @@ _pixelSizeVector = cs._pixelSizeVector; _smallFeatureCullingPixelSize = cs._smallFeatureCullingPixelSize; - + return *this; } @@ -89,5 +89,5 @@ _smallFeatureCullingPixelSize = cs._smallFeatureCullingPixelSize; } - + inline void set(const CullingSet& cs,const Matrix& matrix, const Vec4& pixelSizeVector) { @@ -100,7 +100,7 @@ //_frustum = cs._frustum; //_frustum.transformProvidingInverse(matrix); - + _frustum.setAndTransformProvidingInverse(cs._frustum,matrix); - + for(StateFrustumList::iterator sitr=_stateFrustumList.begin(); sitr!=_stateFrustumList.end(); @@ -116,7 +116,7 @@ oitr->transformProvidingInverse(matrix); } - - } - + + } + typedef std::vector OccluderList; @@ -148,8 +148,8 @@ Polytope& getFrustum() { return _frustum; } - const Polytope& getFrustum() const { return _frustum; } - + const Polytope& getFrustum() const { return _frustum; } + void addStateFrustum(StateSet* stateset, Polytope& polytope) { _stateFrustumList.push_back(StateFrustumPair(stateset,polytope)); } - + void getStateFrustumList(StateFrustumList& sfl) { _stateFrustumList = sfl; } StateFrustumList& getStateFrustumList() { return _stateFrustumList; } @@ -165,10 +165,10 @@ \param value Boulding volume size in screen space. Default is 2.0. */ void setSmallFeatureCullingPixelSize(float value) { _smallFeatureCullingPixelSize=value; } - + float& getSmallFeatureCullingPixelSize() { return _smallFeatureCullingPixelSize; } float getSmallFeatureCullingPixelSize() const { return _smallFeatureCullingPixelSize; } - - + + /** Compute the pixel of an object at position v, with specified radius.*/ float pixelSize(const Vec3& v,float radius) const { return radius/(v*_pixelSizeVector); } @@ -191,5 +191,5 @@ if (!_frustum.contains(vertices)) return true; } - + if (_mask&SMALL_FEATURE_CULLING) { @@ -209,8 +209,8 @@ } } - + return false; } - + inline bool isCulled(const BoundingBox& bb) { @@ -220,5 +220,5 @@ if (!_frustum.contains(bb)) return true; } - + if (_mask&SMALL_FEATURE_CULLING) { @@ -238,8 +238,8 @@ } } - + return false; } - + inline bool isCulled(const BoundingSphere& bs) { @@ -249,5 +249,5 @@ if (!_frustum.contains(bs)) return true; } - + if (_mask&SMALL_FEATURE_CULLING) { @@ -268,12 +268,12 @@ } } -#endif +#endif return false; } - + inline void pushCurrentMask() { _frustum.pushCurrentMask(); - + if (!_stateFrustumList.empty()) { @@ -299,5 +299,5 @@ #endif } - + inline void popCurrentMask() { @@ -326,21 +326,21 @@ #endif } - + void disableAndPushOccludersCurrentMask(NodePath& nodePath); void popOccludersCurrentMask(NodePath& nodePath); - + static osg::Vec4 computePixelSizeVector(const Viewport& W, const Matrix& P, const Matrix& M); virtual ~CullingSet(); - + protected: - + Mask _mask; Polytope _frustum; - StateFrustumList _stateFrustumList; - OccluderList _occluderList; + StateFrustumList _stateFrustumList; + OccluderList _occluderList; Vec4 _pixelSizeVector; float _smallFeatureCullingPixelSize; @@ -350,3 +350,3 @@ } // end of namespace -#endif +#endif Index: /OpenSceneGraph/trunk/include/osg/Fog =================================================================== --- /OpenSceneGraph/trunk/include/osg/Fog (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/Fog (revision 13041) @@ -1,12 +1,12 @@ /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -49,5 +49,5 @@ -/** Fog - encapsulates OpenGL fog state. */ +/** Fog - encapsulates OpenGL fog state. */ class OSG_EXPORT Fog : public StateAttribute { @@ -68,5 +68,5 @@ META_StateAttribute(osg, Fog,FOG); - + /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const @@ -114,8 +114,8 @@ inline void setColor( const Vec4 &color ) { _color = color; } inline const Vec4& getColor() const { return _color; } - + inline void setUseRadialFog( bool useRadialFog ) { _useRadialFog = useRadialFog; } inline bool getUseRadialFog() const { return _useRadialFog; } - + enum FogCoordinateSource { @@ -123,5 +123,5 @@ FRAGMENT_DEPTH = GL_FRAGMENT_DEPTH }; - + inline void setFogCoordinateSource(GLint source) { _fogCoordinateSource = source; } inline GLint getFogCoordinateSource() const { return _fogCoordinateSource; } Index: /OpenSceneGraph/trunk/include/osg/GLObjects =================================================================== --- /OpenSceneGraph/trunk/include/osg/GLObjects (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/GLObjects (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/Geode =================================================================== --- /OpenSceneGraph/trunk/include/osg/Geode (revision 9321) +++ /OpenSceneGraph/trunk/include/osg/Geode (revision 13041) @@ -41,5 +41,5 @@ virtual Geode* asGeode() { return this; } virtual const Geode* asGeode() const { return this; } - + /** Add a \c Drawable to the \c Geode. * If \c drawable is not \c NULL and is not contained in the \c Geode Index: /OpenSceneGraph/trunk/include/osg/BlendColor =================================================================== --- /OpenSceneGraph/trunk/include/osg/BlendColor (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/BlendColor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -30,7 +30,7 @@ BlendColor(); - + BlendColor(const osg::Vec4& constantColor); - + /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ BlendColor(const BlendColor& trans,const CopyOp& copyop=CopyOp::SHALLOW_COPY): @@ -39,5 +39,5 @@ META_StateAttribute(osg, BlendColor,BLENDCOLOR); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -72,5 +72,5 @@ /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convenience wrappers for - * calling extension functions. */ + * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -79,12 +79,12 @@ Extensions(const Extensions& rhs); - + void lowestCommonDenominator(const Extensions& rhs); - + void setupGLExtensions(unsigned int contextID); void setBlendColorSupported(bool flag) { _isBlendColorSupported=flag; } bool isBlendColorSupported() const { return _isBlendColorSupported; } - + void glBlendColor(GLclampf red , GLclampf green , GLclampf blue , GLclampf alpha) const; @@ -92,5 +92,5 @@ ~Extensions() {} - + typedef void (GL_APIENTRY * GLBlendColorProc) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); @@ -99,5 +99,5 @@ }; - + /** Returns the Extensions object for the given context. * If createIfNotInitalized is true and the Extensions object doesn't Index: /OpenSceneGraph/trunk/include/osg/BoundsChecking =================================================================== --- /OpenSceneGraph/trunk/include/osg/BoundsChecking (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/BoundsChecking (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -65,5 +65,5 @@ value = maxValue; } - + } @@ -113,5 +113,5 @@ value[i] = maxValue; } - + } @@ -146,5 +146,5 @@ { for(unsigned int i=first;i<=last;++i) - clampArrayElementBetweenRange(value,i,minValue,maxValue,valueName); + clampArrayElementBetweenRange(value,i,minValue,maxValue,valueName); } Index: /OpenSceneGraph/trunk/include/osg/OperationThread =================================================================== --- /OpenSceneGraph/trunk/include/osg/OperationThread (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/OperationThread (revision 13041) @@ -64,8 +64,8 @@ const std::string& getName() const { return _name; } - /** Set whether the operation should be kept once its been applied.*/ + /** Set whether the operation should be kept once its been applied.*/ void setKeep(bool keep) { _keep = keep; } - /** Get whether the operation should be kept once its been applied.*/ + /** Get whether the operation should be kept once its been applied.*/ bool getKeep() const { return _keep; } @@ -73,9 +73,9 @@ virtual void release() {} - /** Do the actual task of this operation.*/ + /** Do the actual task of this operation.*/ virtual void operator () (Object*) = 0; protected: - + Operation(): Referenced(true), @@ -98,21 +98,21 @@ { public: - + OperationQueue(); - - /** Get the next operation from the operation queue. - * Return null ref_ptr<> if no operations are left in queue. */ + + /** Get the next operation from the operation queue. + * Return null ref_ptr<> if no operations are left in queue. */ osg::ref_ptr getNextOperation(bool blockIfEmpty = false); /** Return true if the operation queue is empty. */ bool empty(); - + /** Return the num of pending operations that are sitting in the OperationQueue.*/ unsigned int getNumOperationsInQueue(); - /** Add operation to end of OperationQueue, this will be + /** Add operation to end of OperationQueue, this will be * executed by the operation thread once this operation gets to the head of the queue.*/ void add(Operation* operation); - + /** Remove operation from OperationQueue.*/ void remove(Operation* operation); @@ -123,10 +123,10 @@ /** Remove all operations from OperationQueue.*/ void removeAllOperations(); - + /** Run the operations. */ void runOperations(Object* callingObject=0); /** Call release on all operations. */ - void releaseAllOperations(); + void releaseAllOperations(); /** Release operations block that is used to block threads that are waiting on an empty operations queue.*/ @@ -134,5 +134,5 @@ typedef std::set OperationThreads; - + /** Get the set of OperationThreads that are sharing this OperationQueue. */ const OperationThreads& getOperationThreads() const { return _operationThreads; } @@ -143,8 +143,8 @@ friend class OperationThread; - + void addOperationThread(OperationThread* thread); void removeOperationThread(OperationThread* thread); - + typedef std::list< osg::ref_ptr > Operations; @@ -166,5 +166,5 @@ Object* getParent() { return _parent.get(); } - + const Object* getParent() const { return _parent.get(); } @@ -179,9 +179,9 @@ const OperationQueue* getOperationQueue() const { return _operationQueue.get(); } - - /** Add operation to end of OperationQueue, this will be + + /** Add operation to end of OperationQueue, this will be * executed by the graphics thread once this operation gets to the head of the queue.*/ void add(Operation* operation); - + /** Remove operation from OperationQueue.*/ void remove(Operation* operation); @@ -193,5 +193,5 @@ void removeAllOperations(); - + /** Get the operation currently being run.*/ osg::ref_ptr getCurrentOperation() { return _currentOperation; } @@ -199,16 +199,16 @@ /** Run does the opertion thread run loop.*/ virtual void run(); - + void setDone(bool done); - + bool getDone() const { return _done; } - /** Cancel this graphics thread.*/ + /** Cancel this graphics thread.*/ virtual int cancel(); protected: - + virtual ~OperationThread(); - + observer_ptr _parent; Index: /OpenSceneGraph/trunk/include/osg/ColorMask =================================================================== --- /OpenSceneGraph/trunk/include/osg/ColorMask (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/ColorMask (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -21,10 +21,10 @@ /** Encapsulates OpenGL glColorMaskFunc/Op/Mask functions. -*/ +*/ class OSG_EXPORT ColorMask : public StateAttribute { public : - - + + ColorMask(); @@ -34,5 +34,5 @@ _blue(blue), _alpha(alpha) {} - + /** Copy constructor using CopyOp to manage deep vs shallow copy. */ @@ -43,7 +43,7 @@ _blue(cm._blue), _alpha(cm._alpha) {} - + META_StateAttribute(osg, ColorMask, COLORMASK); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -68,7 +68,7 @@ _blue = blue; _alpha = alpha; - + } - + inline void setRedMask(bool mask) { _red=mask; } inline bool getRedMask() const { return _red; } @@ -79,5 +79,5 @@ inline void setBlueMask(bool mask) { _blue=mask; } inline bool getBlueMask() const { return _blue; } - + inline void setAlphaMask(bool mask) { _alpha=mask; } inline bool getAlphaMask() const { return _alpha; } @@ -86,5 +86,5 @@ protected: - + virtual ~ColorMask(); Index: /OpenSceneGraph/trunk/include/osg/ShaderAttribute =================================================================== --- /OpenSceneGraph/trunk/include/osg/ShaderAttribute (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/ShaderAttribute (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/LogicOp =================================================================== --- /OpenSceneGraph/trunk/include/osg/LogicOp (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/LogicOp (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -63,5 +63,5 @@ LogicOp(); - + LogicOp(Opcode opcode); @@ -72,5 +72,5 @@ META_StateAttribute(osg, LogicOp,LOGICOP); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -99,5 +99,5 @@ inline Opcode getOpcode() const { return _opcode; } - + virtual void apply(State& state) const; Index: /OpenSceneGraph/trunk/include/osg/CameraNode =================================================================== --- /OpenSceneGraph/trunk/include/osg/CameraNode (revision 5757) +++ /OpenSceneGraph/trunk/include/osg/CameraNode (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/MatrixTransform =================================================================== --- /OpenSceneGraph/trunk/include/osg/MatrixTransform (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/MatrixTransform (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -43,5 +43,5 @@ /** Set the transform's matrix.*/ void setMatrix(const Matrix& mat) { _matrix = mat; _inverseDirty=true; dirtyBound(); } - + /** Get the matrix. */ inline const Matrix& getMatrix() const { return _matrix; } @@ -49,8 +49,8 @@ /** pre multiply the transform's matrix.*/ void preMult(const Matrix& mat) { _matrix.preMult(mat); _inverseDirty=true; dirtyBound(); } - + /** post multiply the transform's matrix.*/ void postMult(const Matrix& mat) { _matrix.postMult(mat); _inverseDirty=true; dirtyBound(); } - + /** Get the inverse matrix. */ inline const Matrix& getInverseMatrix() const @@ -70,7 +70,7 @@ protected : - + virtual ~MatrixTransform(); - + Matrix _matrix; mutable Matrix _inverse; Index: /OpenSceneGraph/trunk/include/osg/Vec2b =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec2b (revision 11770) +++ /OpenSceneGraph/trunk/include/osg/Vec2b (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -34,5 +34,5 @@ /** Number of vector components. */ enum { num_components = 2 }; - + /** Vec member variable. */ value_type _v[2]; @@ -40,5 +40,5 @@ /** Constructor that sets all components of the vector to zero */ Vec2b() { _v[0]=0; _v[1]=0; } - + Vec2b(value_type r, value_type g) { @@ -97,5 +97,5 @@ { _v[0]=(value_type)((float)_v[0]*rhs); - _v[1]=(value_type)((float)_v[1]*rhs); + _v[1]=(value_type)((float)_v[1]*rhs); return *this; } @@ -129,5 +129,5 @@ { _v[0] += rhs._v[0]; - _v[1] += rhs._v[1]; + _v[1] += rhs._v[1]; return *this; } @@ -143,5 +143,5 @@ { _v[0]-=rhs._v[0]; - _v[1]-=rhs._v[1]; + _v[1]-=rhs._v[1]; return *this; } Index: /OpenSceneGraph/trunk/include/osg/Switch =================================================================== --- /OpenSceneGraph/trunk/include/osg/Switch (revision 9321) +++ /OpenSceneGraph/trunk/include/osg/Switch (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -21,5 +21,5 @@ /** Switch is a Group node that allows switching between children. * Typical uses would be for objects which might need to be rendered - * differently at different times, for instance a switch could be used + * differently at different times, for instance a switch could be used * to represent the different states of a traffic light. */ @@ -27,5 +27,5 @@ { public : - + Switch(); @@ -41,7 +41,7 @@ virtual void traverse(NodeVisitor& nv); - + void setNewChildDefaultValue(bool value) { _newChildDefaultValue = value; } - + bool getNewChildDefaultValue() const { return _newChildDefaultValue; } @@ -62,5 +62,5 @@ void setChildValue(const Node* child,bool value); - + bool getChildValue(const Node* child) const; @@ -68,15 +68,15 @@ * value to off (false). */ bool setAllChildrenOff(); - + /** Set all the children on (true), and set the new default child * value to on (true). */ bool setAllChildrenOn(); - + /** Set a single child on, switch off all other children. */ bool setSingleChildOn(unsigned int pos); - + typedef std::vector ValueList; - + void setValueList(const ValueList& values) { _values=values; } @@ -86,5 +86,5 @@ protected : - + virtual ~Switch() {} Index: /OpenSceneGraph/trunk/include/osg/Hint =================================================================== --- /OpenSceneGraph/trunk/include/osg/Hint (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/Hint (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -54,5 +54,5 @@ COMPARE_StateAttribute_Parameter(_target) COMPARE_StateAttribute_Parameter(_mode) - + return 0; } @@ -60,8 +60,8 @@ /** Return the member identifier within the attribute's class type. Used for light number/clip plane number etc.*/ virtual unsigned int getMember() const { return static_cast(_target); } - + void setTarget(GLenum target); inline GLenum getTarget() const { return _target; } - + inline void setMode(GLenum mode) { _mode = mode; } inline GLenum getMode() const { return _mode; } @@ -71,5 +71,5 @@ protected: - + GLenum _target; GLenum _mode; Index: /OpenSceneGraph/trunk/include/osg/Referenced =================================================================== --- /OpenSceneGraph/trunk/include/osg/Referenced (revision 12897) +++ /OpenSceneGraph/trunk/include/osg/Referenced (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -46,7 +46,7 @@ - Referenced(); - - explicit Referenced(bool threadSafeRefUnref); + Referenced(); + + explicit Referenced(bool threadSafeRefUnref); Referenced(const Referenced&); @@ -75,22 +75,22 @@ static OpenThreads::Mutex* getGlobalReferencedMutex(); - /** Increment the reference count by one, indicating that + /** Increment the reference count by one, indicating that this object has another pointer which is referencing it.*/ inline int ref() const; - - /** Decrement the reference count by one, indicating that + + /** Decrement the reference count by one, indicating that a pointer to this object is no longer referencing it. If the reference count goes to zero, it is assumed that this object is no longer referenced and is automatically deleted.*/ inline int unref() const; - - /** Decrement the reference count by one, indicating that + + /** Decrement the reference count by one, indicating that a pointer to this object is no longer referencing it. However, do - not delete it, even if ref count goes to 0. Warning, unref_nodelete() + not delete it, even if ref count goes to 0. Warning, unref_nodelete() should only be called if the user knows exactly who will - be responsible for, one should prefer unref() over unref_nodelete() + be responsible for, one should prefer unref() over unref_nodelete() as the latter can lead to memory leaks.*/ int unref_nodelete() const; - + /** Return the number of pointers currently referencing this object. */ inline int referenceCount() const { return _refCount; } @@ -120,5 +120,5 @@ /** Set whether reference counting should use a mutex for thread safe reference counting.*/ static void setThreadSafeReferenceCounting(bool enableThreadSafeReferenceCounting); - + /** Get whether reference counting is active.*/ static bool getThreadSafeReferenceCounting(); @@ -133,7 +133,7 @@ static DeleteHandler* getDeleteHandler(); - + protected: - + virtual ~Referenced(); @@ -147,9 +147,9 @@ mutable OpenThreads::Atomic _refCount; #else - + mutable OpenThreads::Mutex* _refMutex; mutable int _refCount; - + mutable void* _observerSet; #endif @@ -163,5 +163,5 @@ if (_refMutex) { - OpenThreads::ScopedLock lock(*_refMutex); + OpenThreads::ScopedLock lock(*_refMutex); return ++_refCount; } @@ -183,5 +183,5 @@ if (_refMutex) { - OpenThreads::ScopedLock lock(*_refMutex); + OpenThreads::ScopedLock lock(*_refMutex); newRef = --_refCount; needDelete = newRef==0; Index: /OpenSceneGraph/trunk/include/osg/Vec2d =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec2d (revision 11770) +++ /OpenSceneGraph/trunk/include/osg/Vec2d (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -35,5 +35,5 @@ /** Number of vector components. */ enum { num_components = 2 }; - + value_type _v[2]; @@ -44,5 +44,5 @@ inline Vec2d(const Vec2f& vec) { _v[0]=vec._v[0]; _v[1]=vec._v[1]; } - + inline operator Vec2f() const { return Vec2f(static_cast(_v[0]),static_cast(_v[1]));} Index: /OpenSceneGraph/trunk/include/osg/Vec2f =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec2f (revision 11790) +++ /OpenSceneGraph/trunk/include/osg/Vec2f (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -35,8 +35,8 @@ /** Number of vector components. */ enum { num_components = 2 }; - + /** Vec member variable. */ value_type _v[2]; - + /** Constructor that sets all components of the vector to zero */ @@ -171,5 +171,5 @@ return( norm ); } - + }; // end of class Vec2f Index: /OpenSceneGraph/trunk/include/osg/TriangleFunctor =================================================================== --- /OpenSceneGraph/trunk/include/osg/TriangleFunctor (revision 7648) +++ /OpenSceneGraph/trunk/include/osg/TriangleFunctor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -64,5 +64,5 @@ } - virtual void setVertexArray(unsigned int,const Vec4* ) + virtual void setVertexArray(unsigned int,const Vec4* ) { notify(WARN)<<"Triangle Functor does not support Vec4* vertex arrays"<operator()(_vertexArrayPtr[*iptr],_vertexArrayPtr[*(iptr+1)],_vertexArrayPtr[*(iptr+2)],_treatVertexDataAsTemporary); - } + } break; } @@ -282,12 +282,12 @@ break; } - } + } virtual void drawElements(GLenum mode,GLsizei count,const GLuint* indices) { if (indices==0 || count==0) return; - + typedef const GLuint* IndexPointer; - + switch(mode) { Index: /OpenSceneGraph/trunk/include/osg/LineSegment =================================================================== --- /OpenSceneGraph/trunk/include/osg/LineSegment (revision 7935) +++ /OpenSceneGraph/trunk/include/osg/LineSegment (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -36,5 +36,5 @@ inline void set(const vec_type& s,const vec_type& e) { _s=s; _e=e; } - + inline vec_type& start() { return _s; } inline const vec_type& start() const { return _s; } @@ -65,5 +65,5 @@ */ bool intersect(const BoundingSphere& bs,float& r1,float& r2) const; - + /** return true if segment intersects BoundingSphere and return the * intersection ratio. @@ -90,5 +90,5 @@ virtual ~LineSegment(); - + static bool intersectAndClip(vec_type& s,vec_type& e,const BoundingBox& bb); Index: /OpenSceneGraph/trunk/include/osg/ClusterCullingCallback =================================================================== --- /OpenSceneGraph/trunk/include/osg/ClusterCullingCallback (revision 6434) +++ /OpenSceneGraph/trunk/include/osg/ClusterCullingCallback (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -37,5 +37,5 @@ * given drawable contents. */ void computeFrom(const osg::Drawable* drawable); - + /** Transform the ClusterCullingCallback's positional members to a new coordinate frame.*/ void transform(const osg::Matrixd& matrix); Index: /OpenSceneGraph/trunk/include/osg/buffered_value =================================================================== --- /OpenSceneGraph/trunk/include/osg/buffered_value (revision 5882) +++ /OpenSceneGraph/trunk/include/osg/buffered_value (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -22,10 +22,10 @@ /** Implements a simple buffered value for values that need to be buffered on * a per graphics context basis. -*/ +*/ template class buffered_value { public: - + inline buffered_value(): _array(DisplaySettings::instance()->getMaxNumberOfGraphicsContexts(),0) @@ -41,5 +41,5 @@ return *this; } - + inline void setAllElementsTo(const T& t) { std::fill(_array.begin(),_array.end(),t); } @@ -49,5 +49,5 @@ inline unsigned int size() const { return _array.size(); } - + inline void resize(unsigned int newSize) { _array.resize(newSize,0); } @@ -71,5 +71,5 @@ protected: - + mutable std::vector _array; }; @@ -79,5 +79,5 @@ { public: - + inline buffered_object(): _array(DisplaySettings::instance()->getMaxNumberOfGraphicsContexts()) @@ -121,8 +121,8 @@ return _array[pos]; } - + protected: - + mutable std::vector _array; }; Index: /OpenSceneGraph/trunk/include/osg/BoundingBox =================================================================== --- /OpenSceneGraph/trunk/include/osg/BoundingBox (revision 9762) +++ /OpenSceneGraph/trunk/include/osg/BoundingBox (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -36,5 +36,5 @@ typedef VT vec_type; typedef typename VT::value_type value_type; - + /** Minimum extent. (Smallest X, Y, and Z values of all coordinates.) */ vec_type _min; @@ -51,5 +51,5 @@ -FLT_MAX) {} - + /** Creates a bounding box initialized to the given extents. */ inline BoundingBoxImpl(value_type xmin, value_type ymin, value_type zmin, @@ -59,5 +59,5 @@ /** Creates a bounding box initialized to the given extents. */ - inline BoundingBoxImpl(const vec_type& min,const vec_type& max) : + inline BoundingBoxImpl(const vec_type& min,const vec_type& max) : _min(min), _max(max) {} @@ -73,6 +73,6 @@ -FLT_MAX); } - - /** Returns true if the bounding box extents are valid, false otherwise. */ + + /** Returns true if the bounding box extents are valid, false otherwise. */ inline bool valid() const { @@ -98,8 +98,8 @@ inline value_type& xMin() { return _min.x(); } inline value_type xMin() const { return _min.x(); } - + inline value_type& yMin() { return _min.y(); } inline value_type yMin() const { return _min.y(); } - + inline value_type& zMin() { return _min.z(); } inline value_type zMin() const { return _min.z(); } @@ -107,8 +107,8 @@ inline value_type& xMax() { return _max.x(); } inline value_type xMax() const { return _max.x(); } - + inline value_type& yMax() { return _max.y(); } inline value_type yMax() const { return _max.y(); } - + inline value_type& zMax() { return _max.z(); } inline value_type zMax() const { return _max.z(); } @@ -203,5 +203,5 @@ if(sh._center.z()+sh._radius>_max.z()) _max.z() = sh._center.z()+sh._radius; } - + /** Returns the intersection of this bounding box and the specified bounding box. */ @@ -223,5 +223,5 @@ inline bool contains(const vec_type& v) const { - return valid() && + return valid() && (v.x()>=_min.x() && v.x()<=_max.x()) && (v.y()>=_min.y() && v.y()<=_max.y()) && Index: /OpenSceneGraph/trunk/include/osg/NodeTrackerCallback =================================================================== --- /OpenSceneGraph/trunk/include/osg/NodeTrackerCallback (revision 11061) +++ /OpenSceneGraph/trunk/include/osg/NodeTrackerCallback (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/TexEnvFilter =================================================================== --- /OpenSceneGraph/trunk/include/osg/TexEnvFilter (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/TexEnvFilter (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -31,5 +31,5 @@ public: TexEnvFilter(float lodBias = 0.0f); - + /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ TexEnvFilter(const TexEnvFilter& texenv,const CopyOp& copyop=CopyOp::SHALLOW_COPY): @@ -55,5 +55,5 @@ void setLodBias( float lodBias ) { _lodBias = lodBias; } - + float getLodBias() const { return _lodBias; } Index: /OpenSceneGraph/trunk/include/osg/Export =================================================================== --- /OpenSceneGraph/trunk/include/osg/Export (revision 9695) +++ /OpenSceneGraph/trunk/include/osg/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -21,5 +21,5 @@ #define USE_DEPRECATED_API -// disable VisualStudio warnings +// disable VisualStudio warnings #if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS) #pragma warning( disable : 4244 ) Index: /OpenSceneGraph/trunk/include/osg/Drawable =================================================================== --- /OpenSceneGraph/trunk/include/osg/Drawable (revision 12430) +++ /OpenSceneGraph/trunk/include/osg/Drawable (revision 13041) @@ -5,5 +5,5 @@ * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -123,5 +123,5 @@ virtual Geometry* asGeometry() { return 0; } - /** Convert 'const this' into a const Geometry pointer if Drawable is a Geometry, otherwise return 0. + /** Convert 'const this' into a const Geometry pointer if Drawable is a Geometry, otherwise return 0. * Equivalent to dynamic_cast(this).*/ virtual const Geometry* asGeometry() const { return 0; } @@ -200,9 +200,9 @@ { _boundingBox = _initialBound; - if (_computeBoundCallback.valid()) + if (_computeBoundCallback.valid()) _boundingBox.expandBy(_computeBoundCallback->computeBound(*this)); else _boundingBox.expandBy(computeBound()); - + _boundingBoxComputed = true; } @@ -275,5 +275,5 @@ inline GLuint& getDisplayList(unsigned int contextID) const { return _globjList[contextID]; } - /** When set to true, ignore the setUseDisplayList() settings, and hints to the drawImplementation + /** When set to true, ignore the setUseDisplayList() settings, and hints to the drawImplementation method to use OpenGL vertex buffer objects for rendering.*/ virtual void setUseVertexBufferObjects(bool flag); @@ -426,5 +426,5 @@ * must be implemented in concrete subclasses of the Drawable base class, examples include osg::Geometry and osg::ShapeDrawable. * drawImplementation(RenderInfo&) is called from the draw(RenderInfo&) method, with the draw method handling management of OpenGL display lists, - * and drawImplementation(RenderInfo&) handling the actual drawing itself. + * and drawImplementation(RenderInfo&) handling the actual drawing itself. * @param renderInfo The osg::RenderInfo object that encapsulates the current rendering information including the osg::State OpenGL state for the current graphics context. */ virtual void drawImplementation(RenderInfo& renderInfo) const = 0; @@ -801,7 +801,7 @@ /** Function to call to get the extension of a specified context. - * If the Extension object for that context has not yet been created + * If the Extension object for that context has not yet been created * and the 'createIfNotInitalized' flag been set to false then returns NULL. - * If 'createIfNotInitalized' is true then the Extensions object is + * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object is * only created with the graphics context associated with ContextID..*/ Index: /OpenSceneGraph/trunk/include/osg/StateAttributeCallback =================================================================== --- /OpenSceneGraph/trunk/include/osg/StateAttributeCallback (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/StateAttributeCallback (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/Vec2s =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec2s (revision 11770) +++ /OpenSceneGraph/trunk/include/osg/Vec2s (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,5 +26,5 @@ /** Number of vector components. */ enum { num_components = 2 }; - + value_type _v[2]; @@ -94,10 +94,10 @@ return *this; } - + inline Vec2s operator * (const Vec2s& rhs) const { return Vec2s(_v[0]*rhs._v[0], _v[1]*rhs._v[1]); } - + inline Vec2s operator + (const Vec2s& rhs) const { @@ -129,5 +129,5 @@ return Vec2s (-_v[0], -_v[1]); } - + }; // end of class Vec2s Index: /OpenSceneGraph/trunk/include/osg/io_utils =================================================================== --- /OpenSceneGraph/trunk/include/osg/io_utils (revision 11788) +++ /OpenSceneGraph/trunk/include/osg/io_utils (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -183,5 +183,5 @@ input >> vec._v[0] >> std::ws >> vec._v[1] >> std::ws - >> vec._v[2] >> std::ws + >> vec._v[2] >> std::ws >> vec._v[3]; return input; Index: /OpenSceneGraph/trunk/include/osg/ProxyNode =================================================================== --- /OpenSceneGraph/trunk/include/osg/ProxyNode (revision 12817) +++ /OpenSceneGraph/trunk/include/osg/ProxyNode (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -24,5 +24,5 @@ { public : - + ProxyNode(); @@ -31,13 +31,13 @@ META_Node(osg, ProxyNode); - + typedef osg::BoundingSphere::vec_type vec_type; typedef osg::BoundingSphere::value_type value_type; virtual void traverse(NodeVisitor& nv); - + virtual bool addChild(Node *child); virtual bool addChild(Node *child, const std::string& filename); - + virtual bool removeChildren(unsigned int pos,unsigned int numChildrenToRemove); @@ -62,11 +62,11 @@ unsigned int getNumFileNames() const { return _filenameList.size(); } - /** Return the DatabaseRequest object used by the DatabasePager to keep track of file load requests + /** Return the DatabaseRequest object used by the DatabasePager to keep track of file load requests * being carried on behalf of the DatabasePager. - * Note, in normal OSG usage you should not set this value yourself, as this will be managed by + * Note, in normal OSG usage you should not set this value yourself, as this will be managed by * the osgDB::DatabasePager.*/ osg::ref_ptr& getDatabaseRequest(unsigned int childNo) { return _filenameList[childNo].second; } - - /** Return the const DatabaseRequest object.*/ + + /** Return the const DatabaseRequest object.*/ const osg::ref_ptr& getDatabaseRequest(unsigned int childNo) const { return _filenameList[childNo].second; } @@ -85,5 +85,5 @@ /** Get how the center of object should be determined when computed which child is active.*/ CenterMode getCenterMode() const { return _centerMode; } - + /** Modes which control how the proxynode external reference are loaded.*/ enum LoadingExternalReferenceMode @@ -100,16 +100,16 @@ LoadingExternalReferenceMode getLoadingExternalReferenceMode() const { return _loadingExtReference; } - /** Sets the object-space point which defines the center of the osg::ProxyNode. + /** Sets the object-space point which defines the center of the osg::ProxyNode. center is affected by any transforms in the hierarchy above the osg::ProxyNode.*/ inline void setCenter(const vec_type& center) { if (_centerMode!=UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED) { _centerMode=USER_DEFINED_CENTER; } _userDefinedCenter = center; } - + /** return the ProxyNode center point. */ inline const vec_type& getCenter() const { if ((_centerMode==USER_DEFINED_CENTER)||(_centerMode==UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED)) return _userDefinedCenter; else return getBound().center(); } - /** Set the object-space reference radius of the volume enclosed by the ProxyNode. + /** Set the object-space reference radius of the volume enclosed by the ProxyNode. * Used to determine the bounding sphere of the ProxyNode in the absence of any children.*/ inline void setRadius(value_type radius) { _radius = radius; } - + /** Get the object-space radius of the volume enclosed by the ProxyNode.*/ inline value_type getRadius() const { return _radius; } @@ -118,5 +118,5 @@ protected : - + virtual ~ProxyNode() {} @@ -129,11 +129,11 @@ ref_ptr _databaseOptions; std::string _databasePath; - + LoadingExternalReferenceMode _loadingExtReference; - + CenterMode _centerMode; vec_type _userDefinedCenter; value_type _radius; - + }; Index: /OpenSceneGraph/trunk/include/osg/LightSource =================================================================== --- /OpenSceneGraph/trunk/include/osg/LightSource (revision 5924) +++ /OpenSceneGraph/trunk/include/osg/LightSource (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -25,5 +25,5 @@ { public: - + LightSource(); @@ -43,5 +43,5 @@ ABSOLUTE_RF }; - + /** Set the light sources's ReferenceFrame, either to be relative to its * parent reference frame, or relative to an absolute coordinate @@ -56,5 +56,5 @@ */ void setReferenceFrame(ReferenceFrame rf); - + ReferenceFrame getReferenceFrame() const { return _referenceFrame; } Index: /OpenSceneGraph/trunk/include/osg/LineStipple =================================================================== --- /OpenSceneGraph/trunk/include/osg/LineStipple (revision 10691) +++ /OpenSceneGraph/trunk/include/osg/LineStipple (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -54,5 +54,5 @@ return 0; // passed all the above comparison macros, must be equal. } - + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { Index: /OpenSceneGraph/trunk/include/osg/Point =================================================================== --- /OpenSceneGraph/trunk/include/osg/Point (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/Point (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -47,5 +47,5 @@ META_StateAttribute(osg, Point, POINT); - + /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const @@ -90,5 +90,5 @@ /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convenience wrappers for - * calling extension functions. */ + * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -97,7 +97,7 @@ Extensions(const Extensions& rhs); - + void lowestCommonDenominator(const Extensions& rhs); - + void setupGLExtensions(unsigned int contextID); @@ -115,5 +115,5 @@ ~Extensions() {} - + bool _isPointParametersSupported; bool _isPointSpriteCoordOriginSupported; @@ -128,5 +128,5 @@ }; - + /** Returns the Extensions object for the given context. * If createIfNotInitalized is true and the Extensions object doesn't Index: /OpenSceneGraph/trunk/include/osg/TexGen =================================================================== --- /OpenSceneGraph/trunk/include/osg/TexGen (revision 11790) +++ /OpenSceneGraph/trunk/include/osg/TexGen (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -43,5 +43,5 @@ { public : - + TexGen(); @@ -56,5 +56,5 @@ META_StateAttribute(osg, TexGen, TEXGEN); - + virtual bool isTextureAttribute() const { return true; } @@ -87,5 +87,5 @@ // I plan to revamp the OpenGL state management later so will // tidy up then. Robert Osfield. Jan 2001. - + // The tidy up is now happening, but will have a think before // resolving the below parameters. @@ -119,5 +119,5 @@ const Plane& getPlane(Coord which) const; - + /** Set the tex gen planes from specified matrix. * Typical usage would be to pass in a projection Index: /OpenSceneGraph/trunk/include/osg/OcclusionQueryNode =================================================================== --- /OpenSceneGraph/trunk/include/osg/OcclusionQueryNode (revision 12810) +++ /OpenSceneGraph/trunk/include/osg/OcclusionQueryNode (revision 13041) @@ -2,12 +2,12 @@ // Copyright (C) 2007 Skew Matrix Software LLC (http://www.skew-matrix.com) // -// This library is open source and may be redistributed and/or modified under -// the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or +// This library is open source and may be redistributed and/or modified under +// the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or // (at your option) any later version. The full license is in LICENSE file // included with this distribution, and on the openscenegraph.org website. -// +// // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // OpenSceneGraph Public License for more details. // @@ -76,9 +76,9 @@ virtual void releaseGLObjects( osg::State* state = 0 ) const; - + static void deleteQueryObject( unsigned int contextID, GLuint handle ); static void flushDeletedQueryObjects( unsigned int contextID, double currentTime, double& availableTime ); static void discardDeletedQueryObjects( unsigned int contextID ); - + protected: typedef std::map< const osg::Camera*, TestResult > ResultMap; @@ -108,6 +108,6 @@ virtual void releaseGLObjects( osg::State* state = 0 ) const; - - + + // When disabled, OQN doesn't perform occlusion queries, and simply // renders its children. @@ -154,6 +154,6 @@ // For statistics gathering, e.g., by a NodeVisitor. bool getPassed() const; - - + + // These methods are public so that osgUtil::CullVisitor can access them. // Not intended for application use. Index: /OpenSceneGraph/trunk/include/osg/Group =================================================================== --- /OpenSceneGraph/trunk/include/osg/Group (revision 9599) +++ /OpenSceneGraph/trunk/include/osg/Group (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,5 +32,5 @@ Group(); - + /** Copy constructor using CopyOp to manage deep vs shallow copy. */ Group(const Group&,const CopyOp& copyop=CopyOp::SHALLOW_COPY); @@ -54,5 +54,5 @@ * The new child node is inserted into the child list * before the node at the specified index. No nodes - * are removed from the group with this operation. + * are removed from the group with this operation. */ virtual bool insertChild( unsigned int index, Node *child ); @@ -60,5 +60,5 @@ /** Remove Node from Group. * If Node is contained in Group then remove it from the child - * list, decrement its reference count, and dirty the + * list, decrement its reference count, and dirty the * bounding sphere to force it to recompute on next getBound() and * return true for success. If Node is not found then return false @@ -75,5 +75,5 @@ /** Remove Node from Group. * If Node is contained in Group then remove it from the child - * list, decrement its reference count, and dirty the + * list, decrement its reference count, and dirty the * bounding sphere to force it to recompute on next getBound() and * return true for success. If Node is not found then return false @@ -105,5 +105,5 @@ * reference count of newNode, and dirty the bounding sphere * to force it to recompute on next getBound() and return true. - * If origNode is not found then return false and do not + * If origNode is not found then return false and do not * add newNode. If newNode is NULL then return false and do * not remove origNode. Also returns false if newChild is a Scene node. @@ -120,5 +120,5 @@ inline bool containsNode( const Node* node ) const { - + for (NodeList::const_iterator itr=_children.begin(); itr!=_children.end(); @@ -155,5 +155,5 @@ virtual BoundingSphere computeBound() const; - + protected: Index: /OpenSceneGraph/trunk/include/osg/StateSet =================================================================== --- /OpenSceneGraph/trunk/include/osg/StateSet (revision 12161) +++ /OpenSceneGraph/trunk/include/osg/StateSet (revision 13041) @@ -71,5 +71,5 @@ inline const ParentList& getParents() const { return _parents; } - /** Get the a copy of parent list of node. A copy is returned to + /** Get the a copy of parent list of node. A copy is returned to * prevent modification of the parent list.*/ inline ParentList getParents() { return _parents; } @@ -278,5 +278,5 @@ /** Set this StateSet to contain specified uniform and override flag.*/ void addUniform(Uniform* uniform, StateAttribute::OverrideValue value=StateAttribute::ON); - + /** remove uniform of specified name from StateSet.*/ void removeUniform(const std::string& name); @@ -406,5 +406,5 @@ * since they have an Update Callback attached to them or their children.*/ inline unsigned int getNumChildrenRequiringUpdateTraversal() const { return _numChildrenRequiringUpdateTraversal; } - + /** Run the update callbacks attached directly to this StateSet or to its children.*/ void runUpdateCallbacks(osg::NodeVisitor* nv); @@ -426,5 +426,5 @@ * since they have an Eevnt Callback attached to them or their children.*/ inline unsigned int getNumChildrenRequiringEventTraversal() const { return _numChildrenRequiringEventTraversal; } - + /** Run the event callbacks attached directly to this StateSet or to its children.*/ void runEventCallbacks(osg::NodeVisitor* nv); @@ -462,5 +462,5 @@ friend class osg::Uniform; friend class osg::StateAttribute; - + ModeList _modeList; AttributeList _attributeList; @@ -503,5 +503,5 @@ std::string _binName; bool _nestRenderBins; - + ref_ptr _updateCallback; unsigned int _numChildrenRequiringUpdateTraversal; Index: /OpenSceneGraph/trunk/include/osg/TriangleIndexFunctor =================================================================== --- /OpenSceneGraph/trunk/include/osg/TriangleIndexFunctor (revision 11996) +++ /OpenSceneGraph/trunk/include/osg/TriangleIndexFunctor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,5 +26,5 @@ - virtual void setVertexArray(unsigned int,const Vec2*) + virtual void setVertexArray(unsigned int,const Vec2*) { } @@ -34,9 +34,9 @@ } - virtual void setVertexArray(unsigned int,const Vec4* ) - { - } - - virtual void setVertexArray(unsigned int,const Vec2d*) + virtual void setVertexArray(unsigned int,const Vec4* ) + { + } + + virtual void setVertexArray(unsigned int,const Vec2d*) { } @@ -46,5 +46,5 @@ } - virtual void setVertexArray(unsigned int,const Vec4d* ) + virtual void setVertexArray(unsigned int,const Vec4d* ) { } @@ -198,5 +198,5 @@ break; } - } + } virtual void drawElements(GLenum mode,GLsizei count,const GLushort* indices) @@ -206,5 +206,5 @@ typedef GLushort Index; typedef const Index* IndexPointer; - + switch(mode) { @@ -266,13 +266,13 @@ break; } - } + } virtual void drawElements(GLenum mode,GLsizei count,const GLuint* indices) { if (indices==0 || count==0) return; - + typedef GLuint Index; typedef const Index* IndexPointer; - + switch(mode) { @@ -334,5 +334,5 @@ break; } - } + } GLenum _modeCache; Index: /OpenSceneGraph/trunk/include/osg/PolygonOffset =================================================================== --- /OpenSceneGraph/trunk/include/osg/PolygonOffset (revision 10699) +++ /OpenSceneGraph/trunk/include/osg/PolygonOffset (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -17,5 +17,5 @@ #include -#ifndef GL_POLYGON_OFFSET_LINE +#ifndef GL_POLYGON_OFFSET_LINE #define GL_POLYGON_OFFSET_LINE 0x2A02 #define GL_POLYGON_OFFSET_POINT 0x2A01 @@ -67,5 +67,5 @@ inline void setFactor(float factor) { _factor = factor; } inline float getFactor() const { return _factor; } - + inline void setUnits(float units) { _units = units; } inline float getUnits() const { return _units; } @@ -79,7 +79,7 @@ static void setUnitsMultiplier(float multiplier); static float getUnitsMultiplier(); - + static bool areFactorAndUnitsMultipliersSet(); - + /** Checks with the OpenGL driver to try and pick multiplier appropriate for the hardware. note, requires a valid graphics context to be current. */ Index: /OpenSceneGraph/trunk/include/osg/ArgumentParser =================================================================== --- /OpenSceneGraph/trunk/include/osg/ArgumentParser (revision 11790) +++ /OpenSceneGraph/trunk/include/osg/ArgumentParser (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -41,5 +41,5 @@ STRING_PARAMETER }; - + union ValueUnion { @@ -55,5 +55,5 @@ Parameter(float& value) { _type = FLOAT_PARAMETER; _value._float = &value; } - + Parameter(double& value) { _type = DOUBLE_PARAMETER; _value._double = &value; } @@ -61,5 +61,5 @@ Parameter(unsigned int& value) { _type = UNSIGNED_INT_PARAMETER; _value._uint = &value; } - + Parameter(std::string& value) { _type = STRING_PARAMETER; _value._string = &value; } @@ -72,5 +72,5 @@ protected: - + ParameterType _type; ValueUnion _value; @@ -80,9 +80,9 @@ * -option or --option. */ static bool isOption(const char* str); - + /** Return true if string is non-NULL and not an option in the form * -option or --option. */ static bool isString(const char* str); - + /** Return true if specified parameter is a number. */ static bool isNumber(const char* str); @@ -121,12 +121,12 @@ * -option or --option. */ bool isOption(int pos) const; - + /** Return true if the specified parameter is a string not in * the form of an option. */ bool isString(int pos) const; - + /** Return true if the specified parameter is a number. */ bool isNumber(int pos) const; - + bool containsOptions() const; @@ -134,5 +134,5 @@ * and decrement the argc respectively. */ void remove(int pos,int num=1); - + /** Return true if the specified argument matches the given string. */ bool match(int pos, const std::string& str) const; @@ -181,8 +181,8 @@ /** For each remaining option, report it as unrecognized. */ void reportRemainingOptionsAsUnrecognized(ErrorSeverity severity=BENIGN); - + /** Return the error message, if any has occurred. */ ErrorMessageMap& getErrorMessageMap() { return _errorMessageMap; } - + /** Return the error message, if any has occurred. */ const ErrorMessageMap& getErrorMessageMap() const { return _errorMessageMap; } @@ -191,20 +191,20 @@ void writeErrorMessages(std::ostream& output,ErrorSeverity sevrity=BENIGN); - + /** This convenience method handles help requests on the command line. * Return the type(s) of help requested. The return value of this * function is suitable for passing into getApplicationUsage()->write(). - * If ApplicationUsage::NO_HELP is returned then no help commandline option + * If ApplicationUsage::NO_HELP is returned then no help commandline option * was found on the command line. */ ApplicationUsage::Type readHelpType(); - + protected: - + int* _argc; char** _argv; ErrorMessageMap _errorMessageMap; ref_ptr _usage; - + }; Index: /OpenSceneGraph/trunk/include/osg/Shape =================================================================== --- /OpenSceneGraph/trunk/include/osg/Shape (revision 11869) +++ /OpenSceneGraph/trunk/include/osg/Shape (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -30,6 +30,6 @@ /** META_StateAttribute macro define the standard clone, isSameKindAs, * className and getType methods. - * Use when subclassing from Object to make it more convenient to define - * the standard pure virtual methods which are required for all Object + * Use when subclassing from Object to make it more convenient to define + * the standard pure virtual methods which are required for all Object * subclasses.*/ #define META_Shape(library,name) \ @@ -42,5 +42,5 @@ virtual void accept(osg::ConstShapeVisitor& csv) const { csv.apply(*this); } -/** Base class for all shape types. +/** Base class for all shape types. * Shapes are used to either for culling and collision detection or * to define the geometric shape of procedurally generate Geometry. @@ -51,8 +51,8 @@ Shape() {} - - Shape(const Shape& sa,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + + Shape(const Shape& sa,const CopyOp& copyop=CopyOp::SHALLOW_COPY): Object(sa,copyop) {} - + /** Clone the type of an attribute, with Object* return type. Must be defined by derived classes.*/ @@ -82,5 +82,5 @@ protected: - + virtual ~Shape(); }; @@ -103,5 +103,5 @@ { public: - + ShapeVisitor() {} virtual ~ShapeVisitor(); @@ -125,5 +125,5 @@ { public: - + ConstShapeVisitor() {} virtual ~ConstShapeVisitor(); @@ -202,5 +202,5 @@ _halfLengths(lengthX*0.5f,lengthY*0.5f,lengthZ*0.5f) {} - Box(const Box& box,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + Box(const Box& box,const CopyOp& copyop=CopyOp::SHALLOW_COPY): Shape(box,copyop), _center(box._center), @@ -227,10 +227,10 @@ inline const Quat& getRotation() const { return _rotation; } inline Matrix computeRotationMatrix() const { return Matrix(_rotation); } - inline bool zeroRotation() const { return _rotation.zeroRotation(); } - - protected: - + inline bool zeroRotation() const { return _rotation.zeroRotation(); } + + protected: + virtual ~Box(); - + Vec3 _center; Vec3 _halfLengths; @@ -255,5 +255,5 @@ _height(height) {} - Cone(const Cone& cone,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + Cone(const Cone& cone,const CopyOp& copyop=CopyOp::SHALLOW_COPY): Shape(cone,copyop), _center(cone._center), @@ -285,13 +285,13 @@ inline const Quat& getRotation() const { return _rotation; } inline Matrix computeRotationMatrix() const { return Matrix(_rotation); } - inline bool zeroRotation() const { return _rotation.zeroRotation(); } - - inline float getBaseOffsetFactor() const { return 0.25f; } - inline float getBaseOffset() const { return -getBaseOffsetFactor()*getHeight(); } - - protected: - + inline bool zeroRotation() const { return _rotation.zeroRotation(); } + + inline float getBaseOffsetFactor() const { return 0.25f; } + inline float getBaseOffset() const { return -getBaseOffsetFactor()*getHeight(); } + + protected: + virtual ~Cone(); - + Vec3 _center; float _radius; @@ -315,5 +315,5 @@ _height(height) {} - Cylinder(const Cylinder& cylinder,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + Cylinder(const Cylinder& cylinder,const CopyOp& copyop=CopyOp::SHALLOW_COPY): Shape(cylinder,copyop), _center(cylinder._center), @@ -345,8 +345,8 @@ inline const Quat& getRotation() const { return _rotation; } inline Matrix computeRotationMatrix() const { return Matrix(_rotation); } - bool zeroRotation() const { return _rotation.zeroRotation(); } - - protected: - + bool zeroRotation() const { return _rotation.zeroRotation(); } + + protected: + virtual ~Cylinder(); @@ -371,5 +371,5 @@ _height(height) {} - Capsule(const Capsule& capsule,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + Capsule(const Capsule& capsule,const CopyOp& copyop=CopyOp::SHALLOW_COPY): Shape(capsule,copyop), _center(capsule._center), @@ -401,10 +401,10 @@ inline const Quat& getRotation() const { return _rotation; } inline Matrix computeRotationMatrix() const { return Matrix(_rotation); } - bool zeroRotation() const { return _rotation.zeroRotation(); } - - protected: - + bool zeroRotation() const { return _rotation.zeroRotation(); } + + protected: + virtual ~Capsule(); - + Vec3 _center; float _radius; @@ -418,5 +418,5 @@ InfinitePlane() {} - InfinitePlane(const InfinitePlane& plane,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + InfinitePlane(const InfinitePlane& plane,const CopyOp& copyop=CopyOp::SHALLOW_COPY): Shape(plane,copyop), Plane(plane) {} @@ -425,5 +425,5 @@ protected: - + virtual ~InfinitePlane(); }; @@ -434,8 +434,8 @@ { public: - + TriangleMesh() {} - TriangleMesh(const TriangleMesh& mesh,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + TriangleMesh(const TriangleMesh& mesh,const CopyOp& copyop=CopyOp::SHALLOW_COPY): Shape(mesh,copyop), _vertices(mesh._vertices), @@ -455,5 +455,5 @@ protected: - + virtual ~TriangleMesh(); @@ -466,8 +466,8 @@ { public: - + ConvexHull() {} - ConvexHull(const ConvexHull& hull,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + ConvexHull(const ConvexHull& hull,const CopyOp& copyop=CopyOp::SHALLOW_COPY): TriangleMesh(hull,copyop) {} @@ -475,5 +475,5 @@ protected: - + virtual ~ConvexHull(); }; @@ -482,9 +482,9 @@ { public: - + HeightField(); HeightField(const HeightField& mesh,const CopyOp& copyop=CopyOp::SHALLOW_COPY); - + META_Shape(osg, HeightField); @@ -504,5 +504,5 @@ inline void setYInterval(float dy) { _dy = dy; } inline float getYInterval() const { return _dy; } - + /** Get the FloatArray height data.*/ osg::FloatArray* getFloatArray() { return _heights.get(); } @@ -516,5 +516,5 @@ /** Set the height of the skirt to render around the edge of HeightField. - * The skirt is used as a means of disguising edge boundaries between adjacent HeightField, + * The skirt is used as a means of disguising edge boundaries between adjacent HeightField, * particularly of ones with different resolutions.*/ void setSkirtHeight(float skirtHeight) { _skirtHeight = skirtHeight; } @@ -534,5 +534,5 @@ inline const Quat& getRotation() const { return _rotation; } inline Matrix computeRotationMatrix() const { return Matrix(_rotation); } - inline bool zeroRotation() const { return _rotation.zeroRotation(); } + inline bool zeroRotation() const { return _rotation.zeroRotation(); } /* set a single height point in the height field */ @@ -558,5 +558,5 @@ return Vec3(_origin.x()+getXInterval()*(float)c, _origin.y()+getYInterval()*(float)r, - _origin.z()+(*_heights)[c+r*_columns]); + _origin.z()+(*_heights)[c+r*_columns]); } @@ -566,5 +566,5 @@ protected: - + virtual ~HeightField(); @@ -591,10 +591,10 @@ - + typedef std::vector< ref_ptr > ChildList; CompositeShape() {} - CompositeShape(const CompositeShape& cs,const CopyOp& copyop=CopyOp::SHALLOW_COPY): + CompositeShape(const CompositeShape& cs,const CopyOp& copyop=CopyOp::SHALLOW_COPY): Shape(cs,copyop), _children(cs._children) {} @@ -627,7 +627,7 @@ /** find the index number of child, if child is not found then it returns getNumChildren(), - * so should be used in similar style to STL's result!=end().*/ + * so should be used in similar style to STL's result!=end().*/ unsigned int findChildNo(Shape* shape) const - { + { for (unsigned int childNo=0;childNo<_children.size();++childNo) { @@ -639,5 +639,5 @@ protected: - + virtual ~CompositeShape(); Index: /OpenSceneGraph/trunk/include/osg/BlendFunc =================================================================== --- /OpenSceneGraph/trunk/include/osg/BlendFunc (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/BlendFunc (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield + * + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -69,5 +69,5 @@ BlendFunc(); - + BlendFunc(GLenum source, GLenum destination); BlendFunc(GLenum source, GLenum destination, GLenum source_alpha, GLenum destination_alpha); @@ -82,5 +82,5 @@ META_StateAttribute(osg, BlendFunc,BLENDFUNC); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -147,5 +147,5 @@ void setSourceAlpha(GLenum source) { _source_factor_alpha = source; } inline GLenum getSourceAlpha() const { return _source_factor_alpha; } - + void setDestination(GLenum destination) { _destination_factor = _destination_factor_alpha = destination; } inline GLenum getDestination() const { return _destination_factor; } @@ -160,5 +160,5 @@ /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convenience wrappers for - * calling extension functions. */ + * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { Index: /OpenSceneGraph/trunk/include/osg/DeleteHandler =================================================================== --- /OpenSceneGraph/trunk/include/osg/DeleteHandler (revision 12056) +++ /OpenSceneGraph/trunk/include/osg/DeleteHandler (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ * Note, the DeleteHandler cannot itself be reference counted, otherwise it * would be responsible for deleting itself! - * An static auto_ptr<> is used internally in Referenced.cpp to manage the + * An static auto_ptr<> is used internally in Referenced.cpp to manage the * DeleteHandler's memory.*/ class OSG_EXPORT DeleteHandler @@ -44,5 +44,5 @@ * The ability to retain objects for several frames is useful to prevent premature deletion when objects * are still be used the graphics threads that are using double buffering of rendering data structures with - * non ref_ptr<> pointers to scene graph elements.*/ + * non ref_ptr<> pointers to scene graph elements.*/ void setNumFramesToRetainObjects(unsigned int numberOfFramesToRetainObjects) { _numFramesToRetainObjects = numberOfFramesToRetainObjects; } @@ -64,6 +64,6 @@ virtual void flushAll(); - /** Request the deletion of an object. - * Depending on users implementation of DeleteHandler, the delete of the object may occur + /** Request the deletion of an object. + * Depending on users implementation of DeleteHandler, the delete of the object may occur * straight away or be delayed until doDelete is called. * The default implementation does a delete straight away.*/ Index: /OpenSceneGraph/trunk/include/osg/AlphaFunc =================================================================== --- /OpenSceneGraph/trunk/include/osg/AlphaFunc (revision 11790) +++ /OpenSceneGraph/trunk/include/osg/AlphaFunc (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -24,9 +24,9 @@ /** Encapsulates OpenGL glAlphaFunc. -*/ +*/ class OSG_EXPORT AlphaFunc : public StateAttribute { public : - + enum ComparisonFunction { NEVER = GL_NEVER, @@ -42,5 +42,5 @@ AlphaFunc(); - + AlphaFunc(ComparisonFunction func,float ref): _comparisonFunc(func), @@ -52,7 +52,7 @@ _comparisonFunc(af._comparisonFunc), _referenceValue(af._referenceValue) {} - + META_StateAttribute(osg, AlphaFunc,ALPHAFUNC); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -80,15 +80,15 @@ _referenceValue = ref; } - + inline void setFunction(ComparisonFunction func) { _comparisonFunc=func; } inline ComparisonFunction getFunction() const { return _comparisonFunc; } - + inline void setReferenceValue(float value) { _referenceValue=value; } inline float getReferenceValue() const { return _referenceValue; } - + virtual void apply(State& state) const; protected: - + virtual ~AlphaFunc(); Index: /OpenSceneGraph/trunk/include/osg/ref_ptr =================================================================== --- /OpenSceneGraph/trunk/include/osg/ref_ptr (revision 11562) +++ /OpenSceneGraph/trunk/include/osg/ref_ptr (revision 13041) @@ -72,5 +72,5 @@ bool operator != (const T* ptr) const { return (_ptr!=ptr); } friend bool operator != (const T* ptr, const ref_ptr& rp) { return (ptr!=rp._ptr); } - + bool operator < (const ref_ptr& rp) const { return (_ptr(_v[0]),static_cast(_v[1]),static_cast(_v[2]));} @@ -55,5 +55,5 @@ inline bool operator == (const Vec3d& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; } - + inline bool operator != (const Vec3d& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2]; } @@ -203,5 +203,5 @@ _v[1] *= inv; _v[2] *= inv; - } + } return( norm ); } Index: /OpenSceneGraph/trunk/include/osg/TexEnvCombine =================================================================== --- /OpenSceneGraph/trunk/include/osg/TexEnvCombine (revision 10691) +++ /OpenSceneGraph/trunk/include/osg/TexEnvCombine (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -64,5 +64,5 @@ TexEnvCombine(); - + /** Copy constructor using CopyOp to manage deep vs shallow copy. */ TexEnvCombine(const TexEnvCombine& texenv,const CopyOp& copyop=CopyOp::SHALLOW_COPY): @@ -141,5 +141,5 @@ GLint getCombine_RGB() const { return _combine_RGB; } GLint getCombine_Alpha() const { return _combine_Alpha; } - + enum SourceParam { @@ -157,9 +157,9 @@ TEXTURE7 = GL_TEXTURE0+7 }; - + void setSource0_RGB(GLint sp); void setSource1_RGB(GLint sp); void setSource2_RGB(GLint sp); - + void setSource0_Alpha(GLint sp); void setSource1_Alpha(GLint sp); @@ -169,5 +169,5 @@ GLint getSource1_RGB() const { return _source1_RGB; } GLint getSource2_RGB() const { return _source2_RGB; } - + GLint getSource0_Alpha() const { return _source0_Alpha; } GLint getSource1_Alpha() const { return _source1_Alpha; } @@ -181,9 +181,9 @@ ONE_MINUS_SRC_ALPHA = GL_ONE_MINUS_SRC_ALPHA }; - + void setOperand0_RGB(GLint op); void setOperand1_RGB(GLint op); void setOperand2_RGB(GLint op); - + void setOperand0_Alpha(GLint op); void setOperand1_Alpha(GLint op); @@ -193,5 +193,5 @@ GLint getOperand1_RGB() const { return _operand1_RGB; } GLint getOperand2_RGB() const { return _operand2_RGB; } - + GLint getOperand0_Alpha() const { return _operand0_Alpha; } GLint getOperand1_Alpha() const { return _operand1_Alpha; } @@ -246,9 +246,9 @@ needsTexEnvCombiner(_source0_Alpha) || needsTexEnvCombiner(_source1_Alpha) || - needsTexEnvCombiner(_source2_Alpha)); - } - - - + needsTexEnvCombiner(_source2_Alpha)); + } + + + @@ -257,9 +257,9 @@ GLint _combine_RGB; GLint _combine_Alpha; - + GLint _source0_RGB; GLint _source1_RGB; GLint _source2_RGB; - + GLint _source0_Alpha; GLint _source1_Alpha; @@ -270,5 +270,5 @@ GLint _operand1_RGB; GLint _operand2_RGB; - + GLint _operand0_Alpha; GLint _operand1_Alpha; @@ -278,5 +278,5 @@ float _scale_RGB; float _scale_Alpha; - + osg::Vec4 _constantColor; Index: /OpenSceneGraph/trunk/include/osg/Vec3f =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec3f (revision 11770) +++ /OpenSceneGraph/trunk/include/osg/Vec3f (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -35,5 +35,5 @@ /** Number of vector components. */ enum { num_components = 3 }; - + value_type _v[3]; @@ -50,5 +50,5 @@ inline bool operator == (const Vec3f& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; } - + inline bool operator != (const Vec3f& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2]; } @@ -197,5 +197,5 @@ _v[1] *= inv; _v[2] *= inv; - } + } return( norm ); } Index: /OpenSceneGraph/trunk/include/osg/View =================================================================== --- /OpenSceneGraph/trunk/include/osg/View (revision 12404) +++ /OpenSceneGraph/trunk/include/osg/View (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -36,5 +36,5 @@ META_Object(osg,View); - + /** Take all the settings, Camera and Slaves from the passed in view, leaving it empty. */ virtual void take(View& rhs); @@ -58,5 +58,5 @@ SKY_LIGHT }; - + /** Set the global lighting to use for this view. * Defaults to headlight. */ @@ -75,20 +75,20 @@ const osg::Light* getLight() const { return _light.get(); } - /** Set the master camera of the view. */ + /** Set the master camera of the view. */ void setCamera(osg::Camera* camera); - /** Get the master camera of the view. */ + /** Get the master camera of the view. */ osg::Camera* getCamera() { return _camera.get(); } - /** Get the const master camera of the view. */ + /** Get the const master camera of the view. */ const osg::Camera* getCamera() const { return _camera.get(); } - /** Set the frame stamp of the view. */ + /** Set the frame stamp of the view. */ void setFrameStamp(osg::FrameStamp* fs) { _frameStamp = fs; } - /** Get the frame stamp of the view. */ + /** Get the frame stamp of the view. */ osg::FrameStamp* getFrameStamp() { return _frameStamp.get(); } - /** Get the frame stamp of the view. */ + /** Get the frame stamp of the view. */ const osg::FrameStamp* getFrameStamp() const { return _frameStamp.get(); } @@ -99,14 +99,14 @@ Slave(bool useMastersSceneData=true): _useMastersSceneData(useMastersSceneData) {} - + Slave(osg::Camera* camera, const osg::Matrixd& projectionOffset, const osg::Matrixd& viewOffset, bool useMastersSceneData=true): - _camera(camera), - _projectionOffset(projectionOffset), + _camera(camera), + _projectionOffset(projectionOffset), _viewOffset(viewOffset), _useMastersSceneData(useMastersSceneData) {} - + Slave(const Slave& rhs) : - _camera(rhs._camera), - _projectionOffset(rhs._projectionOffset), + _camera(rhs._camera), + _projectionOffset(rhs._projectionOffset), _viewOffset(rhs._viewOffset), _useMastersSceneData(rhs._useMastersSceneData), @@ -135,5 +135,5 @@ else updateSlaveImplementation(view); } - + virtual void updateSlaveImplementation(View& view); @@ -174,5 +174,5 @@ osg::ref_ptr _camera; - + typedef std::vector Slaves; Slaves _slaves; Index: /OpenSceneGraph/trunk/include/osg/Transform =================================================================== --- /OpenSceneGraph/trunk/include/osg/Transform (revision 10703) +++ /OpenSceneGraph/trunk/include/osg/Transform (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -41,5 +41,5 @@ /** Compute the matrix which transforms objects in local coords to eye coords, - * by accumulating the Transform local to world matrices along the specified node path + * by accumulating the Transform local to world matrices along the specified node path * and multiplying by the supplied initial camera modelview. */ @@ -64,5 +64,5 @@ * Note: If the transformation matrix scales the subgraph then the normals * of the underlying geometry will need to be renormalized to be unit - * vectors once more. This can be done transparently through OpenGL's + * vectors once more. This can be done transparently through OpenGL's * use of either GL_NORMALIZE and GL_RESCALE_NORMAL modes. For further * background reading see the glNormalize documentation in the OpenGL @@ -98,5 +98,5 @@ ABSOLUTE_RF_INHERIT_VIEWPOINT }; - + /** Set the transform's ReferenceFrame, either to be relative to its * parent reference frame, or relative to an absolute coordinate @@ -113,10 +113,10 @@ * adds the ability to use the parents view points position in world coordinates * as its local viewpoint in the new coordinates frame. This is useful for - * Render to texture Cameras that wish to use the main views LOD range computation + * Render to texture Cameras that wish to use the main views LOD range computation * (which uses the viewpoint rather than the eye point) rather than use the local * eye point defined by the this Transforms' absolute view matrix. */ void setReferenceFrame(ReferenceFrame rf); - + ReferenceFrame getReferenceFrame() const { return _referenceFrame; } @@ -133,5 +133,5 @@ } } - + virtual bool computeWorldToLocalMatrix(Matrix& matrix,NodeVisitor*) const { @@ -147,5 +147,5 @@ } - /** Overrides Group's computeBound. + /** Overrides Group's computeBound. * There is no need to override in subclasses from osg::Transform * since this computeBound() uses the underlying matrix (calling @@ -155,8 +155,8 @@ protected : - + virtual ~Transform(); - - + + ReferenceFrame _referenceFrame; Index: /OpenSceneGraph/trunk/include/osg/LOD =================================================================== --- /OpenSceneGraph/trunk/include/osg/LOD (revision 12817) +++ /OpenSceneGraph/trunk/include/osg/LOD (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -36,5 +36,5 @@ { public : - + LOD(); @@ -48,5 +48,5 @@ virtual void traverse(NodeVisitor& nv); - + virtual bool addChild(Node *child); @@ -57,5 +57,5 @@ typedef std::pair MinMaxPair; typedef std::vector RangeList; - + /** Modes which control how the center of object should be determined when computing which child is active.*/ enum CenterMode @@ -72,16 +72,16 @@ CenterMode getCenterMode() const { return _centerMode; } - /** Sets the object-space point which defines the center of the osg::LOD. + /** Sets the object-space point which defines the center of the osg::LOD. center is affected by any transforms in the hierarchy above the osg::LOD.*/ inline void setCenter(const vec_type& center) { if (_centerMode!=UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED) { _centerMode=USER_DEFINED_CENTER; } _userDefinedCenter = center; } - + /** return the LOD center point. */ inline const vec_type& getCenter() const { if ((_centerMode==USER_DEFINED_CENTER)||(_centerMode==UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED)) return _userDefinedCenter; else return getBound().center(); } - /** Set the object-space reference radius of the volume enclosed by the LOD. + /** Set the object-space reference radius of the volume enclosed by the LOD. * Used to determine the bounding sphere of the LOD in the absence of any children.*/ inline void setRadius(value_type radius) { _radius = radius; } - + /** Get the object-space radius of the volume enclosed by the LOD.*/ inline value_type getRadius() const { return _radius; } @@ -93,5 +93,5 @@ PIXEL_SIZE_ON_SCREEN }; - + /** Set how the range values should be interpreted when computing which child is active.*/ void setRangeMode(RangeMode mode) { _rangeMode = mode; } @@ -104,5 +104,5 @@ Values are floating point distance specified in local objects coordinates.*/ void setRange(unsigned int childNo, float min,float max); - + /** returns the min visible range for specified child.*/ inline float getMinRange(unsigned int childNo) const { return _rangeList[childNo].first; } @@ -110,6 +110,6 @@ /** returns the max visible range for specified child.*/ inline float getMaxRange(unsigned int childNo) const { return _rangeList[childNo].second; } - - /** returns the number of ranges currently set. + + /** returns the number of ranges currently set. * An LOD which has been fully set up will have getNumChildren()==getNumRanges(). */ inline unsigned int getNumRanges() const { return _rangeList.size(); } Index: /OpenSceneGraph/trunk/include/osg/KdTree =================================================================== --- /OpenSceneGraph/trunk/include/osg/KdTree (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/KdTree (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -24,29 +24,29 @@ /** Implementation of a kdtree for Geometry leaves, to enable fast intersection tests.*/ -class OSG_EXPORT KdTree : public osg::Shape +class OSG_EXPORT KdTree : public osg::Shape { public: - - + + KdTree(); - + KdTree(const KdTree& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); META_Shape(osg, KdTree) - + struct OSG_EXPORT BuildOptions { BuildOptions(); - + unsigned int _numVerticesProcessed; unsigned int _targetNumTrianglesPerLeaf; unsigned int _maxNumLevels; }; - - + + /** Build the kdtree from the specified source geometry object. - * retun true on success. */ + * retun true on success. */ virtual bool build(BuildOptions& buildOptions, osg::Geometry* geometry); - + struct LineSegmentIntersection { @@ -78,9 +78,9 @@ unsigned int primitiveIndex; - }; - + }; + typedef std::vector LineSegmentIntersections; - + /** compute the intersection of a line segment and the kdtree, return true if an intersection has been found.*/ virtual bool intersect(const osg::Vec3d& start, const osg::Vec3d& end, LineSegmentIntersections& intersections) const; @@ -101,13 +101,13 @@ osg::BoundingBox bb; - value_type first; + value_type first; value_type second; }; - + struct Triangle { Triangle(): p0(0),p1(0),p2(0) {} - + Triangle(unsigned int ip0, unsigned int ip1, unsigned int ip2): p0(ip0), p1(ip1), p2(ip2) {} @@ -132,6 +132,6 @@ int addNode(const KdNode& node) { - int num = static_cast(_kdNodes.size()); - _kdNodes.push_back(node); + int num = static_cast(_kdNodes.size()); + _kdNodes.push_back(node); return num; } @@ -139,5 +139,5 @@ KdNode& getNode(int nodeNum) { return _kdNodes[nodeNum]; } const KdNode& getNode(int nodeNum) const { return _kdNodes[nodeNum]; } - + KdNodeList& getNodes() { return _kdNodes; } const KdNodeList& getNodes() const { return _kdNodes; } @@ -171,7 +171,7 @@ { public: - + KdTreeBuilder(); - + KdTreeBuilder(const KdTreeBuilder& rhs); @@ -181,5 +181,5 @@ void apply(osg::Geode& geode); - + KdTree::BuildOptions _buildOptions; @@ -187,9 +187,9 @@ - + protected: - + virtual ~KdTreeBuilder() {} - + }; Index: /OpenSceneGraph/trunk/include/osg/CullFace =================================================================== --- /OpenSceneGraph/trunk/include/osg/CullFace (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/CullFace (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -21,9 +21,9 @@ /** Class to globally enable/disable OpenGL's polygon culling mode. - */ + */ class OSG_EXPORT CullFace : public StateAttribute { public : - + enum Mode { FRONT = GL_FRONT, @@ -31,5 +31,5 @@ FRONT_AND_BACK = GL_FRONT_AND_BACK }; - + CullFace(Mode mode=BACK): _mode(mode) {} @@ -41,5 +41,5 @@ META_StateAttribute(osg, CullFace, CULLFACE); - + /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const @@ -64,11 +64,11 @@ inline Mode getMode() const { return _mode; } - + virtual void apply(State& state) const; - + protected: - + virtual ~CullFace(); - + Mode _mode; Index: /OpenSceneGraph/trunk/include/osg/PagedLOD =================================================================== --- /OpenSceneGraph/trunk/include/osg/PagedLOD (revision 12942) +++ /OpenSceneGraph/trunk/include/osg/PagedLOD (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -24,5 +24,5 @@ { public : - + PagedLOD(); @@ -31,9 +31,9 @@ META_Node(osg, PagedLOD); - - + + virtual void traverse(NodeVisitor& nv); - + virtual bool addChild(Node *child); @@ -61,5 +61,5 @@ inline const std::string& getDatabasePath() const { return _databasePath; } - + struct OSG_EXPORT PerRangeData { @@ -80,5 +80,5 @@ typedef std::vector PerRangeDataList; - + void setFileName(unsigned int childNo, const std::string& filename) { expandPerRangeDataTo(childNo); _perRangeDataList[childNo]._filename=filename; } const std::string& getFileName(unsigned int childNo) const { return _perRangeDataList[childNo]._filename; } @@ -114,16 +114,16 @@ - /** Return the DatabaseRequest object used by the DatabasePager to keep track of file load requests + /** Return the DatabaseRequest object used by the DatabasePager to keep track of file load requests * being carried on behalf of the DatabasePager. - * Note, in normal OSG usage you should not set this value yourself, as this will be managed by + * Note, in normal OSG usage you should not set this value yourself, as this will be managed by * the osgDB::DatabasePager.*/ osg::ref_ptr& getDatabaseRequest(unsigned int childNo) { return _perRangeDataList[childNo]._databaseRequest; } - - /** Return the const DatabaseRequest object.*/ + + /** Return the const DatabaseRequest object.*/ const osg::ref_ptr& getDatabaseRequest(unsigned int childNo) const { return _perRangeDataList[childNo]._databaseRequest; } /** Set the frame number of the last time that this PageLOD node was traversed. - * Note, this frame number is automatically set by the traverse() method for all traversals (update, cull etc.). + * Note, this frame number is automatically set by the traverse() method for all traversals (update, cull etc.). */ inline void setFrameNumberOfLastTraversal(unsigned int frameNumber) { _frameNumberOfLastTraversal=frameNumber; } @@ -151,9 +151,9 @@ * Return true if children are removed, false otherwise. */ virtual bool removeExpiredChildren(double expiryTime, unsigned int expiryFrame, NodeList& removedChildren); - + protected : - + virtual ~PagedLOD(); - + void expandPerRangeDataTo(unsigned int pos); Index: /OpenSceneGraph/trunk/include/osg/State =================================================================== --- /OpenSceneGraph/trunk/include/osg/State (revision 12660) +++ /OpenSceneGraph/trunk/include/osg/State (revision 13041) @@ -143,13 +143,13 @@ * The ContextID is used by classes like osg::StateAttribute's and osg::Drawable's to * help manage seperate OpenGL objects, such as display lists, vertex buffer objects - * and texture object for each graphics context. The ContextID simply acts as an index + * and texture object for each graphics context. The ContextID simply acts as an index * into arrays that these classes maintain for the purpose of storing GL object handles. - * + * * Note, osgViewer::GraphicsWindow will automatically set up the ContextID for you, * so you will rearely need to set this yourself. - * + * * The exception is when creating your own graphics context, where you should set * the ContextID uniquely for each graphics context. - * + * * Typical settings for ContextID are 0,1,2,3... up to the maximum * number of graphics contexts you have set up. By default contextID is 0. @@ -408,6 +408,6 @@ void haveAppliedAttribute(const StateAttribute* attribute); - /** Attribute has been applied externally, - * and therefore this attribute type has been dirtied + /** Attribute has been applied externally, + * and therefore this attribute type has been dirtied * and will need to be re-applied on next osg::State.apply(..). * note, if you have an osg::StateAttribute which you have applied externally @@ -1183,5 +1183,5 @@ * note, only updates values that change.*/ inline bool setActiveTextureUnit( unsigned int unit ); - + /** Get the current texture unit.*/ unsigned int getActiveTextureUnit() const { return _currentActiveTextureUnit; } @@ -1269,6 +1269,6 @@ * retrofited into OSG for backward compatibility with osgCal, * after uniform ids were refactored from std::strings to GLints in OSG version 2.9.10. - * - * Drawbacks: This method is not particularly fast. It has to access mutexed static + * + * Drawbacks: This method is not particularly fast. It has to access mutexed static * map of uniform ids. So don't overuse it or your app performance will suffer. */ @@ -1339,6 +1339,6 @@ /** Get the number of dynamic objects that will be rendered in this graphics context this frame.*/ unsigned int getDynamicObjectCount() const { return _dynamicObjectCount; } - - /** Decrement the number of dynamic objects left to render this frame, and once the count goes to zero call the + + /** Decrement the number of dynamic objects left to render this frame, and once the count goes to zero call the * DynamicObjectRenderingCompletedCallback to inform of completion.*/ inline void decrementDynamicObjectCount() @@ -1511,5 +1511,5 @@ last_applied_shadercomponent = 0L; global_default_attribute = 0L; - + } @@ -1846,5 +1846,5 @@ osg::ref_ptr _graphicsCostEstimator; - + Timer_t _startTick; Timer_t _gpuTick; Index: /OpenSceneGraph/trunk/include/osg/ConvexPlanarOccluder =================================================================== --- /OpenSceneGraph/trunk/include/osg/ConvexPlanarOccluder (revision 5896) +++ /OpenSceneGraph/trunk/include/osg/ConvexPlanarOccluder (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -33,14 +33,14 @@ _occluder(cpo._occluder), _holeList(cpo._holeList) {} - + META_Object(osg,ConvexPlanarOccluder); void setOccluder(const ConvexPlanarPolygon& cpp) { _occluder = cpp; } - + ConvexPlanarPolygon& getOccluder() { return _occluder; } - + const ConvexPlanarPolygon& getOccluder() const { return _occluder; } - - + + typedef std::vector HoleList; @@ -49,7 +49,7 @@ void setHoleList(const HoleList& holeList) { _holeList=holeList; } - + HoleList& getHoleList() { return _holeList; } - + const HoleList& getHoleList() const { return _holeList; } @@ -65,3 +65,3 @@ } // end of namespace -#endif +#endif Index: /OpenSceneGraph/trunk/include/osg/Vec3s =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec3s (revision 11790) +++ /OpenSceneGraph/trunk/include/osg/Vec3s (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,10 +26,10 @@ /** Number of vector components. */ enum { num_components = 3 }; - + value_type _v[3]; /** Constructor that sets all components of the vector to zero */ Vec3s() { _v[0]=0; _v[1]=0; _v[2]=0; } - + Vec3s(value_type r, value_type g, value_type b) { _v[0]=r; _v[1]=g; _v[2]=b; } @@ -135,5 +135,5 @@ return Vec3s(_v[0]-rhs._v[0], _v[1]-rhs._v[1], _v[2]-rhs._v[2]); } - + /** Unary vector subtract. */ inline Vec3s& operator -= (const Vec3s& rhs) Index: /OpenSceneGraph/trunk/include/osg/LightModel =================================================================== --- /OpenSceneGraph/trunk/include/osg/LightModel (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/LightModel (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -63,5 +63,5 @@ SINGLE_COLOR }; - + void setColorControl(ColorControl cc) { _colorControl = cc; } inline ColorControl getColorControl() const { return _colorControl; } Index: /OpenSceneGraph/trunk/include/osg/GraphicsThread =================================================================== --- /OpenSceneGraph/trunk/include/osg/GraphicsThread (revision 9179) +++ /OpenSceneGraph/trunk/include/osg/GraphicsThread (revision 13041) @@ -26,8 +26,8 @@ { public: - + GraphicsThread(); - - /** Run does the graphics thread run loop.*/ + + /** Run does the graphics thread run loop.*/ virtual void run(); }; @@ -73,9 +73,9 @@ virtual void operator () (Object* object); - + PreBlockOp _preBlockOp; }; -/** ReleaseContext_Block_MakeCurrentOperation releases the context for another thread to acquire, +/** ReleaseContext_Block_MakeCurrentOperation releases the context for another thread to acquire, * then blocks waiting for context to be released, once the block is release the context is re-acquired.*/ struct OSG_EXPORT ReleaseContext_Block_MakeCurrentOperation : public GraphicsOperation, public RefBlock @@ -104,5 +104,5 @@ virtual void operator () (GraphicsContext*); - + double _availableTime; }; @@ -114,7 +114,7 @@ RunOperations(): osg::GraphicsOperation("RunOperation",true) {} - + virtual void operator () (osg::GraphicsContext* context); - + }; @@ -122,7 +122,7 @@ { public: - + EndOfDynamicDrawBlock(unsigned int); - + void completed(osg::State* state); Index: /OpenSceneGraph/trunk/include/osg/ClearNode =================================================================== --- /OpenSceneGraph/trunk/include/osg/ClearNode (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/ClearNode (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -31,5 +31,5 @@ { public : - + ClearNode(); @@ -38,5 +38,5 @@ _requiresClear(cs._requiresClear), _clearColor(cs._clearColor), - _clearMask(cs._clearMask) {} + _clearMask(cs._clearMask) {} @@ -54,5 +54,5 @@ /** Returns the clear color. */ inline const Vec4& getClearColor() const { return _clearColor; } - + /** Set the clear mask used in glClear(..). * Defaults to GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT. */ @@ -63,7 +63,7 @@ protected : - + virtual ~ClearNode() {} - + bool _requiresClear; Vec4 _clearColor; Index: /OpenSceneGraph/trunk/include/osg/ClipNode =================================================================== --- /OpenSceneGraph/trunk/include/osg/ClipNode (revision 12917) +++ /OpenSceneGraph/trunk/include/osg/ClipNode (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -34,5 +34,5 @@ META_Node(osg, ClipNode); - + enum ReferenceFrame { @@ -40,5 +40,5 @@ ABSOLUTE_RF }; - + /** Set the ClipNode's ReferenceFrame, either to be relative to its * parent reference frame, or relative to an absolute coordinate @@ -53,5 +53,5 @@ */ void setReferenceFrame(ReferenceFrame rf); - + ReferenceFrame getReferenceFrame() const { return _referenceFrame; } @@ -105,5 +105,5 @@ StateAttribute::GLModeValue _value; ClipPlaneList _planes; - + ReferenceFrame _referenceFrame; }; Index: /OpenSceneGraph/trunk/include/osg/Stats =================================================================== --- /OpenSceneGraph/trunk/include/osg/Stats (revision 12056) +++ /OpenSceneGraph/trunk/include/osg/Stats (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2007 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2007 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -33,18 +33,18 @@ Stats(const std::string& name, unsigned int numberOfFrames); - + void setName(const std::string& name) { _name = name; } const std::string& getName() const { return _name; } - + void allocate(unsigned int numberOfFrames); - + unsigned int getEarliestFrameNumber() const { return _latestFrameNumber < static_cast(_attributeMapList.size()) ? 0 : _latestFrameNumber - static_cast(_attributeMapList.size()) + 1; } unsigned int getLatestFrameNumber() const { return _latestFrameNumber; } - + typedef std::map AttributeMap; typedef std::vector AttributeMapList; bool setAttribute(unsigned int frameNumber, const std::string& attributeName, double value); - + inline bool getAttribute(unsigned int frameNumber, const std::string& attributeName, double& value) const { @@ -54,7 +54,7 @@ bool getAveragedAttribute(const std::string& attributeName, double& value, bool averageInInverseSpace=false) const; - + bool getAveragedAttribute(unsigned int startFrameNumber, unsigned int endFrameNumber, const std::string& attributeName, double& value, bool averageInInverseSpace=false) const; - + inline AttributeMap& getAttributeMap(unsigned int frameNumber) { @@ -62,5 +62,5 @@ return getAttributeMapNoMutex(frameNumber); } - + inline const AttributeMap& getAttributeMap(unsigned int frameNumber) const { @@ -68,14 +68,14 @@ return getAttributeMapNoMutex(frameNumber); } - + typedef std::map CollectMap; - + void collectStats(const std::string& str, bool flag) { _collectMap[str] = flag; } - + inline bool collectStats(const std::string& str) const { OpenThreads::ScopedLock lock(_mutex); - - CollectMap::const_iterator itr = _collectMap.find(str); + + CollectMap::const_iterator itr = _collectMap.find(str); return (itr != _collectMap.end()) ? itr->second : false; } @@ -83,9 +83,9 @@ void report(std::ostream& out, const char* indent=0) const; void report(std::ostream& out, unsigned int frameNumber, const char* indent=0) const; - + protected: - + virtual ~Stats() {} - + bool getAttributeNoMutex(unsigned int frameNumber, const std::string& attributeName, double& value) const; @@ -98,8 +98,8 @@ // reject frame that are in the future if (frameNumber > _latestFrameNumber) return -1; - + // reject frames that are too early if (frameNumber < getEarliestFrameNumber()) return -1; - + if (frameNumber >= _baseFrameNumber) return frameNumber - _baseFrameNumber; else return static_cast(_attributeMapList.size()) - (_baseFrameNumber-frameNumber); @@ -107,15 +107,15 @@ std::string _name; - + mutable OpenThreads::Mutex _mutex; - + unsigned int _baseFrameNumber; unsigned int _latestFrameNumber; - + AttributeMapList _attributeMapList; AttributeMap _invalidAttributeMap; - + CollectMap _collectMap; - + }; Index: /OpenSceneGraph/trunk/include/osg/ValueObject =================================================================== --- /OpenSceneGraph/trunk/include/osg/ValueObject (revision 12785) +++ /OpenSceneGraph/trunk/include/osg/ValueObject (revision 13041) @@ -138,5 +138,5 @@ virtual ~TemplateValueObject() {} static const char* s_TemplateValueObject_className; - + T _value; }; @@ -172,8 +172,8 @@ { typedef TemplateValueObject UserValueObject; - + const osg::UserDataContainer* udc = dynamic_cast(this); if (!udc) udc = _userDataContainer; - + const UserValueObject* uvo = udc ? dynamic_cast(udc->getUserObject(name)) : 0; if (uvo) @@ -200,5 +200,5 @@ udc = _userDataContainer; } - + unsigned int i = udc->getUserObjectIndex(name); if (igetNumUserObjects()) udc->setUserObject(i, new UserValueObject(name,value)); Index: /OpenSceneGraph/trunk/include/osg/Vec4b =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec4b (revision 11770) +++ /OpenSceneGraph/trunk/include/osg/Vec4b (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,5 +32,5 @@ /** Number of vector components. */ enum { num_components = 4 }; - + value_type _v[4]; Index: /OpenSceneGraph/trunk/include/osg/PositionAttitudeTransform =================================================================== --- /OpenSceneGraph/trunk/include/osg/PositionAttitudeTransform (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/PositionAttitudeTransform (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -37,5 +37,5 @@ _scale(pat._scale), _pivotPoint(pat._pivotPoint) {} - + META_Node(osg, PositionAttitudeTransform); @@ -50,13 +50,13 @@ inline void setAttitude(const Quat& quat) { _attitude = quat; dirtyBound(); } inline const Quat& getAttitude() const { return _attitude; } - + inline void setScale(const Vec3d& scale) { _scale = scale; dirtyBound(); } inline const Vec3d& getScale() const { return _scale; } - + inline void setPivotPoint(const Vec3d& pivot) { _pivotPoint = pivot; dirtyBound(); } inline const Vec3d& getPivotPoint() const { return _pivotPoint; } - + virtual bool computeLocalToWorldMatrix(Matrix& matrix,NodeVisitor* nv) const; @@ -65,5 +65,5 @@ protected : - + virtual ~PositionAttitudeTransform() {} Index: /OpenSceneGraph/trunk/include/osg/Vec4d =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec4d (revision 11770) +++ /OpenSceneGraph/trunk/include/osg/Vec4d (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -35,5 +35,5 @@ /** Number of vector components. */ enum { num_components = 4 }; - + value_type _v[4]; @@ -56,7 +56,7 @@ _v[3]=w; } - + inline Vec4d(const Vec4f& vec) { _v[0]=vec._v[0]; _v[1]=vec._v[1]; _v[2]=vec._v[2]; _v[3]=vec._v[3];} - + inline operator Vec4f() const { return Vec4f(static_cast(_v[0]),static_cast(_v[1]),static_cast(_v[2]),static_cast(_v[3]));} Index: /OpenSceneGraph/trunk/include/osg/Vec4f =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec4f (revision 11770) +++ /OpenSceneGraph/trunk/include/osg/Vec4f (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -34,5 +34,5 @@ /** Number of vector components. */ enum { num_components = 4 }; - + /** Vec member variable. */ value_type _v[4]; @@ -42,5 +42,5 @@ /** Constructor that sets all components of the vector to zero */ Vec4f() { _v[0]=0.0f; _v[1]=0.0f; _v[2]=0.0f; _v[3]=0.0f;} - + Vec4f(value_type x, value_type y, value_type z, value_type w) { @@ -58,5 +58,5 @@ _v[3]=w; } - + inline bool operator == (const Vec4f& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2] && _v[3]==v._v[3]; } Index: /OpenSceneGraph/trunk/include/osg/CopyOp =================================================================== --- /OpenSceneGraph/trunk/include/osg/CopyOp (revision 12480) +++ /OpenSceneGraph/trunk/include/osg/CopyOp (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -41,5 +41,5 @@ public: - + enum Options { @@ -85,5 +85,5 @@ protected: - + CopyFlags _flags; }; Index: /OpenSceneGraph/trunk/include/osg/Polytope =================================================================== --- /OpenSceneGraph/trunk/include/osg/Polytope (revision 12744) +++ /OpenSceneGraph/trunk/include/osg/Polytope (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -35,10 +35,10 @@ inline Polytope() {setupMask();} - inline Polytope(const Polytope& cv) : + inline Polytope(const Polytope& cv) : _maskStack(cv._maskStack), _resultMask(cv._resultMask), _planeList(cv._planeList), _referenceVertexList(cv._referenceVertexList) {} - + inline Polytope(const PlaneList& pl) : _planeList(pl) {setupMask();} @@ -56,5 +56,5 @@ return *this; } - + /** Create a Polytope which is a cube, centered at 0,0,0, with sides of 2 units.*/ void setToUnitFrustum(bool withNear=true, bool withFar=true) @@ -95,5 +95,5 @@ return; } - + ClippingMask selector_mask = 0x1; @@ -109,5 +109,5 @@ selector_mask <<= 1; } - + _planeList.resize(numActivePlanes); _resultMask = 0; @@ -131,6 +131,6 @@ inline void set(const PlaneList& pl) { _planeList = pl; setupMask(); } - - + + inline void add(const osg::Plane& pl) { _planeList.push_back(pl); setupMask(); } @@ -145,5 +145,5 @@ } } - + inline bool empty() const { return _planeList.empty(); } @@ -156,5 +156,5 @@ inline VertexList& getReferenceVertexList() { return _referenceVertexList; } - + inline const VertexList& getReferenceVertexList() const { return _referenceVertexList; } @@ -177,10 +177,10 @@ inline ClippingMask getResultMask() const { return _resultMask; } - + MaskStack& getMaskStack() { return _maskStack; } - + const MaskStack& getMaskStack() const { return _maskStack; } - - + + inline void pushCurrentMask() { @@ -197,5 +197,5 @@ { if (!_maskStack.back()) return true; - + unsigned int selector_mask = 0x1; for(PlaneList::const_iterator itr=_planeList.begin(); @@ -230,5 +230,5 @@ selector_mask <<= 1; } - + if (!outside) return true; } @@ -258,9 +258,9 @@ else if (res>0) _resultMask ^= selector_mask; // subsequent checks against this plane not required. } - selector_mask <<= 1; - } - return true; - } - + selector_mask <<= 1; + } + return true; + } + /** Check whether any part of a bounding box is contained within clipping set. Using a mask to determine which planes should be used for the check, and @@ -285,5 +285,5 @@ else if (res>0) _resultMask ^= selector_mask; // subsequent checks against this plane not required. } - selector_mask <<= 1; + selector_mask <<= 1; } return true; @@ -308,5 +308,5 @@ _resultMask ^= selector_mask; // subsequent checks against this plane not required. } - selector_mask <<= 1; + selector_mask <<= 1; } return true; @@ -320,5 +320,5 @@ _resultMask = _maskStack.back(); ClippingMask selector_mask = 0x1; - + for(PlaneList::const_iterator itr=_planeList.begin(); itr!=_planeList.end(); @@ -331,9 +331,9 @@ _resultMask ^= selector_mask; // subsequent checks against this plane not required. } - selector_mask <<= 1; - } - return true; - } - + selector_mask <<= 1; + } + return true; + } + /** Check whether the entire bounding box is contained within clipping set.*/ inline bool containsAllOf(const osg::BoundingBox& bb) @@ -354,12 +354,12 @@ _resultMask ^= selector_mask; // subsequent checks against this plane not required. } - selector_mask <<= 1; - } - return true; - } - - + selector_mask <<= 1; + } + return true; + } + + /** Transform the clipping set by matrix. Note, this operations carries out - * the calculation of the inverse of the matrix since a plane must + * the calculation of the inverse of the matrix since a plane must * be multiplied by the inverse transposed to transform it. This * makes this operation expensive. If the inverse has been already @@ -372,5 +372,5 @@ transformProvidingInverse(inverse); } - + /** Transform the clipping set by provide a pre inverted matrix. * see transform for details. */ @@ -388,9 +388,9 @@ { itr->transformProvidingInverse(matrix); - selector_mask <<= 1; - } - } - } - + selector_mask <<= 1; + } + } + } + protected: @@ -405,3 +405,3 @@ } // end of namespace -#endif +#endif Index: /OpenSceneGraph/trunk/include/osg/ImageSequence =================================================================== --- /OpenSceneGraph/trunk/include/osg/ImageSequence (revision 12139) +++ /OpenSceneGraph/trunk/include/osg/ImageSequence (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -45,5 +45,5 @@ virtual void setReferenceTime(double t) { _referenceTime = t; } virtual double getReferenceTime() const { return _referenceTime; } - + virtual void setTimeMultiplier(double tm) { _timeMultiplier = tm; } virtual double getTimeMultiplier() const { return _timeMultiplier; } @@ -51,5 +51,5 @@ typedef std::vector< osg::ref_ptr > Images; typedef std::vector< std::string > FileNames; - + virtual void seek(double time); @@ -59,5 +59,5 @@ virtual void rewind(); - + enum Mode { @@ -66,5 +66,5 @@ PAGE_AND_DISCARD_USED_IMAGES }; - + void setMode(Mode mode); Mode getMode() const { return _mode; } @@ -72,11 +72,11 @@ void setLength(double length); virtual double getLength() const { return _length; } - + void addImageFile(const std::string& fileName); - + void setImageFile(unsigned int pos, const std::string& fileName); std::string getImageFile(unsigned int pos) const; - + unsigned int getNumImageFiles() const { return _fileNames.size(); } @@ -85,5 +85,5 @@ void addImage(osg::Image* image); - + void setImage(int s,int t,int r, GLint internalTextureformat, @@ -96,5 +96,5 @@ Image* getImage(unsigned int pos); const Image* getImage(unsigned int pos) const; - + unsigned int getNumImages() const { return _images.size(); } @@ -111,9 +111,9 @@ virtual ~ImageSequence() {} - + virtual void applyLoopingMode(); void setImageToChild(const osg::Image* image); - + void computeTimePerImage(); @@ -133,15 +133,15 @@ Images _images; - + typedef std::set< std::string > FilesRequested; FilesRequested _filesRequested; - + int _previousAppliedImageIndex; - - + + bool _seekTimeSet; double _seekTime; - - + + }; Index: /OpenSceneGraph/trunk/include/osg/Array =================================================================== --- /OpenSceneGraph/trunk/include/osg/Array (revision 12912) +++ /OpenSceneGraph/trunk/include/osg/Array (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -49,5 +49,5 @@ public: - + enum Type { @@ -74,5 +74,5 @@ Vec3dArrayType = 20, Vec4dArrayType = 21, - MatrixArrayType = 22 + MatrixArrayType = 22 }; @@ -145,16 +145,16 @@ MixinVector(ta) {} - TemplateArray(unsigned int no) : + TemplateArray(unsigned int no) : Array(ARRAYTYPE,DataSize,DataType), MixinVector(no) {} - TemplateArray(unsigned int no,const T* ptr) : + TemplateArray(unsigned int no,const T* ptr) : Array(ARRAYTYPE,DataSize,DataType), MixinVector(ptr,ptr+no) {} template - TemplateArray(InputIterator first,InputIterator last) : + TemplateArray(InputIterator first,InputIterator last) : Array(ARRAYTYPE,DataSize,DataType), - MixinVector(first,last) {} + MixinVector(first,last) {} TemplateArray& operator = (const TemplateArray& array) @@ -163,8 +163,8 @@ this->assign(array.begin(),array.end()); return *this; - } + } virtual Object* cloneType() const { return new TemplateArray(); } - virtual Object* clone(const CopyOp& copyop) const { return new TemplateArray(*this,copyop); } + virtual Object* clone(const CopyOp& copyop) const { return new TemplateArray(*this,copyop); } inline virtual void accept(ArrayVisitor& av); @@ -196,5 +196,5 @@ protected: - + virtual ~TemplateArray() {} }; @@ -231,16 +231,16 @@ MixinVector(ta) {} - TemplateIndexArray(unsigned int no) : + TemplateIndexArray(unsigned int no) : IndexArray(ARRAYTYPE,DataSize,DataType), MixinVector(no) {} - TemplateIndexArray(unsigned int no,T* ptr) : + TemplateIndexArray(unsigned int no,T* ptr) : IndexArray(ARRAYTYPE,DataSize,DataType), MixinVector(ptr,ptr+no) {} template - TemplateIndexArray(InputIterator first,InputIterator last) : + TemplateIndexArray(InputIterator first,InputIterator last) : IndexArray(ARRAYTYPE,DataSize,DataType), - MixinVector(first,last) {} + MixinVector(first,last) {} TemplateIndexArray& operator = (const TemplateIndexArray& array) @@ -249,8 +249,8 @@ this->assign(array.begin(),array.end()); return *this; - } + } virtual Object* cloneType() const { return new TemplateIndexArray(); } - virtual Object* clone(const CopyOp& copyop) const { return new TemplateIndexArray(*this,copyop); } + virtual Object* clone(const CopyOp& copyop) const { return new TemplateIndexArray(*this,copyop); } inline virtual void accept(ArrayVisitor& av); @@ -324,5 +324,5 @@ ArrayVisitor() {} virtual ~ArrayVisitor() {} - + virtual void apply(Array&) {} virtual void apply(ByteArray&) {} @@ -338,10 +338,10 @@ virtual void apply(Vec3Array&) {} virtual void apply(Vec4Array&) {} - + virtual void apply(Vec4ubArray&) {} - virtual void apply(Vec2bArray&) {} - virtual void apply(Vec3bArray&) {} - virtual void apply(Vec4bArray&) {} + virtual void apply(Vec2bArray&) {} + virtual void apply(Vec3bArray&) {} + virtual void apply(Vec4bArray&) {} virtual void apply(Vec2sArray&) {} @@ -352,5 +352,5 @@ virtual void apply(Vec3dArray&) {} virtual void apply(Vec4dArray&) {} - + virtual void apply(MatrixfArray&) {} }; @@ -361,5 +361,5 @@ ConstArrayVisitor() {} virtual ~ConstArrayVisitor() {} - + virtual void apply(const Array&) {} virtual void apply(const ByteArray&) {} @@ -378,7 +378,7 @@ virtual void apply(const Vec4ubArray&) {} - virtual void apply(const Vec2bArray&) {} - virtual void apply(const Vec3bArray&) {} - virtual void apply(const Vec4bArray&) {} + virtual void apply(const Vec2bArray&) {} + virtual void apply(const Vec3bArray&) {} + virtual void apply(const Vec4bArray&) {} virtual void apply(const Vec2sArray&) {} @@ -389,5 +389,5 @@ virtual void apply(const Vec3dArray&) {} virtual void apply(const Vec4dArray&) {} - + virtual void apply(const MatrixfArray&) {} }; @@ -399,5 +399,5 @@ ValueVisitor() {} virtual ~ValueVisitor() {} - + virtual void apply(GLbyte&) {} virtual void apply(GLshort&) {} @@ -408,15 +408,15 @@ virtual void apply(GLfloat&) {} virtual void apply(GLdouble&) {} - - + + virtual void apply(Vec2&) {} virtual void apply(Vec3&) {} virtual void apply(Vec4&) {} - + virtual void apply(Vec4ub&) {} - virtual void apply(Vec2b&) {} - virtual void apply(Vec3b&) {} - virtual void apply(Vec4b&) {} + virtual void apply(Vec2b&) {} + virtual void apply(Vec3b&) {} + virtual void apply(Vec4b&) {} virtual void apply(Vec2s&) {} @@ -427,5 +427,5 @@ virtual void apply(Vec3d&) {} virtual void apply(Vec4d&) {} - + virtual void apply(Matrixf&) {} }; @@ -436,5 +436,5 @@ ConstValueVisitor() {} virtual ~ConstValueVisitor() {} - + virtual void apply(const GLbyte&) {} virtual void apply(const GLshort&) {} @@ -454,14 +454,14 @@ virtual void apply(const Vec2b&) {} virtual void apply(const Vec3b&) {} - virtual void apply(const Vec4b&) {} - + virtual void apply(const Vec4b&) {} + virtual void apply(const Vec2s&) {} virtual void apply(const Vec3s&) {} virtual void apply(const Vec4s&) {} - + virtual void apply(const Vec2d&) {} virtual void apply(const Vec3d&) {} virtual void apply(const Vec4d&) {} - + virtual void apply(const Matrixf&) {} }; Index: /OpenSceneGraph/trunk/include/osg/DrawPixels =================================================================== --- /OpenSceneGraph/trunk/include/osg/DrawPixels (revision 6666) +++ /OpenSceneGraph/trunk/include/osg/DrawPixels (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -31,11 +31,11 @@ /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ DrawPixels(const DrawPixels& drawimage,const CopyOp& copyop=CopyOp::SHALLOW_COPY); - + virtual Object* cloneType() const { return new DrawPixels(); } virtual Object* clone(const CopyOp& copyop) const { return new DrawPixels(*this,copyop); } - + virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast(obj)!=NULL; } - + virtual const char* libraryName() const { return "osg"; } virtual const char* className() const { return "DrawPixels"; } @@ -43,13 +43,13 @@ void setPosition(const osg::Vec3& position); - + osg::Vec3& getPosition() { return _position; } const osg::Vec3& getPosition() const { return _position; } void setImage(osg::Image* image) { _image = image; } - + osg::Image* getImage() { return _image.get(); } const osg::Image* getImage() const { return _image.get(); } - + void setUseSubImage(bool useSubImage) { _useSubImage=useSubImage; } bool getUseSubImage() const { return _useSubImage; } @@ -61,5 +61,5 @@ virtual BoundingBox computeBound() const; - + protected: @@ -70,8 +70,8 @@ Vec3 _position; ref_ptr _image; - + bool _useSubImage; unsigned int _offsetX, _offsetY, _width, _height; - + }; Index: /OpenSceneGraph/trunk/include/osg/Vec4s =================================================================== --- /OpenSceneGraph/trunk/include/osg/Vec4s (revision 11770) +++ /OpenSceneGraph/trunk/include/osg/Vec4s (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,5 +32,5 @@ /** Number of vector components. */ enum { num_components = 4 }; - + /** Vec member variable. */ value_type _v[4]; Index: /OpenSceneGraph/trunk/include/osg/Texture1D =================================================================== --- /OpenSceneGraph/trunk/include/osg/Texture1D (revision 11790) +++ /OpenSceneGraph/trunk/include/osg/Texture1D (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,5 +32,5 @@ public : - + Texture1D(); @@ -39,5 +39,5 @@ /** Copy constructor using CopyOp to manage deep vs shallow copy. */ Texture1D(const Texture1D& text,const CopyOp& copyop=CopyOp::SHALLOW_COPY); - + META_StateAttribute(osg, Texture1D,TEXTURE); @@ -92,7 +92,7 @@ virtual void subload(const Texture1D& texture,State& state) const = 0; }; - + void setSubloadCallback(SubloadCallback* cb) { _subloadCallback = cb;; } - + SubloadCallback* getSubloadCallback() { return _subloadCallback.get(); } @@ -146,5 +146,5 @@ /** Subloaded images can have different texture and image sizes. */ mutable GLsizei _textureWidth; - + /** Number of mipmap levels created. */ mutable GLsizei _numMipmapLevels; Index: /OpenSceneGraph/trunk/include/osg/TextureRectangle =================================================================== --- /OpenSceneGraph/trunk/include/osg/TextureRectangle (revision 10092) +++ /OpenSceneGraph/trunk/include/osg/TextureRectangle (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -118,5 +118,5 @@ void copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height ); - /** On first apply (unless already compiled), create and bind the + /** On first apply (unless already compiled), create and bind the * texture, subsequent apply will simply bind to texture. */ @@ -137,5 +137,5 @@ // subloaded images can have different texture and image sizes. mutable GLsizei _textureWidth, _textureHeight; - + ref_ptr _subloadCallback; Index: /OpenSceneGraph/trunk/include/osg/PolygonStipple =================================================================== --- /OpenSceneGraph/trunk/include/osg/PolygonStipple (revision 10691) +++ /OpenSceneGraph/trunk/include/osg/PolygonStipple (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osg/ClampColor =================================================================== --- /OpenSceneGraph/trunk/include/osg/ClampColor (revision 11808) +++ /OpenSceneGraph/trunk/include/osg/ClampColor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -45,5 +45,5 @@ ClampColor(); - + ClampColor(GLenum vertexMode, GLenum fragmentMode, GLenum readMode); @@ -56,5 +56,5 @@ META_StateAttribute(osg, ClampColor,CLAMPCOLOR); - + /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ virtual int compare(const StateAttribute& sa) const @@ -81,9 +81,9 @@ GLenum getClampReadColor() const { return _clampReadColor; } - + virtual void apply(State& state) const; /** Encapsulates queries of extension availability, obtains extension * function pointers, and provides convenience wrappers for - * calling extension functions. */ + * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -92,12 +92,12 @@ Extensions(const Extensions& rhs); - + void lowestCommonDenominator(const Extensions& rhs); - + void setupGLExtensions(unsigned int contextID); void setClampColorSupported(bool flag) { _isClampColorSupported=flag; } bool isClampColorSupported() const { return _isClampColorSupported; } - + void glClampColor(GLenum target, GLenum mode) const; @@ -105,5 +105,5 @@ ~Extensions() {} - + typedef void (GL_APIENTRY * GLClampColorProc) (GLenum target, GLenum mode); bool _isClampColorSupported; @@ -111,5 +111,5 @@ }; - + /** Returns the Extensions object for the given context. * If createIfNotInitalized is true and the Extensions object doesn't Index: /OpenSceneGraph/trunk/include/osg/PolygonMode =================================================================== --- /OpenSceneGraph/trunk/include/osg/PolygonMode (revision 10691) +++ /OpenSceneGraph/trunk/include/osg/PolygonMode (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ /** State Class for setting OpenGL's polygon culling mode. -*/ +*/ class OSG_EXPORT PolygonMode : public StateAttribute { Index: /OpenSceneGraph/trunk/include/osg/StencilTwoSided =================================================================== --- /OpenSceneGraph/trunk/include/osg/StencilTwoSided (revision 11756) +++ /OpenSceneGraph/trunk/include/osg/StencilTwoSided (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield + * + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -104,5 +104,5 @@ }; - /** set the operations to apply when the various stencil and depth + /** set the operations to apply when the various stencil and depth * tests fail or pass. First parameter is to control the operation * when the stencil test fails. The second parameter is to control the @@ -147,5 +147,5 @@ /** Extensions class which encapsulates the querying of extensions and - * associated function pointers, and provide convenience wrappers to + * associated function pointers, and provide convenience wrappers to * check for the extensions or use the associated functions. */ Index: /OpenSceneGraph/trunk/include/osg/ShadeModel =================================================================== --- /OpenSceneGraph/trunk/include/osg/ShadeModel (revision 10691) +++ /OpenSceneGraph/trunk/include/osg/ShadeModel (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,14 +26,14 @@ /** Class which encapsulates glShadeModel(..). -*/ +*/ class OSG_EXPORT ShadeModel : public StateAttribute { public : - + enum Mode { FLAT = GL_FLAT, SMOOTH = GL_SMOOTH }; - + ShadeModel(Mode mode=SMOOTH); @@ -42,8 +42,8 @@ StateAttribute(sm,copyop), _mode(sm._mode) {} - + META_StateAttribute(osg, ShadeModel, SHADEMODEL); - + /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const @@ -62,11 +62,11 @@ inline Mode getMode() const { return _mode; } - + virtual void apply(State& state) const; - + protected: - + virtual ~ShadeModel(); - + Mode _mode; Index: /OpenSceneGraph/trunk/include/osg/ConvexPlanarPolygon =================================================================== --- /OpenSceneGraph/trunk/include/osg/ConvexPlanarPolygon (revision 9122) +++ /OpenSceneGraph/trunk/include/osg/ConvexPlanarPolygon (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -28,15 +28,15 @@ ConvexPlanarPolygon(); - + typedef std::vector VertexList; void add(const Vec3& v) { _vertexList.push_back(v); } - + void setVertexList(const VertexList& vertexList) { _vertexList=vertexList; } VertexList& getVertexList() { return _vertexList; } - + const VertexList& getVertexList() const { return _vertexList; } - + protected: @@ -47,3 +47,3 @@ } // end of namespace -#endif +#endif Index: /OpenSceneGraph/trunk/include/osg/UserDataContainer =================================================================== --- /OpenSceneGraph/trunk/include/osg/UserDataContainer (revision 12511) +++ /OpenSceneGraph/trunk/include/osg/UserDataContainer (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -79,5 +79,5 @@ virtual unsigned int getUserObjectIndex(const std::string& name, unsigned int startPos=0) const = 0; - + /** Get first user data object with specified name. */ virtual Object* getUserObject(const std::string& name, unsigned int startPos=0); @@ -161,5 +161,5 @@ - + /** Set the list of string descriptions.*/ virtual void setDescriptions(const DescriptionList& descriptions); Index: /OpenSceneGraph/trunk/include/osg/Projection =================================================================== --- /OpenSceneGraph/trunk/include/osg/Projection (revision 5328) +++ /OpenSceneGraph/trunk/include/osg/Projection (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -38,5 +38,5 @@ /** Set the transform's matrix.*/ void setMatrix(const Matrix& mat) { _matrix = mat; } - + /** Get the transform's matrix. */ inline const Matrix& getMatrix() const { return _matrix; } @@ -44,13 +44,13 @@ /** preMult transform.*/ void preMult(const Matrix& mat) { _matrix.preMult(mat); } - + /** postMult transform.*/ void postMult(const Matrix& mat) { _matrix.postMult(mat); } - + protected : - + virtual ~Projection(); - + Matrix _matrix; Index: /OpenSceneGraph/trunk/include/osgAnimation/Interpolator =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Interpolator (revision 12608) +++ /OpenSceneGraph/trunk/include/osgAnimation/Interpolator (revision 13041) @@ -1,15 +1,15 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. - * + * * Authors: * Cedric Pinson @@ -39,5 +39,5 @@ void reset() { _lastKeyAccess = -1; } - int getKeyIndexFromTime(const TemplateKeyframeContainer& keys, double time) const + int getKeyIndexFromTime(const TemplateKeyframeContainer& keys, double time) const { // todo use a cache @@ -53,5 +53,5 @@ double time1 = keysVector[i+1].getTime(); - if ( time >= time0 && time < time1 ) + if ( time >= time0 && time < time1 ) { _lastKeyAccess = i; @@ -71,13 +71,13 @@ TemplateStepInterpolator() {} - void getValue(const TemplateKeyframeContainer& keyframes, double time, TYPE& result) const - { - - if (time >= keyframes.back().getTime()) + void getValue(const TemplateKeyframeContainer& keyframes, double time, TYPE& result) const + { + + if (time >= keyframes.back().getTime()) { result = keyframes.back().getValue(); return; - } - else if (time <= keyframes.front().getTime()) + } + else if (time <= keyframes.front().getTime()) { result = keyframes.front().getValue(); @@ -97,18 +97,18 @@ TemplateLinearInterpolator() {} - void getValue(const TemplateKeyframeContainer& keyframes, double time, TYPE& result) const - { - - if (time >= keyframes.back().getTime()) + void getValue(const TemplateKeyframeContainer& keyframes, double time, TYPE& result) const + { + + if (time >= keyframes.back().getTime()) { result = keyframes.back().getValue(); return; - } - else if (time <= keyframes.front().getTime()) + } + else if (time <= keyframes.front().getTime()) { result = keyframes.front().getValue(); return; } - + int i = this->getKeyIndexFromTime(keyframes,time); float blend = (time - keyframes[i].getTime()) / ( keyframes[i+1].getTime() - keyframes[i].getTime()); @@ -125,12 +125,12 @@ public: TemplateSphericalLinearInterpolator() {} - void getValue(const TemplateKeyframeContainer& keyframes, double time, TYPE& result) const - { - if (time >= keyframes.back().getTime()) + void getValue(const TemplateKeyframeContainer& keyframes, double time, TYPE& result) const + { + if (time >= keyframes.back().getTime()) { result = keyframes.back().getValue(); return; } - else if (time <= keyframes.front().getTime()) + else if (time <= keyframes.front().getTime()) { result = keyframes.front().getValue(); @@ -153,12 +153,12 @@ TemplateLinearPackedInterpolator() {} - void getValue(const TemplateKeyframeContainer& keyframes, double time, TYPE& result) const - { - if (time >= keyframes.back().getTime()) + void getValue(const TemplateKeyframeContainer& keyframes, double time, TYPE& result) const + { + if (time >= keyframes.back().getTime()) { keyframes.back().getValue().uncompress(keyframes.mScale, keyframes.mMin, result); return; } - else if (time <= keyframes.front().getTime()) + else if (time <= keyframes.front().getTime()) { keyframes.front().getValue().uncompress(keyframes.mScale, keyframes.mMin, result); @@ -183,13 +183,13 @@ TemplateCubicBezierInterpolator() {} - void getValue(const TemplateKeyframeContainer& keyframes, double time, TYPE& result) const - { - - if (time >= keyframes.back().getTime()) + void getValue(const TemplateKeyframeContainer& keyframes, double time, TYPE& result) const + { + + if (time >= keyframes.back().getTime()) { result = keyframes.back().getValue().getPosition(); return; } - else if (time <= keyframes.front().getTime()) + else if (time <= keyframes.front().getTime()) { result = keyframes.front().getValue().getPosition(); @@ -198,5 +198,5 @@ int i = this->getKeyIndexFromTime(keyframes,time); - + float t = (time - keyframes[i].getTime()) / ( keyframes[i+1].getTime() - keyframes[i].getTime()); float one_minus_t = 1.0-t; Index: /OpenSceneGraph/trunk/include/osgAnimation/Bone =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Bone (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/Bone (revision 13041) @@ -1,15 +1,15 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. - * + * * Authors: * Cedric Pinson @@ -23,5 +23,5 @@ #include -namespace osgAnimation +namespace osgAnimation { Index: /OpenSceneGraph/trunk/include/osgAnimation/Skeleton =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Skeleton (revision 12628) +++ /OpenSceneGraph/trunk/include/osgAnimation/Skeleton (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -19,5 +19,5 @@ #include -namespace osgAnimation +namespace osgAnimation { Index: /OpenSceneGraph/trunk/include/osgAnimation/Target =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Target (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/Target (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -25,5 +25,5 @@ #include -namespace osgAnimation +namespace osgAnimation { @@ -33,5 +33,5 @@ { public: - + Target(); virtual ~Target() {} @@ -50,5 +50,5 @@ { public: - + TemplateTarget() : _target() {} TemplateTarget(const T& v) { setValue(v); } @@ -118,5 +118,5 @@ osg::Quat::value_type len2 = _target.length2(); - if ( len2 != 1.0 && len2 != 0.0) + if ( len2 != 1.0 && len2 != 0.0) _target *= 1.0/sqrt(len2); } @@ -129,5 +129,5 @@ typedef TemplateTarget FloatTarget; typedef TemplateTarget DoubleTarget; - + } Index: /OpenSceneGraph/trunk/include/osgAnimation/UpdateBone =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/UpdateBone (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/UpdateBone (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/RigTransformSoftware =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/RigTransformSoftware (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/RigTransformSoftware (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -22,5 +22,5 @@ #include -namespace osgAnimation +namespace osgAnimation { @@ -34,7 +34,7 @@ RigTransformSoftware(); virtual void operator()(RigGeometry&); - - class BoneWeight + + class BoneWeight { public: @@ -56,6 +56,6 @@ BoneWeightList& getBones() { return _bones; } VertexList& getVertexes() { return _vertexes; } - - void resetMatrix() + + void resetMatrix() { _result.set(0, 0, 0, 0, @@ -123,5 +123,5 @@ // the result of matrix mult should be cached to be used for vertexes transform and normal transform and maybe other computation int size = _boneSetVertexSet.size(); - for (int i = 0; i < size; i++) + for (int i = 0; i < size; i++) { UniqBoneSetVertexSet& uniq = _boneSetVertexSet[i]; @@ -143,5 +143,5 @@ { int size = _boneSetVertexSet.size(); - for (int i = 0; i < size; i++) + for (int i = 0; i < size; i++) { UniqBoneSetVertexSet& uniq = _boneSetVertexSet[i]; @@ -151,5 +151,5 @@ const VertexList& vertexes = uniq.getVertexes(); int vertexSize = vertexes.size(); - for (int j = 0; j < vertexSize; j++) + for (int j = 0; j < vertexSize; j++) { int idx = vertexes[j]; Index: /OpenSceneGraph/trunk/include/osgAnimation/RigTransformHardware =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/RigTransformHardware (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/RigTransformHardware (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -23,5 +23,5 @@ #include -namespace osgAnimation +namespace osgAnimation { class RigGeometry; Index: /OpenSceneGraph/trunk/include/osgAnimation/StackedRotateAxisElement =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/StackedRotateAxisElement (revision 13030) +++ /OpenSceneGraph/trunk/include/osgAnimation/StackedRotateAxisElement (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -24,5 +24,5 @@ { - class OSGANIMATION_EXPORT StackedRotateAxisElement : public StackedTransformElement + class OSGANIMATION_EXPORT StackedRotateAxisElement : public StackedTransformElement { public: Index: /OpenSceneGraph/trunk/include/osgAnimation/MorphGeometry =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/MorphGeometry (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/MorphGeometry (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -20,17 +20,17 @@ #include -namespace osgAnimation +namespace osgAnimation { class OSGANIMATION_EXPORT MorphGeometry : public osg::Geometry { - + public: - + enum Method { NORMALIZED, RELATIVE }; - + class MorphTarget { @@ -72,15 +72,15 @@ virtual void transformSoftwareMethod(); - + /** Set the morphing method. */ void setMethod(Method method) { _method = method; } /** Get the morphing method. */ inline Method getMethod() const { return _method; } - + /** Set flag for morphing normals. */ void setMorphNormals(bool morphNormals) { _morphNormals = morphNormals; } /** Get the flag for morphing normals. */ inline bool getMorphNormals() const { return _morphNormals; } - + /** Add a \c MorphTarget to the \c MorphGeometry. * If \c MorphTarget is not \c NULL and is not contained in the \c MorphGeometry @@ -93,9 +93,9 @@ */ virtual void addMorphTarget( osg::Geometry *morphTarget, float weight = 1.0 ) { _morphTargets.push_back(MorphTarget(morphTarget, weight)); _dirty = true; } - + void setWeight(unsigned int index, float morphWeight) - { - if (index < _morphTargets.size()) - { + { + if (index < _morphTargets.size()) + { _morphTargets[index].setWeight(morphWeight); dirty(); @@ -105,5 +105,5 @@ /** Set the MorphGeometry dirty.*/ void dirty() { _dirty = true; } - + /** Get the list of MorphTargets.*/ const MorphTargetList& getMorphTargetList() const { return _morphTargets; } @@ -111,5 +111,5 @@ /** Get the list of MorphTargets. Warning if you modify this array you will have to call dirty() */ MorphTargetList& getMorphTargetList() { return _morphTargets; } - + /** Return the \c MorphTarget at position \c i.*/ inline const MorphTarget& getMorphTarget( unsigned int i ) const { return _morphTargets[i]; } @@ -124,17 +124,17 @@ Method _method; MorphTargetList _morphTargets; - + std::vector _positionSource; std::vector _normalSource; - + /// Do we also morph between normals? bool _morphNormals; }; - + class OSGANIMATION_EXPORT UpdateMorph : public AnimationUpdateCallback { protected: std::map > _weightTargets; - + public: Index: /OpenSceneGraph/trunk/include/osgAnimation/BoneMapVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/BoneMapVisitor (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/BoneMapVisitor (revision 13041) @@ -1,15 +1,15 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. - * + * * Authors: * Cedric Pinson Index: /OpenSceneGraph/trunk/include/osgAnimation/TimelineAnimationManager =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/TimelineAnimationManager (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/TimelineAnimationManager (revision 13041) @@ -1,17 +1,17 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ -#ifndef OSGANIMATION_TIMELINE_ANIMATION_MANAGER +#ifndef OSGANIMATION_TIMELINE_ANIMATION_MANAGER #define OSGANIMATION_TIMELINE_ANIMATION_MANAGER 1 @@ -21,5 +21,5 @@ -namespace osgAnimation +namespace osgAnimation { Index: /OpenSceneGraph/trunk/include/osgAnimation/Sampler =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Sampler (revision 12692) +++ /OpenSceneGraph/trunk/include/osgAnimation/Sampler (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -27,5 +27,5 @@ #include -namespace osgAnimation +namespace osgAnimation { @@ -59,5 +59,5 @@ KeyframeContainerType* getKeyframeContainerTyped() { return _keyframes.get();} const KeyframeContainerType* getKeyframeContainerTyped() const { return _keyframes.get();} - KeyframeContainerType* getOrCreateKeyframeContainer() + KeyframeContainerType* getOrCreateKeyframeContainer() { if (_keyframes != 0) @@ -74,5 +74,5 @@ } - double getEndTime() const + double getEndTime() const { if (!_keyframes || _keyframes->empty()) @@ -133,5 +133,5 @@ typedef TemplateSampler Vec3CubicBezierSampler; typedef TemplateSampler Vec4CubicBezierSampler; - + } Index: /OpenSceneGraph/trunk/include/osgAnimation/Keyframe =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Keyframe (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/Keyframe (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,13 +26,13 @@ #include -namespace osgAnimation +namespace osgAnimation { - class Keyframe + class Keyframe { public: double getTime() const { return _time; } void setTime(double time) { _time = time; } - + protected: double _time; @@ -49,6 +49,6 @@ ~TemplateKeyframe () {} - TemplateKeyframe (double time, const T& value) - { + TemplateKeyframe (double time, const T& value) + { _time = time; _value = value; @@ -100,7 +100,7 @@ typedef TemplateKeyframe FloatKeyframe; typedef TemplateKeyframeContainer FloatKeyframeContainer; - + typedef TemplateKeyframe DoubleKeyframe; - typedef TemplateKeyframeContainer DoubleKeyframeContainer; + typedef TemplateKeyframeContainer DoubleKeyframeContainer; typedef TemplateKeyframe Vec2Keyframe; @@ -124,14 +124,14 @@ typedef TemplateKeyframe FloatCubicBezierKeyframe; typedef TemplateKeyframeContainer FloatCubicBezierKeyframeContainer; - + typedef TemplateKeyframe DoubleCubicBezierKeyframe; typedef TemplateKeyframeContainer DoubleCubicBezierKeyframeContainer; - + typedef TemplateKeyframe Vec2CubicBezierKeyframe; typedef TemplateKeyframeContainer Vec2CubicBezierKeyframeContainer; - + typedef TemplateKeyframe Vec3CubicBezierKeyframe; typedef TemplateKeyframeContainer Vec3CubicBezierKeyframeContainer; - + typedef TemplateKeyframe Vec4CubicBezierKeyframe; typedef TemplateKeyframeContainer Vec4CubicBezierKeyframeContainer; Index: /OpenSceneGraph/trunk/include/osgAnimation/AnimationManagerBase =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/AnimationManagerBase (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/AnimationManagerBase (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -48,5 +48,5 @@ this Operation must be done each frame */ void clearTargets(); - + LinkVisitor* getOrCreateLinkVisitor(); Index: /OpenSceneGraph/trunk/include/osgAnimation/StackedTranslateElement =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/StackedTranslateElement (revision 13030) +++ /OpenSceneGraph/trunk/include/osgAnimation/StackedTranslateElement (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/Timeline =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Timeline (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/Timeline (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -64,5 +64,5 @@ virtual void addActionAt(double t, Action* action, int priority = 0); void addActionNow(Action* action, int priority = 0); - + void clearActions(); @@ -91,5 +91,5 @@ bool _initFirstFrame; TimelineStatus _state; - + bool _collectStats; osg::ref_ptr _stats; @@ -113,5 +113,5 @@ void internalRemoveAction(Action* action); void internalAddAction(int priority, const FrameAction& ftl); - + }; Index: /OpenSceneGraph/trunk/include/osgAnimation/Channel =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Channel (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/Channel (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -61,5 +61,5 @@ protected: - + std::string _targetName; std::string _name; @@ -114,5 +114,5 @@ virtual ~TemplateChannel() {} - virtual void update(double time, float weight, int priority) + virtual void update(double time, float weight, int priority) { // skip if weight == 0 Index: /OpenSceneGraph/trunk/include/osgAnimation/ActionBlendIn =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/ActionBlendIn (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/ActionBlendIn (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/StackedTransform =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/StackedTransform (revision 13030) +++ /OpenSceneGraph/trunk/include/osgAnimation/StackedTransform (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/BasicAnimationManager =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/BasicAnimationManager (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/BasicAnimationManager (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -28,7 +28,7 @@ META_Object(osgAnimation, BasicAnimationManager); - + BasicAnimationManager(); - BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); + BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); virtual ~BasicAnimationManager(); @@ -43,5 +43,5 @@ void stopAll(); - + protected: typedef std::map AnimationLayers; Index: /OpenSceneGraph/trunk/include/osgAnimation/Action =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Action (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/Action (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -46,10 +46,10 @@ META_Object(osgAnimation,Callback); - + virtual void operator()(Action* action, osgAnimation::ActionVisitor* nv) {} - - Callback* getNestedCallback() { return _nestedCallback.get(); } - void addNestedCallback(Callback* callback) - { + + Callback* getNestedCallback() { return _nestedCallback.get(); } + void addNestedCallback(Callback* callback) + { if (callback) { if (_nestedCallback.valid()) @@ -61,5 +61,5 @@ void removeCallback(Callback* cb) - { + { if (!cb) return; @@ -79,5 +79,5 @@ META_Action(osgAnimation, Action); - + Action(); Action(const Action&,const osg::CopyOp&); @@ -136,5 +136,5 @@ Stop }; - + Status _state; }; Index: /OpenSceneGraph/trunk/include/osgAnimation/LinkVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/LinkVisitor (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/LinkVisitor (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -20,5 +20,5 @@ #include -namespace osgAnimation +namespace osgAnimation { class AnimationUpdateCallbackBase; Index: /OpenSceneGraph/trunk/include/osgAnimation/StackedMatrixElement =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/StackedMatrixElement (revision 13030) +++ /OpenSceneGraph/trunk/include/osgAnimation/StackedMatrixElement (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/Animation =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Animation (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/Animation (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -48,5 +48,5 @@ * if you modify something that can change the duration * you are supposed to call computeDuration or setDuration - */ + */ ChannelList& getChannels(); const ChannelList& getChannels() const; @@ -77,5 +77,5 @@ void setPlayMode (PlayMode mode) { _playmode = mode; } PlayMode getPlayMode() const { return _playmode; } - + void setStartTime(double time) { _startTime = time;} double getStartTime() const { return _startTime;} @@ -86,5 +86,5 @@ ~Animation() {} - + double _duration; double _originalDuration; Index: /OpenSceneGraph/trunk/include/osgAnimation/Export =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Export (revision 12221) +++ /OpenSceneGraph/trunk/include/osgAnimation/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -38,6 +38,6 @@ #endif #else - #define OSGANIMATION_EXPORT -#endif + #define OSGANIMATION_EXPORT +#endif // set up define for whether member templates are supported by VisualStudio compilers. Index: /OpenSceneGraph/trunk/include/osgAnimation/StackedTransformElement =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/StackedTransformElement (revision 13030) +++ /OpenSceneGraph/trunk/include/osgAnimation/StackedTransformElement (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/CubicBezier =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/CubicBezier (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/CubicBezier (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/FrameAction =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/FrameAction (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/FrameAction (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/ActionCallback =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/ActionCallback (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/ActionCallback (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -28,5 +28,5 @@ RunAction(Action* a, int priority = 0) : _action(a), _priority(priority) {} virtual void operator()(Action* action, ActionVisitor* visitor); - + Action* getAction() const { return _action.get(); } int getPriority() const { return _priority; } @@ -34,5 +34,5 @@ osg::ref_ptr _action; int _priority; - + }; Index: /OpenSceneGraph/trunk/include/osgAnimation/StatsHandler =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/StatsHandler (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/StatsHandler (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ struct StatAction { - + std::string _name; osg::ref_ptr _group; @@ -42,7 +42,7 @@ /** Event handler for adding on screen stats reporting to Viewers.*/ - class OSGANIMATION_EXPORT StatsHandler : public osgGA::GUIEventHandler + class OSGANIMATION_EXPORT StatsHandler : public osgGA::GUIEventHandler { - public: + public: StatsHandler(); @@ -54,8 +54,8 @@ LAST = 2 }; - + void setKeyEventTogglesOnScreenStats(int key) { _keyEventTogglesOnScreenStats = key; } int getKeyEventTogglesOnScreenStats() const { return _keyEventTogglesOnScreenStats; } - + void setKeyEventPrintsOutStats(int key) { _keyEventPrintsOutStats = key; } int getKeyEventPrintsOutStats() const { return _keyEventPrintsOutStats; } @@ -84,9 +84,9 @@ osg::Geometry* createTick(const osg::Vec3& pos, float height, const osg::Vec4& colour, unsigned int numTicks); - + osg::Node* createCameraTimeStats(const std::string& font, osg::Vec3& pos, float startBlocks, bool acquireGPUStats, float characterSize, osg::Stats* viewerStats, osg::Camera* camera); void setUpScene(osgViewer::Viewer* viewer); - + int _keyEventTogglesOnScreenStats; int _keyEventPrintsOutStats; @@ -96,12 +96,12 @@ bool _initialized; osg::ref_ptr _camera; - + osg::ref_ptr _switch; osg::ref_ptr _group; - + unsigned int _frameRateChildNum; unsigned int _numBlocks; double _blockMultiplier; - + float _statsWidth; float _statsHeight; Index: /OpenSceneGraph/trunk/include/osgAnimation/ActionVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/ActionVisitor (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/ActionVisitor (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/RigGeometry =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/RigGeometry (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/RigGeometry (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -22,5 +22,5 @@ #include -namespace osgAnimation +namespace osgAnimation { @@ -38,13 +38,13 @@ const VertexInfluenceMap* getInfluenceMap() const { return _vertexInfluenceMap.get();} VertexInfluenceMap* getInfluenceMap() { return _vertexInfluenceMap.get();} - + const Skeleton* getSkeleton() const; Skeleton* getSkeleton(); // will be used by the update callback to init correctly the rig mesh void setSkeleton(Skeleton*); - + void setNeedToComputeMatrix(bool state) { _needToComputeMatrix = state;} bool getNeedToComputeMatrix() const { return _needToComputeMatrix;} - + // this build the internal database about vertex influence and bones @@ -72,5 +72,5 @@ protected: - + osg::ref_ptr _geometry; osg::ref_ptr _rigTransformImplementation; @@ -83,10 +83,10 @@ osg::observer_ptr _root; bool _needToComputeMatrix; - + struct FindNearestParentSkeleton : public osg::NodeVisitor { osg::ref_ptr _root; FindNearestParentSkeleton() : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_PARENTS) {} - void apply(osg::Transform& node) + void apply(osg::Transform& node) { if (_root.valid()) Index: /OpenSceneGraph/trunk/include/osgAnimation/StackedQuaternionElement =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/StackedQuaternionElement (revision 13030) +++ /OpenSceneGraph/trunk/include/osgAnimation/StackedQuaternionElement (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/ActionStripAnimation =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/ActionStripAnimation (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/ActionStripAnimation (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -41,5 +41,5 @@ const ActionBlendOut* getBlendOut() const; unsigned int getBlendOutStartFrame() const; - + unsigned int getLoop() const; void setLoop(unsigned int loop); Index: /OpenSceneGraph/trunk/include/osgAnimation/AnimationUpdateCallback =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/AnimationUpdateCallback (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/AnimationUpdateCallback (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -21,5 +21,5 @@ #include -namespace osgAnimation +namespace osgAnimation { Index: /OpenSceneGraph/trunk/include/osgAnimation/StackedScaleElement =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/StackedScaleElement (revision 13030) +++ /OpenSceneGraph/trunk/include/osgAnimation/StackedScaleElement (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/UpdateMaterial =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/UpdateMaterial (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/UpdateMaterial (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -28,5 +28,5 @@ protected: osg::ref_ptr _diffuse; - + public: Index: /OpenSceneGraph/trunk/include/osgAnimation/EaseMotion =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/EaseMotion (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/EaseMotion (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -24,23 +24,23 @@ namespace osgAnimation { - struct OutBounceFunction - { - inline static void getValueAt(float t, float& result) - { - if ((t) < (1/2.75)) + struct OutBounceFunction + { + inline static void getValueAt(float t, float& result) + { + if ((t) < (1/2.75)) { result = 7.5625 * t * t; - } - else if (t < (2/2.75)) + } + else if (t < (2/2.75)) { t = t - (1.5/2.75); result = 7.5625* t * t + .75; } - else if (t < (2.5/2.75)) + else if (t < (2.5/2.75)) { t = t - (2.25/2.75); result = 7.5625 * t * t + .9375; } - else + else { t = t - (2.625/2.75); @@ -50,8 +50,8 @@ }; - struct InBounceFunction - { - inline static void getValueAt(float t, float& result) - { + struct InBounceFunction + { + inline static void getValueAt(float t, float& result) + { OutBounceFunction::getValueAt(1-t, result); result = 1 - result; @@ -59,14 +59,14 @@ }; - struct InOutBounceFunction - { - inline static void getValueAt(float t, float& result) - { - if (t < 0.5) + struct InOutBounceFunction + { + inline static void getValueAt(float t, float& result) + { + if (t < 0.5) { InBounceFunction::getValueAt(t * 2, result); result *= 0.5; - } - else + } + else { OutBounceFunction::getValueAt(t * 2 - 1 , result); @@ -77,5 +77,5 @@ /// Linear function - struct LinearFunction + struct LinearFunction { inline static void getValueAt(float t, float& result) { result = t;} @@ -83,22 +83,22 @@ /// Quad function - struct OutQuadFunction + struct OutQuadFunction { inline static void getValueAt(float t, float& result) { result = - (t * (t -2.0));} }; - struct InQuadFunction + struct InQuadFunction { inline static void getValueAt(float t, float& result) { result = t*t;} }; - struct InOutQuadFunction - { - inline static void getValueAt(float t, float& result) + struct InOutQuadFunction + { + inline static void getValueAt(float t, float& result) { t *= 2.0; - if (t < 1.0) + if (t < 1.0) result = 0.5 * t * t; - else + else { t -= 1.0; @@ -109,18 +109,18 @@ /// Cubic function - struct OutCubicFunction + struct OutCubicFunction { inline static void getValueAt(float t, float& result) { t = t-1.0; result = t*t*t + 1;} }; - struct InCubicFunction + struct InCubicFunction { inline static void getValueAt(float t, float& result) { result = t*t*t;} }; - struct InOutCubicFunction - { - inline static void getValueAt(float t, float& result) - { + struct InOutCubicFunction + { + inline static void getValueAt(float t, float& result) + { t *= 2.0f; if (t < 1.0f) @@ -132,7 +132,7 @@ } }; - + /// Quart function - struct InQuartFunction + struct InQuartFunction { inline static void getValueAt(float t, float& result) { result = t*t*t*t*t;} @@ -146,5 +146,5 @@ struct InOutQuartFunction { - inline static void getValueAt(float t, float& result) + inline static void getValueAt(float t, float& result) { t = t * 2.0; @@ -160,7 +160,7 @@ /// Elastic function - struct OutElasticFunction - { - inline static void getValueAt(float t, float& result) + struct OutElasticFunction + { + inline static void getValueAt(float t, float& result) { result = pow(2.0f, -10.0f * t) * sinf((t - 0.3f / 4.0f) * (2.0f * osg::PI) / 0.3f) + 1.0f; @@ -168,7 +168,7 @@ }; - struct InElasticFunction - { - inline static void getValueAt(float t, float& result) + struct InElasticFunction + { + inline static void getValueAt(float t, float& result) { OutElasticFunction::getValueAt(1.0f - t, result); @@ -177,7 +177,7 @@ }; - struct InOutElasticFunction - { - inline static void getValueAt(float t, float& result) + struct InOutElasticFunction + { + inline static void getValueAt(float t, float& result) { t *= 2.0f; @@ -244,5 +244,5 @@ float s = 1.70158 * 1.525f; t *= 2.0f; - if (t < 1.0f) + if (t < 1.0f) { result = 0.5f * (t * t * ((s + 1.0f) * t - s)); @@ -318,5 +318,5 @@ { result = powf(2.0f, 10.0f * (t - 1.0f)); - } + } } }; @@ -349,5 +349,5 @@ public: typedef float value_type; - enum TimeBehaviour + enum TimeBehaviour { CLAMP, @@ -360,5 +360,5 @@ float evaluateTime(float time) const { - switch (_behaviour) + switch (_behaviour) { case CLAMP: @@ -382,5 +382,5 @@ _time = evaluateTime(_time + dt); } - + void setTime(float time) { _time = evaluateTime(time);} void getValue(value_type& result) const { getValueAt(_time, result); } @@ -398,5 +398,5 @@ } value_type getValueAt(float time) const - { + { value_type result; getValueAt(evaluateTime(time), result); @@ -407,5 +407,5 @@ float getDuration() const { return _duration;} - protected: + protected: float _time; float _startValue; @@ -432,6 +432,6 @@ const T& getSampler() const { return _sampler;} virtual void getValueInNormalizedRange(float t, value_type& result) const - { - if (!_sampler.getKeyframeContainer()) + { + if (!_sampler.getKeyframeContainer()) { result = 0; @@ -448,10 +448,10 @@ typedef std::vector > MotionList; MotionList _motions; - + MotionList& getMotionList() { return _motions; } const MotionList& getMotionList() const { return _motions; } CompositeMotion(float startValue = 0, float duration = 1, float changeValue = 1, TimeBehaviour tb = CLAMP) : Motion(startValue, duration, changeValue, tb) {} - virtual void getValueInNormalizedRange(float t, value_type& result) const + virtual void getValueInNormalizedRange(float t, value_type& result) const { if (_motions.empty()) @@ -521,5 +521,5 @@ typedef MathMotionTemplate InCircMotion; typedef MathMotionTemplate InOutCircMotion; - + // expo typedef MathMotionTemplate OutExpoMotion; Index: /OpenSceneGraph/trunk/include/osgAnimation/UpdateMatrixTransform =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/UpdateMatrixTransform (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/UpdateMatrixTransform (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/VertexInfluence =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/VertexInfluence (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/VertexInfluence (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2008 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -55,6 +55,6 @@ public: typedef std::vector BoneToVertexList; - - class BoneWeight + + class BoneWeight { public: @@ -71,5 +71,5 @@ typedef std::vector BoneWeightList; typedef std::map VertexIndexToBoneWeightMap; - + class UniqVertexSetToBoneSet { Index: /OpenSceneGraph/trunk/include/osgAnimation/Vec3Packed =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/Vec3Packed (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/Vec3Packed (revision 13041) @@ -1,3 +1,3 @@ -/* -*-c++-*- +/* -*-c++-*- */ //****************************************************************************// @@ -35,5 +35,5 @@ #include -namespace osgAnimation +namespace osgAnimation { @@ -46,5 +46,5 @@ Vec3Packed(): m32bits(0) {} - void uncompress(const osg::Vec3& scale, const osg::Vec3& min, osg::Vec3& result) const + void uncompress(const osg::Vec3& scale, const osg::Vec3& min, osg::Vec3& result) const { uint32_t pt[3]; @@ -56,6 +56,6 @@ result[2] = scale[2] * pt[2] + min[2]; } - - void compress(const osg::Vec3f& src, const osg::Vec3f& min, const osg::Vec3f& scaleInv) + + void compress(const osg::Vec3f& src, const osg::Vec3f& min, const osg::Vec3f& scaleInv) { uint32_t srci[3]; @@ -74,5 +74,5 @@ osg::Vec3 mScaleInv; - void analyze(const std::vector& src) + void analyze(const std::vector& src) { //analyze the keys @@ -80,8 +80,8 @@ osg::Vec3 maxp(-FLT_MAX, -FLT_MAX, -FLT_MAX); int nb = (int)src.size(); - for(int i = 0; i < nb; i++) + for(int i = 0; i < nb; i++) { const osg::Vec3 &pos = src[i]; - for(int j = 0; j < 3; j++) + for(int j = 0; j < 3; j++) { maxp[j] = osg::maximum(pos[j],maxp[j]); @@ -106,5 +106,5 @@ } - void compress(const std::vector& src) + void compress(const std::vector& src) { mVecCompressed.resize(src.size()); Index: /OpenSceneGraph/trunk/include/osgAnimation/ActionBlendOut =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/ActionBlendOut (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/ActionBlendOut (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/RigTransform =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/RigTransform (revision 12399) +++ /OpenSceneGraph/trunk/include/osgAnimation/RigTransform (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/ActionAnimation =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/ActionAnimation (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/ActionAnimation (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgAnimation/StatsVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgAnimation/StatsVisitor (revision 12139) +++ /OpenSceneGraph/trunk/include/osgAnimation/StatsVisitor (revision 13041) @@ -1,13 +1,13 @@ -/* -*-c++-*- +/* -*-c++-*- * Copyright (C) 2009 Cedric Pinson * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgWidget/Export =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Export (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -41,5 +41,5 @@ #else # define OSGWIDGET_EXPORT -#endif +#endif /** Index: /OpenSceneGraph/trunk/include/osgWidget/Lua =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Lua (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Lua (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgWidget/Python =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Python (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Python (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgWidget/StyleInterface =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/StyleInterface (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/StyleInterface (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgWidget/Widget =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Widget (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Widget (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -70,5 +70,5 @@ CM_ABSOLUTE, CM_RELATIVE - }; + }; @@ -455,5 +455,5 @@ friend class Window; - // TODO: Because of the current class design, I don't think it's possible to + // TODO: Because of the current class design, I don't think it's possible to // have a ref_ptr here. :( Window* _parent; @@ -534,5 +534,5 @@ } - bool mouseEnter(double, double, const WindowManager*) { + bool mouseEnter(double, double, const WindowManager*) { osg::notify(osg::NOTICE) << _name << " > mouseEnter called" << std::endl; @@ -610,5 +610,5 @@ } - bool mouseEnter(double, double, const WindowManager*) { + bool mouseEnter(double, double, const WindowManager*) { return true; } Index: /OpenSceneGraph/trunk/include/osgWidget/Browser =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Browser (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Browser (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -25,7 +25,7 @@ { public: - + static osg::ref_ptr& instance(); - + virtual void init(const std::string& application); @@ -34,5 +34,5 @@ virtual BrowserImage* createBrowserImage(const std::string& url, int width, int height); - + protected: @@ -40,7 +40,7 @@ BrowserManager(const BrowserManager& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): osg::Object(rhs,copyop) {} - + virtual ~BrowserManager(); - + META_Object(osgWidget,BrowserManager); @@ -54,13 +54,13 @@ { public: - + BrowserImage() {} - + virtual void navigateTo(const std::string& url) = 0; protected: - + virtual ~BrowserImage() {} - + }; @@ -70,9 +70,9 @@ { public: - + Browser() {} Browser(const std::string& url, const GeometryHints& hints = GeometryHints()); - + bool assign(BrowserImage* browserImage, const GeometryHints& hints = GeometryHints()); @@ -82,5 +82,5 @@ protected: - + osg::ref_ptr _browserImage; }; Index: /OpenSceneGraph/trunk/include/osgWidget/ViewerEventHandlers =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/ViewerEventHandlers (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/ViewerEventHandlers (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -61,5 +61,5 @@ // This handles the forwarding of keypress events. -class OSGWIDGET_EXPORT KeyboardHandler: public osgGA::GUIEventHandler +class OSGWIDGET_EXPORT KeyboardHandler: public osgGA::GUIEventHandler { public: @@ -94,5 +94,5 @@ protected: - + osg::observer_ptr _wm; osg::observer_ptr _camera; @@ -115,5 +115,5 @@ protected: - + osg::observer_ptr _wm; osg::observer_ptr _camera; Index: /OpenSceneGraph/trunk/include/osgWidget/VncClient =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/VncClient (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/VncClient (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -25,7 +25,7 @@ { public: - + VncImage() {} - + virtual bool connect(const std::string& hostname) = 0; @@ -33,7 +33,7 @@ protected: - + virtual ~VncImage() {} - + }; @@ -43,11 +43,11 @@ { public: - + VncClient() {} VncClient(const std::string& hostname, const GeometryHints& hints = GeometryHints()); - + bool assign(VncImage* vncImage, const GeometryHints& hints = GeometryHints()); - + bool connect(const std::string& hostname, const GeometryHints& hints = GeometryHints()); @@ -55,5 +55,5 @@ protected: - + osg::ref_ptr _vncImage; }; Index: /OpenSceneGraph/trunk/include/osgWidget/Table =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Table (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Table (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -57,5 +57,5 @@ protected: - + unsigned int _rows; unsigned int _cols; Index: /OpenSceneGraph/trunk/include/osgWidget/Box =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Box (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Box (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -24,5 +24,5 @@ //! non-uniformly) position it's children either vertically or horizontally. It //! is the most basic Window implementation, though there is some difficulty when -//! positioning children such that each child object ends up pixel-aligned. +//! positioning children such that each child object ends up pixel-aligned. class OSGWIDGET_EXPORT Box: public Window { @@ -36,5 +36,5 @@ META_Object(osgWidget, Box); - + //! The main constructor; takes the string name, the BoxType orientation, and a //! boolean indicating whether or not all of the Box regions should be uniformly Index: /OpenSceneGraph/trunk/include/osgWidget/Frame =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Frame (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Frame (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -59,5 +59,5 @@ { public: - + enum CornerType { @@ -113,5 +113,5 @@ _name = cornerTypeToString(corner); } - + protected: @@ -146,7 +146,7 @@ _name = borderTypeToString(border); } - + protected: - + BorderType _border; }; @@ -243,5 +243,5 @@ protected: - + Widget* _getCorner (CornerType) const; Widget* _getBorder (BorderType) const; Index: /OpenSceneGraph/trunk/include/osgWidget/ScriptEngine =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/ScriptEngine (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/ScriptEngine (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgWidget/StyleManager =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/StyleManager (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/StyleManager (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -118,7 +118,7 @@ bool inc = false; - while(!r.eof()) - { - if(_styles[style]->applyStyle(t, r)) + while(!r.eof()) + { + if(_styles[style]->applyStyle(t, r)) inc = true; else @@ -174,5 +174,5 @@ if(!obj) { - warn() + warn() << "Cannot coerce object into osg::Object in StyleManager:::applyStyle" << std::endl Index: /OpenSceneGraph/trunk/include/osgWidget/PdfReader =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/PdfReader (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/PdfReader (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -44,5 +44,5 @@ GeometryHints(const osg::Vec3& pos, const osg::Vec3& wVec, - const osg::Vec3& hVec, + const osg::Vec3& hVec, const osg::Vec4& bColor, AspectRatioPolicy asp=RESIZE_HEIGHT_TO_MAINTAINCE_ASPECT_RATIO, @@ -74,5 +74,5 @@ { public: - + PdfImage(): _backgroundColor(1.0f,1.0f,1.0f,1.0f), @@ -96,5 +96,5 @@ bool next() - { + { return page(_pageNum+1); } Index: /OpenSceneGraph/trunk/include/osgWidget/EventInterface =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/EventInterface (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/EventInterface (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgWidget/WindowManager =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/WindowManager (revision 12366) +++ /OpenSceneGraph/trunk/include/osgWidget/WindowManager (revision 13041) @@ -280,5 +280,5 @@ bool keyDown (int, int); bool keyUp (int, int); - + osgViewer::View* getView() { return _view; } const osgViewer::View* getView() const { return _view; } Index: /OpenSceneGraph/trunk/include/osgWidget/Types =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Types (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Types (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgWidget/Window =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Window (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Window (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -97,5 +97,5 @@ // you will need to set the VisibilityMode to WM_PARTIAL. Otherwise, the entire // Window is visible by default. The final enum, VM_ENTIRE, says that no Scissoring - // should take place at all, and is useful in cases where you want to properly + // should take place at all, and is useful in cases where you want to properly // scale or rotate Windows. enum VisibilityMode { @@ -212,5 +212,5 @@ } - Window* getParent() { + Window* getParent() { return _parent; } @@ -417,5 +417,5 @@ typedef point_type (Widget::*Getter)() const; - + protected: @@ -494,5 +494,5 @@ // explode! But let me say a few things: in MSVC you can't add to an iterator // such that the add will cause it to increment past the end of the container. - // This appears to be safe in GCC, where it will just return the last + // This appears to be safe in GCC, where it will just return the last // item therein, but causes an assertion error in other compilers. I'm not // sure if there is a cleaner remedy for this, so what we do for now is keep a Index: /OpenSceneGraph/trunk/include/osgWidget/Canvas =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Canvas (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Canvas (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgWidget/Util =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/Util (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/Util (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -35,5 +35,5 @@ { std::ostream& n = osg::notify(ns); - + return n << "osgWidget: "; } Index: /OpenSceneGraph/trunk/include/osgWidget/UIObjectParent =================================================================== --- /OpenSceneGraph/trunk/include/osgWidget/UIObjectParent (revision 12292) +++ /OpenSceneGraph/trunk/include/osgWidget/UIObjectParent (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgQt/Export =================================================================== --- /OpenSceneGraph/trunk/include/osgQt/Export (revision 12221) +++ /OpenSceneGraph/trunk/include/osgQt/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -39,5 +39,5 @@ #else #define OSGQT_EXPORT -#endif +#endif #endif Index: /OpenSceneGraph/trunk/include/osgQt/QWidgetImage =================================================================== --- /OpenSceneGraph/trunk/include/osgQt/QWidgetImage (revision 12139) +++ /OpenSceneGraph/trunk/include/osgQt/QWidgetImage (revision 13041) @@ -35,5 +35,5 @@ void render(); - /// Overridden scaleImage used to catch cases where the image is + /// Overridden scaleImage used to catch cases where the image is /// fullscreen and the window is resized. virtual void scaleImage(int s,int t,int r, GLenum newDataType); Index: /OpenSceneGraph/trunk/include/osgQt/GraphicsWindowQt =================================================================== --- /OpenSceneGraph/trunk/include/osgQt/GraphicsWindowQt (revision 12958) +++ /OpenSceneGraph/trunk/include/osgQt/GraphicsWindowQt (revision 13041) @@ -98,8 +98,8 @@ _deferredEventQueue.enqueue(eventType); _eventCompressor.insert(eventType); - } + } } void processDeferredEvents(); - + friend class GraphicsWindowQt; GraphicsWindowQt* _gw; @@ -131,5 +131,5 @@ /// deprecated inline const GLWidget* getGraphWidget() const { return _widget; } - + struct WindowData : public osg::Referenced { @@ -165,5 +165,5 @@ virtual void swapBuffersImplementation(); virtual void runOperations(); - + virtual void requestWarpPointer( float x, float y ); Index: /OpenSceneGraph/trunk/include/osgQt/QFontImplementation =================================================================== --- /OpenSceneGraph/trunk/include/osgQt/QFontImplementation (revision 12407) +++ /OpenSceneGraph/trunk/include/osgQt/QFontImplementation (revision 13041) @@ -1,12 +1,12 @@ /* -*-c++-*- OpenSceneGraph - Copyright (C) 2009-2010 Mathias Froehlich * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,11 +32,11 @@ virtual bool supportsMultipleFontResolutions() const { return true; } - + virtual osgText::Glyph* getGlyph(const osgText::FontResolution& fontRes, unsigned int charcode); - + virtual osgText::Glyph3D* getGlyph3D(unsigned int charcode) { return 0; } - + virtual osg::Vec2 getKerning(unsigned int leftcharcode, unsigned int rightcharcode, osgText::KerningType kerningType); - + virtual bool hasVertical() const; Index: /OpenSceneGraph/trunk/include/osgText/KerningType =================================================================== --- /OpenSceneGraph/trunk/include/osgText/KerningType (revision 12139) +++ /OpenSceneGraph/trunk/include/osgText/KerningType (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgText/TextBase =================================================================== --- /OpenSceneGraph/trunk/include/osgText/TextBase (revision 12139) +++ /OpenSceneGraph/trunk/include/osgText/TextBase (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -67,5 +67,5 @@ /** Set the Font reference width and height resolution in texels. - * Note, the size may not be supported by current font, + * Note, the size may not be supported by current font, * the closest supported font size will be selected.*/ void setFontResolution(unsigned int width, unsigned int height); @@ -73,10 +73,10 @@ unsigned int getFontWidth() const { return _fontSize.first; } unsigned int getFontHeight() const { return _fontSize.second; } - - + + /** Set the text using a osgText::String.*/ void setText(const String& text); - /** Set the text using a std::string, + /** Set the text using a std::string, * which is converted to an internal TextString.*/ void setText(const std::string& text); @@ -86,9 +86,9 @@ void setText(const std::string& text,String::Encoding encoding); - /** Set the text using a wchar_t string, + /** Set the text using a wchar_t string, * which is converted to an internal TextString.*/ void setText(const wchar_t* text); - - /** Get the text string. + + /** Get the text string. * Note, if you modify the string you must call Text::update() for * the internal glyph reprentation to be updated.*/ @@ -97,6 +97,6 @@ /** Get the const text string.*/ const String& getText() const { return _text; } - - /** update internal glyph respresentation used for rendering, + + /** update internal glyph respresentation used for rendering, * and bounding volume.*/ void update() { computeGlyphRepresentation(); } @@ -121,5 +121,5 @@ /** Set how the CharacterSize value relates to the final rendered character.*/ void setCharacterSizeMode(CharacterSizeMode mode) { _characterSizeMode = mode; } - + /** Get the CharacterSizeMode.*/ CharacterSizeMode getCharacterSizeMode() const { return _characterSizeMode; } @@ -128,8 +128,8 @@ /** Set the maximum width of the text box. * With horizontal layouts any characters which do not fit are wrapped around. - * 0 or negative values indicate that no maximum width is set, lines can be as long as + * 0 or negative values indicate that no maximum width is set, lines can be as long as * they need be to fit thre required text*/ void setMaximumWidth(float maximumWidth); - + /** Get the maximim width of the text box.*/ float getMaximumWidth() const { return _maximumWidth; } @@ -137,14 +137,14 @@ /** Set the maximum height of the text box. * With horizontal layouts any characters which do not fit are wrapped around. - * 0 or negative values indicate that no maximum height is set, lines can be as long as + * 0 or negative values indicate that no maximum height is set, lines can be as long as * they need be to fit the required text*/ void setMaximumHeight(float maximumHeight); - + /** Get the maximum height of the text box.*/ float getMaximumHeight() const { return _maximumHeight; } /** Set the line spacing of the text box, given as a percentage of - * the character height. The default value is 0 for backward - * compatibility. For longer paragraphs of text, a value of at + * the character height. The default value is 0 for backward + * compatibility. For longer paragraphs of text, a value of at * least 25% (i.e. set line spacing to 0.25) is recommended. */ void setLineSpacing(float lineSpacing); @@ -157,8 +157,8 @@ /** Set the position of text.*/ void setPosition(const osg::Vec3& pos); - + /** Get the position of text.*/ const osg::Vec3& getPosition() const { return _position; } - + enum AlignmentType @@ -175,17 +175,17 @@ RIGHT_CENTER, RIGHT_BOTTOM, - + LEFT_BASE_LINE, CENTER_BASE_LINE, RIGHT_BASE_LINE, - + LEFT_BOTTOM_BASE_LINE, CENTER_BOTTOM_BASE_LINE, RIGHT_BOTTOM_BASE_LINE, - + BASE_LINE = LEFT_BASE_LINE /// default. - - }; - + + }; + void setAlignment(AlignmentType alignment); AlignmentType getAlignment() const { return _alignment; } @@ -206,5 +206,5 @@ void setAxisAlignment(AxisAlignment axis); AxisAlignment getAxisAlignment() const { return _axisAlignment; } - + void setRotation(const osg::Quat& quat); const osg::Quat& getRotation() const { return _rotation; } @@ -219,7 +219,7 @@ VERTICAL }; - + void setLayout(Layout layout); - + Layout getLayout() const { return _layout; } @@ -234,16 +234,16 @@ void setDrawMode(unsigned int mode); - + unsigned int getDrawMode() const { return _drawMode; } void setBoundingBoxMargin(float margin); - + float getBoundingBoxMargin() const { return _textBBMargin; } void setBoundingBoxColor(const osg::Vec4& color){ _textBBColor = color; } - + const osg::Vec4& getBoundingBoxColor() const { return _textBBColor; } - + void setKerningType(KerningType kerningType) { _kerningType = kerningType; } @@ -264,5 +264,5 @@ virtual void releaseGLObjects(osg::State* state=0) const; - + virtual osg::BoundingBox computeBound() const; @@ -278,6 +278,6 @@ virtual void computePositions(unsigned int contextID) const = 0; virtual void computeGlyphRepresentation() = 0; - - + + // members which have public access. osg::Vec4 _color; @@ -304,15 +304,15 @@ unsigned int _lineCount; - + // internal caches of the positioning of the text. - + struct AutoTransformCache - { + { AutoTransformCache(): _traversalNumber(-1), _width(0), _height(0) {} - + int _traversalNumber; int _width; @@ -323,5 +323,5 @@ osg::Matrix _matrix; }; - + mutable osg::buffered_object _autoTransformCache; mutable osg::Vec3 _offset; @@ -334,3 +334,3 @@ #endif - + Index: /OpenSceneGraph/trunk/include/osgText/Export =================================================================== --- /OpenSceneGraph/trunk/include/osgText/Export (revision 12221) +++ /OpenSceneGraph/trunk/include/osgText/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -38,5 +38,5 @@ #else # define OSGTEXT_EXPORT -#endif +#endif /** Index: /OpenSceneGraph/trunk/include/osgText/Glyph =================================================================== --- /OpenSceneGraph/trunk/include/osgText/Glyph (revision 12407) +++ /OpenSceneGraph/trunk/include/osgText/Glyph (revision 13041) @@ -1,12 +1,12 @@ /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2010 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -266,5 +266,5 @@ /** create an image that maps all the associated Glyph's onto a single image, that is equivilant to what will be downloaded to the texture.*/ osg::Image* createImage(); - + protected: Index: /OpenSceneGraph/trunk/include/osgText/FadeText =================================================================== --- /OpenSceneGraph/trunk/include/osgText/FadeText (revision 5658) +++ /OpenSceneGraph/trunk/include/osgText/FadeText (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -44,15 +44,15 @@ void init(); - + struct FadeTextUpdateCallback; friend struct FadeTextUpdateCallback; typedef std::map ViewBlendColourMap; - + ViewBlendColourMap& getViewBlendColourMap() { return _viewBlendColourMap; } const ViewBlendColourMap& getViewBlendColourMap() const { return _viewBlendColourMap; } float _fadeSpeed; - + mutable ViewBlendColourMap _viewBlendColourMap; }; Index: /OpenSceneGraph/trunk/include/osgText/Text =================================================================== --- /OpenSceneGraph/trunk/include/osgText/Text (revision 12068) +++ /OpenSceneGraph/trunk/include/osgText/Text (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -74,7 +74,7 @@ enum BackdropImplementation { - /* POLYGON_OFFSET: - * This uses glPolygonOffset to draw the text multiple times to - * create the drop-shadow and outline effects. glPolygonOffset + /* POLYGON_OFFSET: + * This uses glPolygonOffset to draw the text multiple times to + * create the drop-shadow and outline effects. glPolygonOffset * is used to prevent z-fighting of the overlapping text. * This probably should have been the best option, but all the ATI @@ -83,9 +83,9 @@ * which move around depending on the viewing angle. For moving text, * the moving holes give an extremely unpleasant flickering effect. - * Pumping up the "units" parameter in glPolygonOffset can minimize + * Pumping up the "units" parameter in glPolygonOffset can minimize * this problem, but two other bad side-effects occur if you do this. * First, high values will cause problems with clipping, particularly * when there are objects behind the text. The drop-shadows or outline - * may be culled because their computed offset is behind the object or + * may be culled because their computed offset is behind the object or * z-far plane. Second, there is an additional problem associated with * the Z-slope. High values can make large chunks of the backdrop @@ -96,22 +96,22 @@ * for the large-section clipping. * Experimentally, we have found units values from 150-512 to be tolerable - * to acceptable with respect to the 'holes'. A factor of .1 seems to + * to acceptable with respect to the 'holes'. A factor of .1 seems to * bring down the large clipping problem without creating a new z-fighting * problem. - * (You can experiment with these numbers by playing with the + * (You can experiment with these numbers by playing with the * osg:PolygonOffset multipliers which this backend tries to respect.) * - * If ATI ever fixes their cards/drivers, then this might become the + * If ATI ever fixes their cards/drivers, then this might become the * best option.*/ POLYGON_OFFSET = 0, - + /* NO_DEPTH_BUFFER * Instead of using glPolygonOffset to prevent z-fighting, this mode * just disables the depth buffer when rendering the text. This allows - * the text to be rendered without any z-fighting. The downside to this - * mode is that render order begins to matter and the text will not - * necessarily correctly appear above or behind other objects in the + * the text to be rendered without any z-fighting. The downside to this + * mode is that render order begins to matter and the text will not + * necessarily correctly appear above or behind other objects in the * scene based on depth values. - * This mode is best for text that only needs to be ontop and + * This mode is best for text that only needs to be ontop and * not obscured by any objects.*/ NO_DEPTH_BUFFER, @@ -121,9 +121,9 @@ * This uses glDepthRange as a substitute for glPolygonOffset. * Strangely, experiments on ATI cards seem to produce cleaner results - * than when using glPolygonOffset. The trade-off for this is that the + * than when using glPolygonOffset. The trade-off for this is that the * backdrop still may be placed too far back and might be culled by objects * directly behind the object or by the far z-plane. If ATI ever fixes - * the glPolygonOffset problem, polygon offset is probably a slightly - * better solution because you can use smaller offsets. But with the + * the glPolygonOffset problem, polygon offset is probably a slightly + * better solution because you can use smaller offsets. But with the * current ATI problem, this option may be preferable.*/ DEPTH_RANGE, @@ -131,14 +131,14 @@ * (Assuming the backend is written correctly,) the Stencil Buffer is * the most "correct" and reliable way of producing backdrop text. - * The stencil buffer is a multipass system that allows writing to the + * The stencil buffer is a multipass system that allows writing to the * same z-values without needing to resort to offsets. This implementation * should not have any of the problems associated with the 3 previous - * implementations. But the trade-off for this mode is that without - * hardware acceleration for the stencil buffer, rendering will be - * extremely slow. (There is also potentially more overhead for this - * algorithm so it could be slower than the other implementations. + * implementations. But the trade-off for this mode is that without + * hardware acceleration for the stencil buffer, rendering will be + * extremely slow. (There is also potentially more overhead for this + * algorithm so it could be slower than the other implementations. * Benchmarking would be required to determine if the speed differences - * are significant on your particular hardware.) This mode is best for - * when quality is important and stencil buffer hardware acceleration + * are significant on your particular hardware.) This mode is best for + * when quality is important and stencil buffer hardware acceleration * is available.*/ STENCIL_BUFFER, @@ -156,15 +156,15 @@ /** - * BackdropType gives you a background shadow text behind your regular - * text. This helps give text extra contrast which can be useful when - * placing text against noisy backgrounds. + * BackdropType gives you a background shadow text behind your regular + * text. This helps give text extra contrast which can be useful when + * placing text against noisy backgrounds. * The color of the background shadow text is specified by setBackdropColor(). - * DROP_SHADOW_BOTTOM_RIGHT will draw backdrop text to the right and down of + * DROP_SHADOW_BOTTOM_RIGHT will draw backdrop text to the right and down of * the normal text. Other DROW_SHADOW_* modes do the same for their repective directions. * OUTLINE will draw backdrop text so that it appears the text has an outline * or border around the normal text. This mode is particularly useful against - * really noisy backgrounds that may put text on top of things that have - * all types of colors which you don't have control over. - * Some real world examples of this general technique in use that I know of + * really noisy backgrounds that may put text on top of things that have + * all types of colors which you don't have control over. + * Some real world examples of this general technique in use that I know of * are Google Earth, Sid Meier's Pirates (2004 Remake), and Star Control 2 (PC 1993). * The default is NONE. @@ -174,6 +174,6 @@ BackdropType getBackdropType() const { return _backdropType; } - /** - * Sets the amount text is offset to create the backdrop/shadow effect. + /** + * Sets the amount text is offset to create the backdrop/shadow effect. * Set the value too high and for example, in OUTLINE mode you will get a "Brady Bunch" * effect where you see duplicates of the text in a 3x3 grid. @@ -186,5 +186,5 @@ * Note that the text bounding boxes are updated to include backdrop offsets. * However, other metric information such as getCharacterHeight() are unaffected - * by this. This means that individual glyph spacing (kerning?) are unchanged + * by this. This means that individual glyph spacing (kerning?) are unchanged * even when this mode is used. * The default is 0.07 (7% offset). @@ -214,5 +214,5 @@ * so this function is provided to let you 'pick your poison'. Each * implementation has trade-offs. See BackdropImplementation enum - * docs for details.*/ + * docs for details.*/ void setBackdropImplementation(BackdropImplementation implementation); @@ -230,5 +230,5 @@ /** * This sets different types of text coloring modes. - * When the coloring mode is not set to SOLID, the + * When the coloring mode is not set to SOLID, the * colors specified in setColorGradientCorners() determine * the colors for the text. @@ -237,8 +237,8 @@ * were a single polygon and you had applied colors to each of the four * corners with GL_SMOOTH enabled. In this mode, OpenGL interpolates - * the colors across the polygon, and this is what OVERALL tries to - * emulate. This can be used to give nice embellishments on things + * the colors across the polygon, and this is what OVERALL tries to + * emulate. This can be used to give nice embellishments on things * like logos and names. - * PER_CHARACTER is similar to OVERALL except that it applies the + * PER_CHARACTER is similar to OVERALL except that it applies the * color interpolation to the four corners of each character instead * of across the overall text box. @@ -251,5 +251,5 @@ /** * Used only for gradient mode, let's you specify the colors of the 4 corners. - * If ColorGradients are off, these values are ignored (and the value from setColor() + * If ColorGradients are off, these values are ignored (and the value from setColor() * is the only one that is relevant. */ @@ -262,5 +262,5 @@ - + /** Draw the text.*/ virtual void drawImplementation(osg::RenderInfo& renderInfo) const; @@ -341,5 +341,5 @@ } - const TextureGlyphQuadMap& getTextureGlyphQuadMap() const + const TextureGlyphQuadMap& getTextureGlyphQuadMap() const { return _textureGlyphQuadMap; @@ -355,18 +355,18 @@ String::iterator computeLastCharacterOnLine(osg::Vec2& cursor, String::iterator first,String::iterator last); - + // members which have public access. // iternal map used for rendering. Set up by the computeGlyphRepresentation() method. mutable TextureGlyphQuadMap _textureGlyphQuadMap; - + void computeGlyphRepresentation(); // internal caches of the positioning of the text. - + bool computeAverageGlyphWidthAndHeight(float& avg_width, float& avg_height) const; - + virtual void computePositions(unsigned int contextID) const; - + void computeBackdropPositions(unsigned int contextID) const; void computeBackdropBoundingBox() const; @@ -386,5 +386,5 @@ void renderWithStencilBuffer(osg::State& state, const osg::Vec4& colorMultiplier) const; void renderWithDelayedDepthWrites(osg::State& state, const osg::Vec4& colorMultiplier) const; - + bool _enableDepthWrites; Index: /OpenSceneGraph/trunk/include/osgText/Version =================================================================== --- /OpenSceneGraph/trunk/include/osgText/Version (revision 7365) +++ /OpenSceneGraph/trunk/include/osgText/Version (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgText/Font =================================================================== --- /OpenSceneGraph/trunk/include/osgText/Font (revision 12825) +++ /OpenSceneGraph/trunk/include/osgText/Font (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -30,5 +30,5 @@ /** Read a font from specified file. The filename may contain a path. - * It will search for the font file in the following places in this order: + * It will search for the font file in the following places in this order: * - In the current directory * - All paths defined in OSG_FILE_PATH or OSGFILEPATH environment variable @@ -44,5 +44,5 @@ * - Other OS: In /usr/share/fonts/ttf/western * - Other OS: In /usr/share/fonts/ttf/decoratives - * + * * If the given file could not be found, the path part will be stripped and * the file will be searched again in the OS specific directories. @@ -91,5 +91,5 @@ const osg::StateSet* getStateSet() const { return _stateset.get(); } - + /** Get a kerning (adjustment of spacing of two adjacent character) for specified charcodes, w.r.t the current font size hint.*/ virtual osg::Vec2 getKerning(unsigned int leftcharcode,unsigned int rightcharcode, KerningType kerningType); @@ -111,5 +111,5 @@ /** Set the margin around each glyph, * to ensure that texture filtering doesn't bleed adjacent glyph's into each other. - * Default margin is 1 texels.*/ + * Default margin is 1 texels.*/ void setGlyphImageMargin(unsigned int margin); unsigned int getGlyphImageMargin() const; @@ -117,5 +117,5 @@ /** Set the margin ratio around each glyph, relative to the glyph's size. * to ensure that texture filtering doesn't bleed adjacent glyph's into each other. - * Default margin is 0.05.*/ + * Default margin is 0.05.*/ void setGlyphImageMarginRatio(float margin); float getGlyphImageMarginRatio() const; @@ -125,5 +125,5 @@ * Note, this doesn't affect already created Texture Glhph's.*/ void setTextureSizeHint(unsigned int width,unsigned int height); - + unsigned int getTextureWidthHint() const; unsigned int getTextureHeightHint() const; @@ -133,5 +133,5 @@ void setMinFilterHint(osg::Texture::FilterMode mode); osg::Texture::FilterMode getMinFilterHint() const; - + /** Set the magnification texture filter to use when creating the texture to store the glyph images when rendering. * Note, this doesn't affect already created Texture Glhph's.*/ @@ -165,8 +165,8 @@ typedef OpenThreads::Mutex FontMutex; - + typedef std::vector< osg::ref_ptr > GlyphTextureList; GlyphTextureList& getGlyphTextureList() { return _glyphTextureList; } - + protected: @@ -197,5 +197,5 @@ unsigned int _textureWidthHint; - unsigned int _textureHeightHint; + unsigned int _textureHeightHint; osg::Texture::FilterMode _minFilterHint; osg::Texture::FilterMode _magFilterHint; @@ -204,8 +204,8 @@ unsigned int _numCurveSamples; - + osg::ref_ptr _implementation; - + // declare the nested classes. public: @@ -214,9 +214,9 @@ { public: - + FontImplementation(): osg::Referenced(true), _facade(0) {} - + virtual std::string getFileName() const = 0; Index: /OpenSceneGraph/trunk/include/osgText/String =================================================================== --- /OpenSceneGraph/trunk/include/osgText/String (revision 7648) +++ /OpenSceneGraph/trunk/include/osgText/String (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -75,5 +75,5 @@ void set(const std::string& str); - /** Set the text using a wchar_t string, + /** Set the text using a wchar_t string, * which is converted to an internal TextString.*/ void set(const wchar_t* text); Index: /OpenSceneGraph/trunk/include/osgDB/Archive =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/Archive (revision 12638) +++ /OpenSceneGraph/trunk/include/osgDB/Archive (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -30,5 +30,5 @@ public: Archive(); - virtual ~Archive(); + virtual ~Archive(); virtual const char* libraryName() const { return "osgDB"; } Index: /OpenSceneGraph/trunk/include/osgDB/DatabasePager =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/DatabasePager (revision 12990) +++ /OpenSceneGraph/trunk/include/osgDB/DatabasePager (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -45,5 +45,5 @@ -/** Database paging class which manages the loading of files in a background thread, +/** Database paging class which manages the loading of files in a background thread, * and synchronizing of loaded models with the main scene graph.*/ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandler @@ -64,9 +64,9 @@ /** get the prototype singleton used by DatabasePager::create().*/ static osg::ref_ptr& prototype(); - + /** create a DatabasePager by cloning DatabasePager::prototype().*/ static DatabasePager* create(); - + /** Add a request to load a node file to end the the database request list.*/ @@ -79,16 +79,16 @@ int setSchedulePriority(OpenThreads::Thread::ThreadPriority priority); - /** Cancel the database pager thread(s).*/ + /** Cancel the database pager thread(s).*/ virtual int cancel(); - + virtual bool isRunning() const; - + /** Clear all internally cached structures.*/ virtual void clear(); - + class OSGDB_EXPORT DatabaseThread : public osg::Referenced, public OpenThreads::Thread { public: - + enum Mode { @@ -97,7 +97,7 @@ HANDLE_ONLY_HTTP }; - + DatabaseThread(DatabasePager* pager, Mode mode, const std::string& name); - + DatabaseThread(const DatabaseThread& dt, DatabasePager* pager); @@ -107,16 +107,16 @@ void setDone(bool done) { _done.exchange(done?1:0); } bool getDone() const { return _done!=0; } - + void setActive(bool active) { _active = active; } bool getActive() const { return _active; } virtual int cancel(); - + virtual void run(); - + protected: virtual ~DatabaseThread(); - + OpenThreads::Atomic _done; volatile bool _active; @@ -126,5 +126,5 @@ }; - + void setUpThreads(unsigned int totalNumThreads=2, unsigned int numHttpThreads=1); @@ -132,21 +132,21 @@ DatabaseThread* getDatabaseThread(unsigned int i) { return _databaseThreads[i].get(); } - + const DatabaseThread* getDatabaseThread(unsigned int i) const { return _databaseThreads[i].get(); } unsigned int getNumDatabaseThreads() const { return _databaseThreads.size(); } - + /** Set whether the database pager thread should be paused or not.*/ void setDatabasePagerThreadPause(bool pause); - + /** Get whether the database pager thread should is paused or not.*/ bool getDatabasePagerThreadPause() const { return _databasePagerThreadPaused; } - + /** Set whether new database request calls are accepted or ignored.*/ void setAcceptNewDatabaseRequests(bool acceptNewRequests) { _acceptNewRequests = acceptNewRequests; } - + /** Get whether new database request calls are accepted or ignored.*/ bool getAcceptNewDatabaseRequests() const { return _acceptNewRequests; } - + /** Get the number of frames that are currently active.*/ int getNumFramesActive() const { return _numFramesActive; } @@ -155,11 +155,11 @@ * Note, this is called by the application so that the database pager can go to sleep while the CPU is busy on the main rendering threads. */ virtual void signalBeginFrame(const osg::FrameStamp* framestamp); - + /** Signal the database thread that the update, cull and draw dispatch has completed. * Note, this is called by the application so that the database pager can go to wake back up now the main rendering threads are iddle waiting for the next frame.*/ virtual void signalEndFrame(); - - - /** Find all PagedLOD nodes in a subgraph and register them with + + + /** Find all PagedLOD nodes in a subgraph and register them with * the DatabasePager so it can keep track of expired nodes. * note, should be only be called from the update thread. */ @@ -198,5 +198,5 @@ /** Set whether the removed subgraphs should be deleted in the database thread or not.*/ void setDeleteRemovedSubgraphsInDatabaseThread(bool flag) { _deleteRemovedSubgraphsInDatabaseThread = flag; } - + /** Get whether the removed subgraphs should be deleted in the database thread or not.*/ bool getDeleteRemovedSubgraphsInDatabaseThread() const { return _deleteRemovedSubgraphsInDatabaseThread; } @@ -240,5 +240,5 @@ /** Return true if there are pending updates to the scene graph that require a call to updateSceneGraph(double). */ bool requiresUpdateSceneGraph() const; - + /** Merge the changes to the scene graph by calling calling removeExpiredSubgraphs then addLoadedDataToSceneGraph. * Note, must only be called from single thread update phase. */ @@ -250,5 +250,5 @@ /** Report how many items are in the _dataToCompileList queue */ unsigned int getDataToCompileListSize() const { return _dataToCompileList->size(); } - + /** Report how many items are in the _dataToMergeList queue */ unsigned int getDataToMergeListSize() const { return _dataToMergeList->size(); } @@ -256,5 +256,5 @@ /** Report whether any requests are in the pager.*/ bool getRequestsInProgress() const; - + /** Get the minimum time between the first request for a tile to be loaded and the time of its merge into the main scene graph.*/ double getMinimumTimeToMergeTile() const { return _minimumTimeToMergeTile; } @@ -325,5 +325,5 @@ float _priorityLastRequest; unsigned int _numOfRequests; - + osg::observer_ptr _terrain; osg::observer_ptr _group; @@ -381,5 +381,5 @@ }; - + typedef std::vector< osg::ref_ptr > DatabaseThreadList; @@ -416,5 +416,5 @@ friend struct SortFileRequestFunctor; - + OpenThreads::Mutex _run_mutex; OpenThreads::Mutex _dr_mutex; Index: /OpenSceneGraph/trunk/include/osgDB/PluginQuery =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/PluginQuery (revision 12139) +++ /OpenSceneGraph/trunk/include/osgDB/PluginQuery (revision 13041) @@ -1,8 +1,8 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This application is open source and may be redistributed and/or modified + * This application is open source and may be redistributed and/or modified * freely and without restriction, both in commercial and non commercial applications, * as long as this copyright notice is maintained. - * + * * This application is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -32,7 +32,7 @@ { public: - + ReaderWriterInfo() {} - + std::string plugin; std::string description; @@ -43,5 +43,5 @@ protected: - + virtual ~ReaderWriterInfo() {} }; Index: /OpenSceneGraph/trunk/include/osgDB/Version =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/Version (revision 7365) +++ /OpenSceneGraph/trunk/include/osgDB/Version (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgDB/WriteFile =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/WriteFile (revision 10171) +++ /OpenSceneGraph/trunk/include/osgDB/WriteFile (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,5 +26,5 @@ namespace osgDB { -/** Write an osg::Object to file. +/** Write an osg::Object to file. * Return true on success, * return false on failure. @@ -35,5 +35,5 @@ extern OSGDB_EXPORT bool writeObjectFile(const osg::Object& object, const std::string& filename, const Options* options ); -/** Write an osg::Object to file. +/** Write an osg::Object to file. * Return true on success, * return false on failure. @@ -46,5 +46,5 @@ } -/** Write an osg::Image to file. +/** Write an osg::Image to file. * Return true on success, * return false on failure. @@ -55,5 +55,5 @@ extern OSGDB_EXPORT bool writeImageFile(const osg::Image& image, const std::string& filename, const Options* options ); -/** Write an osg::Image to file. +/** Write an osg::Image to file. * Return true on success, * return false on failure. @@ -66,5 +66,5 @@ } -/** Write an osg::HeightField to file. +/** Write an osg::HeightField to file. * Return true on success, * return false on failure. @@ -75,5 +75,5 @@ extern OSGDB_EXPORT bool writeHeightFieldFile(const osg::HeightField& hf, const std::string& filename, const Options* options ); -/** Write an osg::HeightField to file. +/** Write an osg::HeightField to file. * Return true on success, * return false on failure. @@ -86,5 +86,5 @@ } -/** Write an osg::Node to file. +/** Write an osg::Node to file. * Return true on success, * return false on failure. @@ -95,5 +95,5 @@ extern OSGDB_EXPORT bool writeNodeFile(const osg::Node& node, const std::string& filename, const Options* options ); -/** Write an osg::Node to file. +/** Write an osg::Node to file. * Return true on success, * return false on failure. @@ -106,5 +106,5 @@ } -/** Write an osg::Shader to file. +/** Write an osg::Shader to file. * Return true on success, * return false on failure. @@ -115,5 +115,5 @@ extern OSGDB_EXPORT bool writeShaderFile(const osg::Shader& shader, const std::string& filename, const Options* options ); -/** Write an osg::Shader to file. +/** Write an osg::Shader to file. * Return true on success, * return false on failure. Index: /OpenSceneGraph/trunk/include/osgDB/Options =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/Options (revision 12170) +++ /OpenSceneGraph/trunk/include/osgDB/Options (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -174,5 +174,5 @@ /** Remove a value from the PluginData */ void removePluginData(const std::string& s) const { _pluginData.erase(s); } - + /** Get number of PluginData values */ unsigned int getNumPluginData() const { return _pluginData.size(); } Index: /OpenSceneGraph/trunk/include/osgDB/DataTypes =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/DataTypes (revision 12845) +++ /OpenSceneGraph/trunk/include/osgDB/DataTypes (revision 13041) @@ -91,14 +91,14 @@ ObjectProperty( const char* name, int value=0, bool useMap=false ) : _name(name), _value(value), _mapProperty(useMap) {} - + ObjectProperty( const ObjectProperty& copy ) : _name(copy._name), _value(copy._value), _mapProperty(copy._mapProperty) {} - + ObjectProperty& proto( const char* name ) { _name = name; return *this; } - + void set( int v ) { _value = v; } int get() const { return _value; } - + std::string _name; int _value; @@ -120,8 +120,8 @@ ObjectMark( const char* name, int delta=0 ) : _name(name), _indentDelta(delta) {} - + ObjectMark( const ObjectMark& copy ) : _name(copy._name), _indentDelta(copy._indentDelta) {} - + std::string _name; int _indentDelta; Index: /OpenSceneGraph/trunk/include/osgDB/ImageOptions =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/ImageOptions (revision 10171) +++ /OpenSceneGraph/trunk/include/osgDB/ImageOptions (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -22,9 +22,9 @@ { public: - + ImageOptions(); - + ImageOptions(const std::string& str); - + ImageOptions(const ImageOptions& options,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): osgDB::Options(options,copyop), @@ -39,5 +39,5 @@ _destinationDataType(options._destinationDataType), _destinationPixelFormat(options._destinationPixelFormat) {} - + META_Object(osgDB,ImageOptions); @@ -59,5 +59,5 @@ windowHeight = h; } - + double windowX; double windowY; @@ -65,5 +65,5 @@ double windowHeight; }; - + /** PixelWindow stores the window (in exact pixels) from the overall imagery from which to extract the osg::Image*/ struct PixelWindow @@ -74,5 +74,5 @@ windowWidth(0), windowHeight(0) {} - + void set(unsigned int x, unsigned int y, unsigned int w, unsigned int h) { @@ -82,5 +82,5 @@ windowHeight = h; } - + unsigned int windowX; unsigned int windowY; @@ -88,5 +88,5 @@ unsigned int windowHeight; }; - + enum ImageWindowMode { @@ -95,5 +95,5 @@ PIXEL_WINDOW }; - + enum ImageSamplingMode { @@ -111,5 +111,5 @@ _w(1.0), _h(1.0) {} - + void set(double x,double y, double w, double h) { @@ -119,10 +119,10 @@ _h = h; } - + double _x,_y,_w,_h; }; - // source + // source ImageSamplingMode _sourceImageSamplingMode; ImageWindowMode _sourceImageWindowMode; @@ -132,5 +132,5 @@ // destination osg::ref_ptr _destinationImage; - + ImageWindowMode _destinationImageWindowMode; RatioWindow _destinationRatioWindow; @@ -141,5 +141,5 @@ void init(); - + }; Index: /OpenSceneGraph/trunk/include/osgDB/ConvertUTF =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/ConvertUTF (revision 12210) +++ /OpenSceneGraph/trunk/include/osgDB/ConvertUTF (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgDB/Output =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/Output (revision 10990) +++ /OpenSceneGraph/trunk/include/osgDB/Output (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,8 +32,8 @@ Output(); Output(const char* name); - + virtual ~Output(); - + void setOptions(const Options* options); const Options* getOptions() const { return _options.get(); } @@ -43,5 +43,5 @@ void open(const char *name); - + // comment out temporarily to avoid compilation problems, RO Jan 2002. // void open(const char *name,int mode); @@ -66,5 +66,5 @@ void moveIn(); void moveOut(); - + virtual bool writeObject(const osg::Object& obj); virtual void writeBeginObject(const std::string& name); @@ -84,5 +84,5 @@ FILENAME_ONLY }; - + inline void setPathNameHint(const PathNameHint pnh) { _pathNameHint = pnh; } inline PathNameHint getPathNameHint() const { return _pathNameHint; } @@ -115,12 +115,12 @@ int _indent; int _indentStep; - + int _numIndicesPerLine; typedef std::map UniqueIDToLabelMapping; UniqueIDToLabelMapping _objectToUniqueIDMap; - + std::string _filename; - + PathNameHint _pathNameHint; Index: /OpenSceneGraph/trunk/include/osgDB/FileUtils =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/FileUtils (revision 12969) +++ /OpenSceneGraph/trunk/include/osgDB/FileUtils (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -33,5 +33,5 @@ /** Make a new directory for a given file. */ extern OSGDB_EXPORT bool makeDirectoryForFile( const std::string &filePath ); - + /** Get current working directory. */ extern OSGDB_EXPORT std::string getCurrentWorkingDirectory( void ); @@ -73,8 +73,8 @@ /** Return the list of filenames that match the given filename with wildcards. - * Will only expand '*', and will not expand wildcards in directory, only in - * filename part of the given filename. - * Return value will contain path+filename so that if ever the above - * limitation (expanding wildcards in directory) is fixed, client code will + * Will only expand '*', and will not expand wildcards in directory, only in + * filename part of the given filename. + * Return value will contain path+filename so that if ever the above + * limitation (expanding wildcards in directory) is fixed, client code will * still work unchanged. */ extern OSGDB_EXPORT DirectoryContents expandWildcardsInFilename(const std::string& filename); @@ -109,10 +109,10 @@ inline FilePathList& getDataFilePathList() { return osgDB::Registry::instance()->getDataFilePathList(); } -/** Search for specified file in file system, checking the DataFilePathList for possible paths, +/** Search for specified file in file system, checking the DataFilePathList for possible paths, * returning the full path of the first valid file found, return an empty string if no string is found. */ extern OSGDB_EXPORT std::string findDataFile(const std::string& filename,CaseSensitivity caseSensitivity=CASE_SENSITIVE); -/** Search for specified file in file system, checking first the database path set in the Options structure, then the DataFilePathList for possible paths, +/** Search for specified file in file system, checking first the database path set in the Options structure, then the DataFilePathList for possible paths, * returning the full path of the first valid file found, return an empty string if no string is found. */ Index: /OpenSceneGraph/trunk/include/osgDB/FileNameUtils =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/FileNameUtils (revision 12401) +++ /OpenSceneGraph/trunk/include/osgDB/FileNameUtils (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgDB/Registry =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/Registry (revision 12937) +++ /OpenSceneGraph/trunk/include/osgDB/Registry (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -75,5 +75,5 @@ - + static Registry* instance(bool erase = false); @@ -127,8 +127,8 @@ /** find the library in the OSG_LIBRARY_PATH and load it.*/ LoadStatus loadLibrary(const std::string& fileName); - + /** close the attached library with specified name.*/ bool closeLibrary(const std::string& fileName); - + /** close all libraries.*/ void closeAllLibraries(); @@ -142,5 +142,5 @@ * the registered mime-types. */ ReaderWriter* getReaderWriterForMimeType(const std::string& mimeType); - + /** get list of all registered ReaderWriters.*/ ReaderWriterList& getReaderWriterList() { return _rwList; } @@ -148,5 +148,5 @@ /** get const list of all registered ReaderWriters.*/ const ReaderWriterList& getReaderWriterList() const { return _rwList; } - + typedef std::vector< osg::ref_ptr > ImageProcessorList; @@ -203,5 +203,5 @@ /** Get the readFile callback.*/ ReadFileCallback* getReadFileCallback() { return _readFileCallback.get(); } - + /** Get the const readFile callback.*/ const ReadFileCallback* getReadFileCallback() const { return _readFileCallback.get(); } @@ -272,5 +272,5 @@ /** Get the writeFile callback.*/ WriteFileCallback* getWriteFileCallback() { return _writeFileCallback.get(); } - + /** Get the const writeFile callback.*/ const WriteFileCallback* getWriteFileCallback() const { return _writeFileCallback.get(); } @@ -308,5 +308,5 @@ } ReaderWriter::WriteResult writeNodeImplementation(const osg::Node& node, const std::string& fileName,const Options* options); - + ReaderWriter::WriteResult writeShader(const osg::Shader& obj, const std::string& fileName,const Options* options) { @@ -316,5 +316,5 @@ } ReaderWriter::WriteResult writeShaderImplementation(const osg::Shader& obj, const std::string& fileName,const Options* options); - + inline void _buildKdTreeIfRequired(ReaderWriter::ReadResult& result, const Options* options) @@ -324,5 +324,5 @@ _buildKdTreesHint == Options::BUILD_KDTREES; - if (doKdTreeBuilder && _kdTreeBuilder.valid() && result.validNode()) + if (doKdTreeBuilder && _kdTreeBuilder.valid() && result.validNode()) { osg::ref_ptr builder = _kdTreeBuilder->clone(); @@ -374,5 +374,5 @@ void setCreateNodeFromImage(bool flag) { _createNodeFromImage = flag; } bool getCreateNodeFromImage() const { return _createNodeFromImage; } - + void setOptions(Options* opt) { _options = opt; } @@ -381,9 +381,9 @@ - /** initialize both the Data and Library FilePaths, by default called by the + /** initialize both the Data and Library FilePaths, by default called by the * constructor, so it should only be required if you want to force * the re-reading of environmental variables.*/ void initFilePathLists() { initDataFilePathList(); initLibraryFilePathList(); } - + /** initialize the Data FilePath by reading the OSG_FILE_PATH environmental variable.*/ void initDataFilePathList(); @@ -401,5 +401,5 @@ const FilePathList& getDataFilePathList() const { return _dataFilePath; } - /** initialize the Library FilePath by reading the OSG_LIBRARY_PATH + /** initialize the Library FilePath by reading the OSG_LIBRARY_PATH * and the appropriate system environmental variables*/ void initLibraryFilePathList(); @@ -413,9 +413,9 @@ /** get the library file path which is used when search for library (dso/dll's) files.*/ FilePathList& getLibraryFilePathList() { return _libraryFilePath; } - + /** get the const library file path which is used when search for library (dso/dll's) files.*/ const FilePathList& getLibraryFilePathList() const { return _libraryFilePath; } - /** For each object in the cache which has an reference count greater than 1 + /** For each object in the cache which has an reference count greater than 1 * (and therefore referenced by elsewhere in the application) set the time stamp * for that object in the cache to specified time. @@ -437,5 +437,5 @@ - /** Remove all objects in the cache regardless of having external references or expiry times.*/ + /** Remove all objects in the cache regardless of having external references or expiry times.*/ void clearObjectCache(); @@ -448,10 +448,10 @@ /** Get an Object from the object cache*/ osg::Object* getFromObjectCache(const std::string& fileName); - + /** Get an ref_ptr from the object cache*/ osg::ref_ptr getRefFromObjectCache(const std::string& fileName); - + /** Add archive to archive cache so that future calls reference this archive.*/ void addToArchiveCache(const std::string& fileName, osgDB::Archive* archive); @@ -459,5 +459,5 @@ /** Remove Archive from cache.*/ void removeFromArchiveCache(const std::string& fileName); - + /** Get an Archive from the archive cache.*/ osgDB::Archive* getFromArchiveCache(const std::string& fileName); @@ -465,8 +465,8 @@ /** Get an ref_ptr from the archive cache.*/ osg::ref_ptr getRefFromArchiveCache(const std::string& fileName); - + /** Remove all archives from the archive cache.*/ void clearArchiveCache(); - + /** If State is non-zero, this function releases OpenGL objects for * the specified graphics context. Otherwise, releases OpenGL objexts @@ -482,5 +482,5 @@ /** Get the SharedStateManager, creating one if one is not already created.*/ SharedStateManager* getOrCreateSharedStateManager(); - + /** Get the SharedStateManager. Return 0 if no SharedStateManager has been assigned.*/ SharedStateManager* getSharedStateManager() { return _sharedStateManager.get(); } @@ -488,8 +488,8 @@ /** Add an Archive extension.*/ void addArchiveExtension(const std::string ext); - + /** registers a protocol */ void registerProtocol(const std::string& protocol); - + /** returns true, if named protocol is registered */ bool isProtocolRegistered(const std::string& protocol); @@ -510,9 +510,9 @@ typedef std::vector< osg::ref_ptr > DynamicLibraryList; typedef std::map< std::string, std::string> ExtensionAliasMap; - + typedef std::pair, double > ObjectTimeStampPair; typedef std::map ObjectCache; typedef std::map > ArchiveCache; - + typedef std::set RegisteredProtocolsSet; @@ -527,11 +527,11 @@ Options::BuildKdTreesHint _buildKdTreesHint; osg::ref_ptr _kdTreeBuilder; - + osg::ref_ptr _fileCache; - + osg::ref_ptr _authenticationMap; - + bool _createNodeFromImage; - + RegisteredProtocolsSet _registeredProtocols; @@ -556,7 +556,7 @@ protected: - + void destruct(); - + // forward declare helper classes struct ReadObjectFunctor; @@ -566,5 +566,5 @@ struct ReadArchiveFunctor; struct ReadShaderFunctor; - + // make helper classes friends to get round VS6.0 "issues" friend struct ReadFunctor; @@ -601,5 +601,5 @@ bool _openingLibrary; - + // map to alias to extensions to plugins. ExtensionAliasMap _extAliasMap; @@ -610,8 +610,8 @@ // Utility: Removes whitespace from both ends of a string. static std::string trim( const std::string& str ); - + // options to pass to reader writers. osg::ref_ptr _options; - + FilePathList _dataFilePath; FilePathList _libraryFilePath; @@ -620,5 +620,5 @@ ObjectCache _objectCache; OpenThreads::Mutex _objectCacheMutex; - + ArchiveExtensionList _archiveExtList; @@ -657,7 +657,7 @@ } } - + T* get() { return _rw.get(); } - + protected: osg::ref_ptr _rw; Index: /OpenSceneGraph/trunk/include/osgDB/Serializer =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/Serializer (revision 12483) +++ /OpenSceneGraph/trunk/include/osgDB/Serializer (revision 13041) @@ -39,8 +39,8 @@ typedef std::map StringToValue; typedef std::map ValueToString; - + IntLookup() {} unsigned int size() const { return _stringToValue.size(); } - + void add( const char* str, Value value ) { @@ -54,5 +54,5 @@ _stringToValue[str] = value; } - + Value getValue( const char* str ) { @@ -68,5 +68,5 @@ return itr->second; } - + const std::string& getString( Value value ) { @@ -82,5 +82,5 @@ return itr->second; } - + protected: StringToValue _stringToValue; @@ -93,5 +93,5 @@ typedef void (*AddValueFunc)( IntLookup* lookup ); UserLookupTableProxy( AddValueFunc func ) { if ( func ) (*func)(&_lookup); } - + IntLookup _lookup; }; @@ -146,8 +146,8 @@ typedef bool (*Reader)( InputStream&, C& ); typedef bool (*Writer)( OutputStream&, const C& ); - + UserSerializer( const char* name, Checker cf, Reader rf, Writer wf ) : BaseSerializer(), _name(name), _checker(cf), _reader(rf), _writer(wf) {} - + virtual bool read( InputStream& is, osg::Object& obj ) { @@ -165,5 +165,5 @@ return (*_reader)(is, object); } - + virtual bool write( OutputStream& os, const osg::Object& obj ) { @@ -182,11 +182,11 @@ return (*_writer)(os, object); } - + virtual const std::string& getName() const { return _name; } - + protected: std::string _name; Checker _checker; - + public: Reader _reader; @@ -218,8 +218,8 @@ typedef P (C::*Getter)() const; typedef void (C::*Setter)( P ); - + PropByValSerializer( const char* name, P def, Getter gf, Setter sf, bool useHex=false ) : ParentType(name, def), _getter(gf), _setter(sf), _useHex(useHex) {} - + virtual bool read( InputStream& is, osg::Object& obj ) { @@ -241,5 +241,5 @@ return true; } - + virtual bool write( OutputStream& os, const osg::Object& obj ) { @@ -260,9 +260,9 @@ return true; } - + public: Getter _getter; Setter _setter; - + protected: bool _useHex; @@ -277,8 +277,8 @@ typedef CP (C::*Getter)() const; typedef void (C::*Setter)( CP ); - + PropByRefSerializer( const char* name, CP def, Getter gf, Setter sf ) : ParentType(name, def), _getter(gf), _setter(sf) {} - + virtual bool read( InputStream& is, osg::Object& obj ) { @@ -298,5 +298,5 @@ return true; } - + virtual bool write( OutputStream& os, const osg::Object& obj ) { @@ -313,5 +313,5 @@ return true; } - + public: Getter _getter; @@ -326,8 +326,8 @@ typedef const osg::Matrix& (C::*Getter)() const; typedef void (C::*Setter)( const osg::Matrix& ); - + MatrixSerializer( const char* name, const osg::Matrix& def, Getter gf, Setter sf ) : ParentType(name, def), _getter(gf), _setter(sf) {} - + virtual bool read( InputStream& is, osg::Object& obj ) { @@ -347,5 +347,5 @@ return true; } - + virtual bool write( OutputStream& os, const osg::Object& obj ) { @@ -363,5 +363,5 @@ return true; } - + protected: void readMatrixImplementation( InputStream& is, osg::Matrix& matrix ) @@ -382,5 +382,5 @@ #endif } - + public: Getter _getter; @@ -395,8 +395,8 @@ typedef P (C::*Getter)() const; typedef void (C::*Setter)( P ); - + GLenumSerializer( const char* name, P def, Getter gf, Setter sf ) : ParentType(name, def), _getter(gf), _setter(sf) {} - + virtual bool read( InputStream& is, osg::Object& obj ) { @@ -415,5 +415,5 @@ return true; } - + virtual bool write( OutputStream& os, const osg::Object& obj ) { @@ -430,5 +430,5 @@ return true; } - + public: Getter _getter; @@ -443,8 +443,8 @@ typedef const std::string& (C::*Getter)() const; typedef void (C::*Setter)( const std::string& ); - + StringSerializer( const char* name, const std::string& def, Getter gf, Setter sf ) : ParentType(name, def), _getter(gf), _setter(sf) {} - + virtual bool read( InputStream& is, osg::Object& obj ) { @@ -465,5 +465,5 @@ return true; } - + virtual bool write( OutputStream& os, const osg::Object& obj ) { @@ -482,5 +482,5 @@ return true; } - + public: Getter _getter; @@ -495,8 +495,8 @@ typedef const P* (C::*Getter)() const; typedef void (C::*Setter)( P* ); - + ObjectSerializer( const char* name, P* def, Getter gf, Setter sf ) : ParentType(name, def), _getter(gf), _setter(sf) {} - + virtual bool read( InputStream& is, osg::Object& obj ) { @@ -527,5 +527,5 @@ return true; } - + virtual bool write( OutputStream& os, const osg::Object& obj ) { @@ -551,5 +551,5 @@ return true; } - + public: Getter _getter; @@ -564,8 +564,8 @@ typedef const P* (C::*Getter)() const; typedef void (C::*Setter)( P* ); - + ImageSerializer( const char* name, P* def, Getter gf, Setter sf ) : ParentType(name, def), _getter(gf), _setter(sf) {} - + virtual bool read( InputStream& is, osg::Object& obj ) { @@ -596,5 +596,5 @@ return true; } - + virtual bool write( OutputStream& os, const osg::Object& obj ) { @@ -620,5 +620,5 @@ return true; } - + public: Getter _getter; @@ -633,17 +633,17 @@ typedef P (C::*Getter)() const; typedef B (C::*Setter)( P ); - + EnumSerializer( const char* name, P def, Getter gf, Setter sf ) : ParentType(name, def), _getter(gf), _setter(sf) {} - + void add( const char* str, P value ) { _lookup.add(str, static_cast(value)); } - + P getValue( const char* str ) { return static_cast

(_lookup.getValue(str)); } - + const std::string& getString( P value ) { return _lookup.getString(static_cast(value)); } - + virtual bool read( InputStream& is, osg::Object& obj ) { @@ -663,5 +663,5 @@ return true; } - + virtual bool write( osgDB::OutputStream& os, const osg::Object& obj ) { @@ -678,9 +678,9 @@ return true; } - + public: Getter _getter; Setter _setter; - + protected: IntLookup _lookup; @@ -696,8 +696,8 @@ typedef const P& (C::*Getter)() const; typedef void (C::*Setter)( const P& ); - + ListSerializer( const char* name, Getter gf, Setter sf ) : _name(name), _getter(gf), _setter(sf) {} - + virtual const std::string& getName() const { return _name; } @@ -736,5 +736,5 @@ return true; } - + virtual bool write( OutputStream& os, const osg::Object& obj ) { @@ -764,5 +764,5 @@ return true; } - + public: std::string _name; @@ -810,5 +810,5 @@ wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, unsigned int >( \ #PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP), osgDB::BaseSerializer::RW_UINT ) - + #define ADD_GLINT_SERIALIZER(PROP, DEF) \ wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, GLint >( \ Index: /OpenSceneGraph/trunk/include/osgDB/ReadFile =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/ReadFile (revision 10812) +++ /OpenSceneGraph/trunk/include/osgDB/ReadFile (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -27,5 +27,5 @@ -/** Read an osg::Object from file. +/** Read an osg::Object from file. * Return valid osg::Object on success, * return NULL on failure. @@ -36,5 +36,5 @@ extern OSGDB_EXPORT osg::Object* readObjectFile(const std::string& filename,const Options* options); -/** Read an osg::Object from file. +/** Read an osg::Object from file. * Return valid osg::Object on success, * return NULL on failure. @@ -47,5 +47,5 @@ } -/** Read an osg::Image from file. +/** Read an osg::Image from file. * Return valid osg::Image on success, * return NULL on failure. @@ -56,5 +56,5 @@ extern OSGDB_EXPORT osg::Image* readImageFile(const std::string& filename,const Options* options); -/** Read an osg::Image from file. +/** Read an osg::Image from file. * Return valid osg::Image on success, * return NULL on failure. @@ -67,5 +67,5 @@ } -/** Read an osg::HeightField from file. +/** Read an osg::HeightField from file. * Return valid osg::HeightField on success, * return NULL on failure. @@ -76,5 +76,5 @@ extern OSGDB_EXPORT osg::HeightField* readHeightFieldFile(const std::string& filename,const Options* options); -/** Read an osg::HeightField from file. +/** Read an osg::HeightField from file. * Return valid osg::HeightField on success, * return NULL on failure. @@ -87,5 +87,5 @@ } -/** Read an osg::Node from file. +/** Read an osg::Node from file. * Return valid osg::Node on success, * return NULL on failure. @@ -96,5 +96,5 @@ extern OSGDB_EXPORT osg::Node* readNodeFile(const std::string& filename,const Options* options); -/** Read an osg::Node from file. +/** Read an osg::Node from file. * Return valid osg::Node on success, * return NULL on failure. @@ -134,5 +134,5 @@ } -/** Read an osg::Shader from file. +/** Read an osg::Shader from file. * Return valid osg::Shader on success, * return NULL on failure. @@ -143,5 +143,5 @@ extern OSGDB_EXPORT osg::Shader* readShaderFile(const std::string& filename,const Options* options); -/** Read an osg::Shader from file. +/** Read an osg::Shader from file. * Return valid osg::Shader on success, * return NULL on failure. @@ -154,5 +154,5 @@ } -/** Read an osg::Shader from file and set to specified shader type. +/** Read an osg::Shader from file and set to specified shader type. * Return valid osg::Shader on success, * return NULL on failure. @@ -168,5 +168,5 @@ } -/** Read an osg::Shader from file and set to specified shader type +/** Read an osg::Shader from file and set to specified shader type * Return valid osg::Shader on success, * return NULL on failure. @@ -179,5 +179,5 @@ } -/** Read an osg::Object from file. +/** Read an osg::Object from file. * Return an assigned osg::ref_ptr on success, * return an osg::ref_ptr with a NULL pointer assigned to it on failure. @@ -188,5 +188,5 @@ extern OSGDB_EXPORT osg::ref_ptr readRefObjectFile(const std::string& filename,const Options* options); -/** Read an osg::Object from file. +/** Read an osg::Object from file. * Return an assigned osg::ref_ptr on success, * return an osg::ref_ptr with a NULL pointer assigned to it on failure. @@ -199,5 +199,5 @@ } -/** Read an osg::Image from file. +/** Read an osg::Image from file. * Return an assigned osg::ref_ptr on success, * return an osg::ref_ptr with a NULL pointer assigned to it on failure. @@ -208,5 +208,5 @@ extern OSGDB_EXPORT osg::ref_ptr readRefImageFile(const std::string& filename,const Options* options); -/** Read an osg::Image from file. +/** Read an osg::Image from file. * Return an assigned osg::ref_ptr on success, * return an osg::ref_ptr with a NULL pointer assigned to it on failure. @@ -219,5 +219,5 @@ } -/** Read an osg::HeightField from file. +/** Read an osg::HeightField from file. * Return an assigned osg::ref_ptr on success, * return an osg::ref_ptr with a NULL pointer assigned to it on failure. @@ -228,5 +228,5 @@ extern OSGDB_EXPORT osg::ref_ptr readRefHeightFieldFile(const std::string& filename,const Options* options); -/** Read an osg::HeightField from file. +/** Read an osg::HeightField from file. * Return an assigned osg::ref_ptr on success, * return an osg::ref_ptr with a NULL pointer assigned to it on failure. @@ -239,5 +239,5 @@ } -/** Read an osg::Node from file. +/** Read an osg::Node from file. * Return an assigned osg::ref_ptr on success, * return an osg::ref_ptr with a NULL pointer assigned to it on failure. @@ -248,5 +248,5 @@ extern OSGDB_EXPORT osg::ref_ptr readRefNodeFile(const std::string& filename,const Options* options); -/** Read an osg::Node from file. +/** Read an osg::Node from file. * Return an assigned osg::ref_ptr on success, * return an osg::ref_ptr with a NULL pointer assigned to it on failure. @@ -259,5 +259,5 @@ } -/** Read an osg::Shader from file. +/** Read an osg::Shader from file. * Return an assigned osg::ref_ptr on success, * return an osg::ref_ptr with a NULL pointer assigned to it on failure. @@ -268,5 +268,5 @@ extern OSGDB_EXPORT osg::ref_ptr readRefShaderFile(const std::string& filename,const Options* options); -/** Read an osg::Shader from file. +/** Read an osg::Shader from file. * Return an assigned osg::ref_ptr on success, * return an osg::ref_ptr with a NULL pointer assigned to it on failure. Index: /OpenSceneGraph/trunk/include/osgDB/InputStream =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/InputStream (revision 13011) +++ /OpenSceneGraph/trunk/include/osgDB/InputStream (revision 13041) @@ -44,8 +44,8 @@ } } - + const std::string& getField() const { return _field; } const std::string& getError() const { return _error; } - + protected: std::string _field; @@ -58,5 +58,5 @@ typedef std::map< unsigned int, osg::ref_ptr > ArrayMap; typedef std::map< unsigned int, osg::ref_ptr > IdentifierMap; - + enum ReadType { @@ -66,12 +66,12 @@ READ_OBJECT }; - + InputStream( const osgDB::Options* options ); virtual ~InputStream(); - + bool isBinary() const { return _in->isBinary(); } int getFileVersion() const { return _fileVersion; } const osgDB::Options* getOptions() const { return _options.get(); } - + // Serialization related functions InputStream& operator>>( bool& b ) { _in->readBool(b); checkStream(); return *this; } @@ -90,9 +90,9 @@ InputStream& operator>>( std::istream& (*fn)(std::istream&) ) { _in->readStream(fn); checkStream(); return *this; } InputStream& operator>>( std::ios_base& (*fn)(std::ios_base&) ) { _in->readBase(fn); checkStream(); return *this; } - + InputStream& operator>>( ObjectGLenum& value ) { _in->readGLenum(value); checkStream(); return *this; } InputStream& operator>>( ObjectProperty& prop ) { _in->readProperty(prop); checkStream(); return *this; } InputStream& operator>>( ObjectMark& mark ) { _in->readMark(mark); checkStream(); return *this; } - + InputStream& operator>>( osg::Vec2b& v ); InputStream& operator>>( osg::Vec3b& v ); @@ -112,17 +112,17 @@ InputStream& operator>>( osg::Matrixf& mat ); InputStream& operator>>( osg::Matrixd& mat ); - + InputStream& operator>>( osg::Array*& a ) { a = readArray(); return *this; } InputStream& operator>>( osg::Image*& img ) { img = readImage(); return *this; } InputStream& operator>>( osg::PrimitiveSet*& p ) { p = readPrimitiveSet(); return *this; } InputStream& operator>>( osg::Object*& obj ) { obj = readObject(); return *this; } - + InputStream& operator>>( osg::ref_ptr& ptr ) { ptr = readArray(); return *this; } InputStream& operator>>( osg::ref_ptr& ptr ) { ptr = readImage(); return *this; } InputStream& operator>>( osg::ref_ptr& ptr ) { ptr = readPrimitiveSet(); return *this; } - + template InputStream& operator>>( osg::ref_ptr& ptr ) { ptr = static_cast(readObject()); return *this; } - + // Convenient methods for reading bool matchString( const std::string& str ) { return _in->matchString(str); } @@ -149,23 +149,23 @@ void decompress(); - + // Schema handlers void readSchema( std::istream& fin ); void resetSchema(); - + // Exception handlers inline void throwException( const std::string& msg ); const InputException* getException() const { return _exception.get(); } - + protected: inline void checkStream(); void setWrapperSchema( const std::string& name, const std::string& properties ); - + template void readArrayImplementation( T* a, unsigned int numComponentsPerElements, unsigned int componentSizeInBytes ); - + ArrayMap _arrayMap; IdentifierMap _identifierMap; - + int _fileVersion; bool _useSchemaData; Index: /OpenSceneGraph/trunk/include/osgDB/XmlParser =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/XmlParser (revision 12139) +++ /OpenSceneGraph/trunk/include/osgDB/XmlParser (revision 13041) @@ -149,5 +149,5 @@ bool writeChildren(const ControlMap& controlMap, std::ostream& fout, const std::string& indent) const; bool writeProperties(const ControlMap& controlMap, std::ostream& fout) const; - + bool readAndReplaceControl(std::string& contents, Input& input); }; Index: /OpenSceneGraph/trunk/include/osgDB/ExternalFileWriter =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/ExternalFileWriter (revision 12401) +++ /OpenSceneGraph/trunk/include/osgDB/ExternalFileWriter (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgDB/Callbacks =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/Callbacks (revision 12139) +++ /OpenSceneGraph/trunk/include/osgDB/Callbacks (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgDB/Export =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/Export (revision 12221) +++ /OpenSceneGraph/trunk/include/osgDB/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -44,5 +44,5 @@ \namespace osgDB -The osgDB library provides support for reading and writing scene graphs, providing a plugin framework and file utility classes. +The osgDB library provides support for reading and writing scene graphs, providing a plugin framework and file utility classes. The plugin framework in centered around the osgDB::Registry, and allows plugins which provide specific file format support to be dynamically loaded on demand. */ Index: /OpenSceneGraph/trunk/include/osgDB/ImageProcessor =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/ImageProcessor (revision 12139) +++ /OpenSceneGraph/trunk/include/osgDB/ImageProcessor (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgDB/Input =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/Input (revision 10990) +++ /OpenSceneGraph/trunk/include/osgDB/Input (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -249,5 +249,5 @@ Input(); virtual ~Input(); - + void setOptions(const Options* options) { _options = options; } const Options* getOptions() const { return _options.get(); } @@ -268,5 +268,5 @@ virtual osg::Node* readNode(const std::string& fileName); virtual osg::Shader* readShader(const std::string& fileName); - + virtual osg::Object* getObjectForUniqueID(const std::string& uniqueID); virtual void registerUniqueIDForObject(const std::string& uniqueID,osg::Object* obj); @@ -294,8 +294,8 @@ private: - + typedef std::map< std::string, osg::ref_ptr > UniqueIDToObjectMapping; UniqueIDToObjectMapping _uniqueIDToObjectMap; - + osg::ref_ptr _options; Index: /OpenSceneGraph/trunk/include/osgDB/ReaderWriter =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/ReaderWriter (revision 11763) +++ /OpenSceneGraph/trunk/include/osgDB/ReaderWriter (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -39,9 +39,9 @@ { public: - - + + ReaderWriter(): osg::Object(true) {} - + ReaderWriter(const ReaderWriter& rw,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): osg::Object(rw,copyop) {} @@ -71,8 +71,8 @@ FEATURE_NONE = 0, FEATURE_READ_OBJECT = 1<<0, - FEATURE_READ_IMAGE = 1<<1, + FEATURE_READ_IMAGE = 1<<1, FEATURE_READ_HEIGHT_FIELD = 1<<2, - FEATURE_READ_NODE = 1<<3, - FEATURE_READ_SHADER = 1<<4, + FEATURE_READ_NODE = 1<<3, + FEATURE_READ_SHADER = 1<<4, FEATURE_WRITE_OBJECT = 1<<5, FEATURE_WRITE_IMAGE = 1<<6, @@ -89,6 +89,6 @@ FEATURE_WRITE_HEIGHT_FIELD | FEATURE_WRITE_NODE | - FEATURE_WRITE_SHADER - }; + FEATURE_WRITE_SHADER + }; /** Return available features*/ virtual Features supportedFeatures() const; @@ -118,8 +118,8 @@ ReadResult(const std::string& m):_status(ERROR_IN_READING_FILE),_message(m) {} ReadResult(osg::Object* obj, ReadStatus status=FILE_LOADED):_status(status),_object(obj) {} - + ReadResult(const ReadResult& rr):_status(rr._status),_message(rr._message),_object(rr._object) {} ReadResult& operator = (const ReadResult& rr) { if (this==&rr) return *this; _status=rr._status; _message=rr._message;_object=rr._object; return *this; } - + osg::Object* getObject(); osg::Image* getImage(); @@ -155,5 +155,5 @@ protected: - + ReadStatus _status; std::string _message; @@ -176,8 +176,8 @@ WriteResult(WriteStatus status=FILE_NOT_HANDLED):_status(status) {} WriteResult(const std::string& m):_status(ERROR_IN_WRITING_FILE),_message(m) {} - + WriteResult(const WriteResult& rr):_status(rr._status),_message(rr._message) {} WriteResult& operator = (const WriteResult& rr) { if (this==&rr) return *this; _status=rr._status; _message=rr._message; return *this; } - + std::string& message() { return _message; } const std::string& message() const { return _message; } @@ -189,5 +189,5 @@ protected: - + WriteStatus _status; std::string _message; Index: /OpenSceneGraph/trunk/include/osgDB/DotOsgWrapper =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/DotOsgWrapper (revision 11049) +++ /OpenSceneGraph/trunk/include/osgDB/DotOsgWrapper (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -35,5 +35,5 @@ typedef bool (*ReadFunc)(osg::Object&,osgDB::Input&); typedef bool (*WriteFunc)(const osg::Object&,osgDB::Output&); - + enum ReadWriteMode { @@ -48,5 +48,5 @@ WriteFunc writeFunc, ReadWriteMode readWriteMode=READ_AND_WRITE); - + inline const osg::Object* getPrototype() const { return _prototype.get(); } @@ -69,8 +69,8 @@ osg::ref_ptr _prototype; - + std::string _name; Associates _associates; - + ReadFunc _readFunc; WriteFunc _writeFunc; @@ -169,3 +169,3 @@ } -#endif +#endif Index: /OpenSceneGraph/trunk/include/osgDB/fstream =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/fstream (revision 12139) +++ /OpenSceneGraph/trunk/include/osgDB/fstream (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgDB/ImagePager =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/ImagePager (revision 12139) +++ /OpenSceneGraph/trunk/include/osgDB/ImagePager (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,11 +32,11 @@ { public: - + ImagePager(); - + class OSGDB_EXPORT ImageThread : public osg::Referenced, public OpenThreads::Thread { public: - + enum Mode { @@ -45,20 +45,20 @@ HANDLE_ONLY_HTTP }; - + ImageThread(ImagePager* pager, Mode mode, const std::string& name); - + ImageThread(const ImageThread& dt, ImagePager* pager); - + void setDone(bool done) { _done = done; } bool getDone() const { return _done; } virtual int cancel(); - + virtual void run(); - + protected: virtual ~ImageThread(); - + bool _done; Mode _mode; @@ -69,9 +69,9 @@ ImageThread* getImageThread(unsigned int i) { return _imageThreads[i].get(); } - + const ImageThread* getImageThread(unsigned int i) const { return _imageThreads[i].get(); } unsigned int getNumImageThreads() const { return _imageThreads.size(); } - + void setPreLoadTime(double preLoadTime) { _preLoadTime=preLoadTime; } @@ -85,19 +85,19 @@ /** Return true if there are pending updates to the scene graph that require a call to updateSceneGraph(double). */ virtual bool requiresUpdateSceneGraph() const; - + /** Merge the changes to the scene graph. */ virtual void updateSceneGraph(const osg::FrameStamp &frameStamp); - + int cancel(); protected: - + virtual ~ImagePager(); - // forward declare + // forward declare struct RequestQueue; - + struct SortFileRequestFunctor; friend struct SortFileRequestFunctor; - + struct ImageRequest : public osg::Referenced { @@ -106,5 +106,5 @@ _timeToMergeBy(0.0), _attachmentIndex(-1) {} - + double _timeToMergeBy; std::string _fileName; @@ -114,7 +114,7 @@ osg::ref_ptr _loadedImage; RequestQueue* _requestQueue; - + }; - + struct RequestQueue : public osg::Referenced { @@ -122,35 +122,35 @@ void sort(); - + RequestList _requestList; OpenThreads::Mutex _requestMutex; }; - + struct ReadQueue : public RequestQueue { ReadQueue(ImagePager* pager, const std::string& name); - + void block() { _block->block(); } - + void release() { _block->release(); } - + void updateBlock() { _block->set((!_requestList.empty() || !_pager->_databasePagerThreadPaused)); } - + void clear(); - + void add(ImageRequest* imageRequest); - + void takeFirst(osg::ref_ptr& databaseRequest); - + osg::ref_ptr _block; - + ImagePager* _pager; std::string _name; }; - + OpenThreads::Mutex _run_mutex; bool _startThreadCalled; @@ -158,12 +158,12 @@ bool _done; bool _databasePagerThreadPaused; - + osg::ref_ptr _readQueue; - + typedef std::vector< osg::ref_ptr > ImageThreads; ImageThreads _imageThreads; - + osg::ref_ptr _completedQueue; - + double _preLoadTime; }; Index: /OpenSceneGraph/trunk/include/osgDB/ParameterOutput =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/ParameterOutput (revision 9458) +++ /OpenSceneGraph/trunk/include/osgDB/ParameterOutput (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -22,10 +22,10 @@ { public: - + ParameterOutput(Output& fw): _fw(fw), _numItemsPerLine(fw.getNumIndicesPerLine()), _column(0) {} - + ParameterOutput(Output& fw,int numItemsPerLine): _fw(fw), @@ -52,5 +52,5 @@ _column = 0; } - + template void write(const T& t) @@ -59,5 +59,5 @@ _fw << t; - + ++_column; if (_column==_numItemsPerLine) @@ -72,5 +72,5 @@ } - + template void write(Iterator first, Iterator last) @@ -84,5 +84,5 @@ } - + template void writeAsInts(Iterator first, Iterator last) @@ -96,8 +96,8 @@ } - - + + protected: - + ParameterOutput& operator = (const ParameterOutput&) { return *this; } @@ -117,5 +117,5 @@ int column=0; - + for(Iterator itr=first; itr!=last; @@ -123,7 +123,7 @@ { if (column==0) fw.indent(); - + fw << *itr; - + ++column; if (column==noItemsPerLine) @@ -138,8 +138,8 @@ } if (column!=0) fw << std::endl; - + fw.moveOut(); fw.indent()<<"}"< @@ -30,5 +30,5 @@ class OSGDB_EXPORT SharedStateManager : public osg::NodeVisitor { - public: + public: enum ShareMode @@ -50,7 +50,7 @@ META_NodeVisitor("osgDB","SharedStateManager") - + void setShareMode(unsigned int mode); - + unsigned int getShareMode() { return _shareMode; } @@ -109,5 +109,5 @@ } }; - + // Lists of shared objects typedef std::set< osg::ref_ptr, CompareStateAttributes > TextureSet; @@ -130,5 +130,5 @@ bool _shareStateSet[3]; - // Share connection mutex + // Share connection mutex OpenThreads::Mutex *_mutex; Index: /OpenSceneGraph/trunk/include/osgDB/FileCache =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/FileCache (revision 12139) +++ /OpenSceneGraph/trunk/include/osgDB/FileCache (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -26,5 +26,5 @@ class OSGDB_EXPORT FileCache : public osg::Referenced { - public: + public: FileCache(const std::string& path); Index: /OpenSceneGraph/trunk/include/osgDB/DatabaseRevisions =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/DatabaseRevisions (revision 12139) +++ /OpenSceneGraph/trunk/include/osgDB/DatabaseRevisions (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgDB/ObjectWrapper =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/ObjectWrapper (revision 12139) +++ /OpenSceneGraph/trunk/include/osgDB/ObjectWrapper (revision 13041) @@ -48,9 +48,9 @@ typedef std::vector< osg::ref_ptr > SerializerList; typedef std::vector< osg::ref_ptr > FinishedObjectReadCallbackList; - + ObjectWrapper( osg::Object* proto, const std::string& name, const std::string& associates ); void setUpdatedVersion( int ver ) { _version = ver; } - + const osg::Object* getProto() const { return _proto.get(); } const std::string& getName() const { return _name; } @@ -69,5 +69,5 @@ void resetSchema() { if ( _backupSerializers.size()>0 ) _serializers = _backupSerializers; } - + protected: ObjectWrapper() : _version(0) {} Index: /OpenSceneGraph/trunk/include/osgDB/StreamOperator =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/StreamOperator (revision 13011) +++ /OpenSceneGraph/trunk/include/osgDB/StreamOperator (revision 13041) @@ -19,5 +19,5 @@ OutputIterator() : _out(0) {} virtual ~OutputIterator() {} - + void setStream( std::ostream* ostream ) { _out = ostream; } std::ostream* getStream() { return _out; } @@ -25,5 +25,5 @@ virtual bool isBinary() const = 0; - + virtual void writeBool( bool b ) = 0; virtual void writeChar( char c ) = 0; @@ -40,5 +40,5 @@ virtual void writeStream( std::ostream& (*fn)(std::ostream&) ) = 0; virtual void writeBase( std::ios_base& (*fn)(std::ios_base&) ) = 0; - + virtual void writeGLenum( const ObjectGLenum& value ) = 0; virtual void writeProperty( const ObjectProperty& prop ) = 0; @@ -46,7 +46,7 @@ virtual void writeCharArray( const char* s, unsigned int size ) = 0; virtual void writeWrappedString( const std::string& str ) = 0; - + virtual void flush() { _out->flush(); } - + protected: // Return true if the manipulator is std::endl @@ -72,5 +72,5 @@ InputIterator() : _in(0), _inputStream(0), _byteSwap(0), _failed(false) {} virtual ~InputIterator() {} - + void setStream( std::istream* istream ) { _in = istream; } std::istream* getStream() { return _in; } @@ -86,7 +86,7 @@ void checkStream() const { if (_in->rdstate()&_in->failbit) _failed = true; } bool isFailed() const { return _failed; } - + virtual bool isBinary() const = 0; - + virtual void readBool( bool& b ) = 0; virtual void readChar( char& c ) = 0; @@ -104,5 +104,5 @@ virtual void readStream( std::istream& (*fn)(std::istream&) ) = 0; virtual void readBase( std::ios_base& (*fn)(std::ios_base&) ) = 0; - + virtual void readGLenum( ObjectGLenum& value ) = 0; virtual void readProperty( ObjectProperty& prop ) = 0; @@ -110,5 +110,5 @@ virtual void readCharArray( char* s, unsigned int size ) = 0; virtual void readWrappedString( std::string& str ) = 0; - + virtual bool matchString( const std::string& /*str*/ ) { return false; } virtual void advanceToCurrentEndBracket() {} Index: /OpenSceneGraph/trunk/include/osgDB/DynamicLibrary =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/DynamicLibrary (revision 5328) +++ /OpenSceneGraph/trunk/include/osgDB/DynamicLibrary (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -32,5 +32,5 @@ typedef void* HANDLE; typedef void* PROC_ADDRESS; - + /** returns a pointer to a DynamicLibrary object on successfully * opening of library returns NULL on failure. @@ -61,7 +61,7 @@ /** disallow copy operator.*/ DynamicLibrary& operator = (const DynamicLibrary&) { return *this; } - + /** Disallow public construction so that users have to go - * through loadLibrary() above which returns NULL on + * through loadLibrary() above which returns NULL on * failure, a valid DynamicLibrary object on success. */ Index: /OpenSceneGraph/trunk/include/osgDB/OutputStream =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/OutputStream (revision 12410) +++ /OpenSceneGraph/trunk/include/osgDB/OutputStream (revision 13041) @@ -42,8 +42,8 @@ } } - + const std::string& getField() const { return _field; } const std::string& getError() const { return _error; } - + protected: std::string _field; @@ -56,5 +56,5 @@ typedef std::map ArrayMap; typedef std::map ObjectMap; - + enum WriteType { @@ -64,5 +64,5 @@ WRITE_OBJECT }; - + enum WriteImageHint { @@ -73,15 +73,15 @@ WRITE_EXTERNAL_FILE /*!< Write Image::data() to disk and use it as external file */ }; - + OutputStream( const osgDB::Options* options ); virtual ~OutputStream(); - + bool isBinary() const { return _out->isBinary(); } const std::string& getSchemaName() const { return _schemaName; } const osgDB::Options* getOptions() const { return _options.get(); } - + void setWriteImageHint( WriteImageHint hint ) { _writeImageHint = hint; } WriteImageHint getWriteImageHint() const { return _writeImageHint; } - + // Serialization related functions OutputStream& operator<<( bool b ) { _out->writeBool(b); return *this; } @@ -100,9 +100,9 @@ OutputStream& operator<<( std::ostream& (*fn)(std::ostream&) ) { _out->writeStream(fn); return *this; } OutputStream& operator<<( std::ios_base& (*fn)(std::ios_base&) ) { _out->writeBase(fn); return *this; } - + OutputStream& operator<<( const ObjectGLenum& value ) { _out->writeGLenum(value); return *this; } OutputStream& operator<<( const ObjectProperty& prop ) { _out->writeProperty(prop); return *this; } OutputStream& operator<<( const ObjectMark& mark ) { _out->writeMark(mark); return *this; } - + OutputStream& operator<<( const osg::Vec2b& v ); OutputStream& operator<<( const osg::Vec3b& v ); @@ -122,17 +122,17 @@ OutputStream& operator<<( const osg::Matrixf& mat ); OutputStream& operator<<( const osg::Matrixd& mat ); - + OutputStream& operator<<( const osg::Array* a ) { writeArray(a); return *this; } OutputStream& operator<<( const osg::Image* img ) { writeImage(img); return *this; } OutputStream& operator<<( const osg::PrimitiveSet* p ) { writePrimitiveSet(p); return *this; } OutputStream& operator<<( const osg::Object* obj ) { writeObject(obj); return *this; } - + OutputStream& operator<<( const osg::ref_ptr& ptr ) { writeArray(ptr.get()); return *this; } OutputStream& operator<<( const osg::ref_ptr& ptr ) { writeImage(ptr.get()); return *this; } OutputStream& operator<<( const osg::ref_ptr& ptr ) { writePrimitiveSet(ptr.get()); return *this; } - + template OutputStream& operator<<( const osg::ref_ptr& ptr ) { writeObject(ptr.get()); return *this; } - + // Convenient methods for writing void writeWrappedString( const std::string& str ) { _out->writeWrappedString(str); } @@ -149,5 +149,5 @@ void writeObject( const osg::Object* obj ); void writeObjectFields( const osg::Object* obj ); - + /// set an output iterator, used directly when not using OutputStream with a traditional file releated stream. void setOutputIterator( OutputIterator* oi ) { _out = oi; } @@ -157,22 +157,22 @@ void compress( std::ostream* ostream ); - + // Schema handlers void writeSchema( std::ostream& fout ); - + // Exception handlers inline void throwException( const std::string& msg ); const OutputException* getException() const { return _exception.get(); } - + protected: template void writeArrayImplementation( const T*, int write_size, unsigned int numInRow=1 ); - + unsigned int findOrCreateArrayID( const osg::Array* array, bool& newID ); unsigned int findOrCreateObjectID( const osg::Object* obj, bool& newID ); - + ArrayMap _arrayMap; ObjectMap _objectMap; - + WriteImageHint _writeImageHint; bool _useSchemaData; Index: /OpenSceneGraph/trunk/include/osgDB/AuthenticationMap =================================================================== --- /OpenSceneGraph/trunk/include/osgDB/AuthenticationMap (revision 12139) +++ /OpenSceneGraph/trunk/include/osgDB/AuthenticationMap (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -31,5 +31,5 @@ public: - /** Http authentication techniques, see libcurl docs for details on names and associated functionality.*/ + /** Http authentication techniques, see libcurl docs for details on names and associated functionality.*/ enum HttpAuthentication { @@ -58,19 +58,19 @@ { public: - + AuthenticationMap() {} - + virtual void addAuthenticationDetails(const std::string& path, AuthenticationDetails* details); virtual const AuthenticationDetails* getAuthenticationDetails(const std::string& path) const; - + protected: - + virtual ~AuthenticationMap() {} - + typedef std::map > AuthenticationDetailsMap; AuthenticationDetailsMap _authenticationMap; - + }; Index: /OpenSceneGraph/trunk/include/osgShadow/SoftShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/SoftShadowMap (revision 12139) +++ /OpenSceneGraph/trunk/include/osgShadow/SoftShadowMap (revision 13041) @@ -59,11 +59,11 @@ - /** Add a small bias to the z-value, this can reduce - * shadow acne problem. + /** Add a small bias to the z-value, this can reduce + * shadow acne problem. * This is the same as calling setPolygonOffset(osg::Vec2(bias,0)); - * Suitable values are 0-0.005 + * Suitable values are 0-0.005 * Default is 0. */ void setBias(float bias) { setPolygonOffset(osg::Vec2(bias,0)); } - + /** Return the bias value */ float getBias() const { return getPolygonOffset().x(); } @@ -72,10 +72,10 @@ protected: virtual ~SoftShadowMap(void) {}; - + /** Create the managed Uniforms */ void createUniforms(); void createShaders(); void initJittering(osg::StateSet *ss); - + osg::ref_ptr _softnessWidthUniform; osg::ref_ptr _jitteringScaleUniform; @@ -84,5 +84,5 @@ unsigned int _jitterTextureUnit; - + }; Index: /OpenSceneGraph/trunk/include/osgShadow/ProjectionShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/ProjectionShadowMap (revision 12188) +++ /OpenSceneGraph/trunk/include/osgShadow/ProjectionShadowMap (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -38,5 +38,5 @@ /** Classic OSG cloning constructor */ ProjectionShadowMap( - const ProjectionShadowMap& copy, + const ProjectionShadowMap& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : BaseClass(copy,copyop) { @@ -46,5 +46,5 @@ META_Object( osgShadow, ProjectionShadowMap ); - protected: + protected: /** Classic protected OSG destructor */ @@ -53,11 +53,11 @@ } - struct OSGSHADOW_EXPORT ViewData: public BaseClass::ViewData, + struct OSGSHADOW_EXPORT ViewData: public BaseClass::ViewData, public ShadowProjectionAlgorithmClass - { + { #if 0 - virtual void init( ThisClass * st, osgUtil::CullVisitor * cv ); + virtual void init( ThisClass * st, osgUtil::CullVisitor * cv ); { - BaseClass::ViewData::init( st, cv ); + BaseClass::ViewData::init( st, cv ); } #endif Index: /OpenSceneGraph/trunk/include/osgShadow/Export =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/Export (revision 12221) +++ /OpenSceneGraph/trunk/include/osgShadow/Export (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -38,5 +38,5 @@ #else # define OSGSHADOW_EXPORT -#endif +#endif /** Index: /OpenSceneGraph/trunk/include/osgShadow/MinimalDrawBoundsShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/MinimalDrawBoundsShadowMap (revision 12188) +++ /OpenSceneGraph/trunk/include/osgShadow/MinimalDrawBoundsShadowMap (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -24,5 +24,5 @@ class OSGSHADOW_EXPORT MinimalDrawBoundsShadowMap - : public MinimalShadowMap + : public MinimalShadowMap { public : @@ -35,7 +35,7 @@ MinimalDrawBoundsShadowMap(); - /** Classic OSG cloning constructor */ + /** Classic OSG cloning constructor */ MinimalDrawBoundsShadowMap( - const MinimalDrawBoundsShadowMap& mdbsm, + const MinimalDrawBoundsShadowMap& mdbsm, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); @@ -60,5 +60,5 @@ osg::RefMatrix * getShadowCameraProjectionMatrixPtr( void ) - { return _projection.get(); } + { return _projection.get(); } virtual void init( ThisClass * st, osgUtil::CullVisitor * cv ); @@ -101,5 +101,5 @@ struct CameraCullCallback: public osg::NodeCallback { - CameraCullCallback(ViewData * vd, osg::NodeCallback * nc): _vd(vd), _nc(nc) + CameraCullCallback(ViewData * vd, osg::NodeCallback * nc): _vd(vd), _nc(nc) { } @@ -111,5 +111,5 @@ if( _nc.valid() ) _nc->operator()(node,nv); - else + else traverse(node,nv); Index: /OpenSceneGraph/trunk/include/osgShadow/ShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/ShadowMap (revision 9540) +++ /OpenSceneGraph/trunk/include/osgShadow/ShadowMap (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -31,7 +31,7 @@ ShadowMap(const ShadowMap& es, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - + META_Object(osgShadow, ShadowMap); - + /** Set the texture unit that the shadow texture will be applied on.*/ void setTextureUnit(unsigned int unit); @@ -68,5 +68,5 @@ /** Add a shader to internal list, will be used instead of the default ones */ inline void addShader(osg::Shader* shader) { _shaderList.push_back(shader); } - + /** Reset internal shader list */ inline void clearShaderList() { _shaderList.clear(); } @@ -74,14 +74,14 @@ /** initialize the ShadowedScene and local cached data structures.*/ virtual void init(); - + /** run the update traversal of the ShadowedScene and update any loca chached data structures.*/ virtual void update(osg::NodeVisitor& nv); - + /** run the cull traversal of the ShadowedScene and set up the rendering for this ShadowTechnique.*/ virtual void cull(osgUtil::CullVisitor& cv); - + /** Clean scene graph from any shadow technique specific nodes, state and drawables.*/ virtual void cleanSceneGraph(); - + // debug methods @@ -95,5 +95,5 @@ virtual void createShaders(); - + // forward declare, interface and implementation provided in ShadowMap.cpp class DrawableDrawWithDepthShadowComparisonOffCallback; Index: /OpenSceneGraph/trunk/include/osgShadow/Version =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/Version (revision 7365) +++ /OpenSceneGraph/trunk/include/osgShadow/Version (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ Index: /OpenSceneGraph/trunk/include/osgShadow/MinimalCullBoundsShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/MinimalCullBoundsShadowMap (revision 12188) +++ /OpenSceneGraph/trunk/include/osgShadow/MinimalCullBoundsShadowMap (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -36,5 +36,5 @@ /** Classic OSG cloning constructor */ MinimalCullBoundsShadowMap( - const MinimalCullBoundsShadowMap& mcbsm, + const MinimalCullBoundsShadowMap& mcbsm, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); Index: /OpenSceneGraph/trunk/include/osgShadow/DebugShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/DebugShadowMap (revision 12188) +++ /OpenSceneGraph/trunk/include/osgShadow/DebugShadowMap (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -30,7 +30,7 @@ /** Class used as a layer for debuging resources used by derived xxxShadowMap classes. -As designed by its base ViewDepndentShadowTechnique, DebugShadowMap serves mainly as container of +As designed by its base ViewDepndentShadowTechnique, DebugShadowMap serves mainly as container of DebugShadowMap::ViewData objects. Most of the debuging support work is done by these objects. -DebugShadowMap technique only initializes them in initViewDependentData method. +DebugShadowMap technique only initializes them in initViewDependentData method. Debuging outputs present: @@ -39,5 +39,5 @@ */ -class OSGSHADOW_EXPORT DebugShadowMap : public ViewDependentShadowTechnique +class OSGSHADOW_EXPORT DebugShadowMap : public ViewDependentShadowTechnique { public : @@ -47,5 +47,5 @@ They are always based on some underlying level base Technique and they always - derive their ViewData from ViewData structure defined in underlying base Technique. + derive their ViewData from ViewData structure defined in underlying base Technique. I use some typedefs to make these inheritance patterns easier to declare/define. @@ -99,12 +99,12 @@ struct OSGSHADOW_EXPORT ViewData: public BaseClass::ViewData { - /** - Texture used as ShadowMap - initialized by derived classes. - But it has to be defined now since DebugShadowMap::ViewData methods use it + /** + Texture used as ShadowMap - initialized by derived classes. + But it has to be defined now since DebugShadowMap::ViewData methods use it */ osg::ref_ptr< osg::Texture > _texture; - /** + /** Camera used to render ShadowMap - initialized by derived classes. - But it has to be defined now since DebugShadowMap::ViewData methods use it + But it has to be defined now since DebugShadowMap::ViewData methods use it */ osg::ref_ptr< osg::Camera > _camera; @@ -146,5 +146,5 @@ std::map< std::string, osg::BoundingBox > _boundingBoxMap; - osg::ref_ptr _cameraDebugHUD; + osg::ref_ptr _cameraDebugHUD; bool getDebugDraw() { return *_doDebugDrawPtr; } @@ -159,10 +159,10 @@ virtual void cullDebugGeometry( ); - virtual void updateDebugGeometry( const osg::Camera * screenCam, + virtual void updateDebugGeometry( const osg::Camera * screenCam, const osg::Camera * shadowCam ); void setDebugPolytope( const char * name, const ConvexPolyhedron & polytope = *(ConvexPolyhedron*)( NULL ), - osg::Vec4 colorOutline = osg::Vec4(0,0,0,0), + osg::Vec4 colorOutline = osg::Vec4(0,0,0,0), osg::Vec4 colorInside = osg::Vec4(0,0,0,0) ); @@ -172,7 +172,7 @@ static osg::Vec3d computeShadowTexelToPixelError - ( const osg::Matrix & mvpwView, + ( const osg::Matrix & mvpwView, const osg::Matrix & mvpwShadow, - const osg::Vec3d & vWorld, + const osg::Vec3d & vWorld, const osg::Vec3d & vDelta = osg::Vec3d( 0.01,0.01,0.01 ) ); Index: /OpenSceneGraph/trunk/include/osgShadow/MinimalShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/MinimalShadowMap (revision 12188) +++ /OpenSceneGraph/trunk/include/osgShadow/MinimalShadowMap (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -22,5 +22,5 @@ namespace osgShadow { -class OSGSHADOW_EXPORT MinimalShadowMap : public StandardShadowMap +class OSGSHADOW_EXPORT MinimalShadowMap : public StandardShadowMap { public : @@ -35,5 +35,5 @@ /** Classic OSG cloning constructor */ MinimalShadowMap( - const MinimalShadowMap& msm, + const MinimalShadowMap& msm, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); @@ -70,5 +70,5 @@ { _shadowReceivingCoarseBoundAccuracy = accuracy; } - ShadowReceivingCoarseBoundAccuracy + ShadowReceivingCoarseBoundAccuracy getShadowReceivingCoarseBoundAccuracy() const { return _shadowReceivingCoarseBoundAccuracy; } @@ -78,23 +78,23 @@ virtual ~MinimalShadowMap(void); - protected: + protected: // Matrix modellingSpaceToWorld and its inverse // are used to define Modelling Space where shadowed scene drawables // have minimal (smallest possible extent) bounding boxes. - // Computing visible shadow range in this space + // Computing visible shadow range in this space // allows for optimal use of ShadowMap resolution. // By default it is set to identity ie computations are in world space. - // But it should be set to ElipsoidModel::localToWorld + // But it should be set to ElipsoidModel::localToWorld // when scene objects are put on earth ellipsoid surface. - // Other scenarios are also possible for example when models are + // Other scenarios are also possible for example when models are // built in XZY space which would require identity matrix with swapped colums osg::Matrix _modellingSpaceToWorld; float _maxFarPlane; - float _minLightMargin; - ShadowReceivingCoarseBoundAccuracy _shadowReceivingCoarseBoundAccuracy; + float _minLightMargin; + ShadowReceivingCoarseBoundAccuracy _shadowReceivingCoarseBoundAccuracy; struct OSGSHADOW_EXPORT ViewData: public BaseClass::ViewData @@ -116,5 +116,5 @@ virtual void cullShadowReceivingScene( ); - virtual void aimShadowCastingCamera( + virtual void aimShadowCastingCamera( const osg::BoundingSphere &bounds, const osg::Light *light, @@ -132,11 +132,11 @@ ( const osg::Camera* cameraMain, osg::Camera* cameraShadow, int pass = 1 ); - void cutScenePolytope( const osg::Matrix & matrix, + void cutScenePolytope( const osg::Matrix & matrix, const osg::Matrix & inverse, - const osg::BoundingBox &bb = + const osg::BoundingBox &bb = osg::BoundingBox(-1,-1,-1,1,1,1) ); osg::BoundingBox computeScenePolytopeBounds - ( const osg::Matrix & m = *(osg::Matrix*)(NULL) ); + ( const osg::Matrix & m = *(osg::Matrix*)(NULL) ); // Utility methods for adjusting projection matrices Index: /OpenSceneGraph/trunk/include/osgShadow/ShadowTechnique =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/ShadowTechnique (revision 12782) +++ /OpenSceneGraph/trunk/include/osgShadow/ShadowTechnique (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -35,5 +35,5 @@ ShadowTechnique(const ShadowTechnique& es, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - + META_Object(osgShadow, ShadowTechnique); @@ -41,19 +41,19 @@ const ShadowedScene* getShadowedScene() const { return _shadowedScene; } - + /** initialize the ShadowedScene and local cached data structures.*/ virtual void init(); - + /** run the update traversal of the ShadowedScene and update any local cached data structures.*/ virtual void update(osg::NodeVisitor& nv); - + /** run the cull traversal of the ShadowedScene and set up the rendering for this ShadowTechnique.*/ virtual void cull(osgUtil::CullVisitor& cv); - + /** Clean scene graph from any shadow technique specific nodes, state and drawables.*/ virtual void cleanSceneGraph(); virtual void traverse(osg::NodeVisitor& nv); - + /** Dirty so that cached data structures are updated.*/ virtual void dirty() { _dirty = true; } @@ -77,10 +77,10 @@ virtual ~ShadowTechnique(); - + friend class ShadowedScene; - + ShadowedScene* _shadowedScene; bool _dirty; - + }; Index: /OpenSceneGraph/trunk/include/osgShadow/LightSpacePerspectiveShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/LightSpacePerspectiveShadowMap (revision 12188) +++ /OpenSceneGraph/trunk/include/osgShadow/LightSpacePerspectiveShadowMap (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -32,5 +32,5 @@ class LispSM; -class OSGSHADOW_EXPORT LightSpacePerspectiveShadowMapAlgorithm +class OSGSHADOW_EXPORT LightSpacePerspectiveShadowMapAlgorithm { public: @@ -40,5 +40,5 @@ void operator() ( const osgShadow::ConvexPolyhedron* hullShadowedView, - const osg::Camera* cameraMain, + const osg::Camera* cameraMain, osg::Camera* cameraShadow ) const; @@ -47,5 +47,5 @@ }; -// Optimized for draw traversal shadow bounds +// Optimized for draw traversal shadow bounds class OSGSHADOW_EXPORT LightSpacePerspectiveShadowMapDB: public ProjectionShadowMap< MinimalDrawBoundsShadowMap, LightSpacePerspectiveShadowMapAlgorithm > { @@ -61,5 +61,5 @@ /** Classic OSG cloning constructor */ LightSpacePerspectiveShadowMapDB( - const LightSpacePerspectiveShadowMapDB& copy, + const LightSpacePerspectiveShadowMapDB& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : BaseClass(copy,copyop) { @@ -70,5 +70,5 @@ }; -// Optimized for cull traversal shadow bounds +// Optimized for cull traversal shadow bounds class OSGSHADOW_EXPORT LightSpacePerspectiveShadowMapCB: public ProjectionShadowMap< MinimalCullBoundsShadowMap, LightSpacePerspectiveShadowMapAlgorithm > { @@ -77,5 +77,5 @@ typedef ProjectionShadowMap< MinimalCullBoundsShadowMap, LightSpacePerspectiveShadowMapAlgorithm > BaseClass; - /** Classic OSG constructor */ + /** Classic OSG constructor */ LightSpacePerspectiveShadowMapCB() { @@ -84,5 +84,5 @@ /** Classic OSG cloning constructor */ LightSpacePerspectiveShadowMapCB( - const LightSpacePerspectiveShadowMapCB& copy, + const LightSpacePerspectiveShadowMapCB& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : BaseClass(copy,copyop) { @@ -93,5 +93,5 @@ }; -// Optimized for view frustum bounds +// Optimized for view frustum bounds class OSGSHADOW_EXPORT LightSpacePerspectiveShadowMapVB: public ProjectionShadowMap< MinimalShadowMap, LightSpacePerspectiveShadowMapAlgorithm > { @@ -107,5 +107,5 @@ /** Classic OSG cloning constructor */ LightSpacePerspectiveShadowMapVB( - const LightSpacePerspectiveShadowMapVB& copy, + const LightSpacePerspectiveShadowMapVB& copy, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : BaseClass(copy,copyop) { Index: /OpenSceneGraph/trunk/include/osgShadow/StandardShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/StandardShadowMap (revision 12188) +++ /OpenSceneGraph/trunk/include/osgShadow/StandardShadowMap (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -28,5 +28,5 @@ typedef StandardShadowMap ThisClass; /** Convenient typedef used in definition of ViewData struct and methods */ - typedef DebugShadowMap BaseClass; + typedef DebugShadowMap BaseClass; /** Classic OSG constructor */ @@ -34,5 +34,5 @@ /** Classic OSG cloning constructor */ - StandardShadowMap(const StandardShadowMap& ssm, + StandardShadowMap(const StandardShadowMap& ssm, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); @@ -54,22 +54,22 @@ // Texture Indices are changed by search and replace on shader source // Carefully order these calls when changing both base and shadow indices - // In worst case when intend to swap indices - // one will have to call these methods more than once - // with one extra pass to change index to unused value to avoid + // In worst case when intend to swap indices + // one will have to call these methods more than once + // with one extra pass to change index to unused value to avoid // unwanted superfluous replace: // // Example: Imagine we want to swap base(0) and shadow(1) indices: // We have to do an extra step to make sure both do not end up as 1 - // + // // // initialy change base to something else than 1 - // setBaseTextureCoordIndex( 100 ); + // setBaseTextureCoordIndex( 100 ); // // now search and replace all gl_TexCord[1] to gl_TexCord[0] // setShadowTextureCoordIndex( 0 ); // // finally change base from 100 to 0 - // setBaseTextureCoordIndex( 1 ); + // setBaseTextureCoordIndex( 1 ); void setBaseTextureCoordIndex( unsigned int index ) { updateTextureCoordIndices( _baseTextureCoordIndex, index ); - _baseTextureCoordIndex = index; } + _baseTextureCoordIndex = index; } unsigned int getBaseTextureCoordIndex( void ) const @@ -97,12 +97,12 @@ osg::Light* getLight( void ) { return _light.get(); } - + const osg::Light* getLight( void ) const { return _light.get(); } - osg::Shader * getShadowVertexShader() + osg::Shader * getShadowVertexShader() { return _shadowVertexShader.get(); } - osg::Shader * getShadowFragmentShader() + osg::Shader * getShadowFragmentShader() { return _shadowFragmentShader.get(); } @@ -116,8 +116,8 @@ { _shadowVertexShader = shader; } - void setShadowFragmentShader( osg::Shader * shader ) + void setShadowFragmentShader( osg::Shader * shader ) { _shadowFragmentShader = shader; } - void setMainVertexShader( osg::Shader * shader ) + void setMainVertexShader( osg::Shader * shader ) { _mainVertexShader = shader; } @@ -168,9 +168,9 @@ virtual void cull( ); - virtual void aimShadowCastingCamera( + virtual void aimShadowCastingCamera( const osg::BoundingSphere &bounds, const osg::Light *light, const osg::Vec4 &worldLightPos, - const osg::Vec3 &worldLightDir, + const osg::Vec3 &worldLightDir, const osg::Vec3 &worldLightUp = osg::Vec3(0,1,0) ); @@ -186,9 +186,9 @@ virtual void aimShadowCastingCamera( const osg::Light *light, const osg::Vec4 &worldLightPos, - const osg::Vec3 &worldLightDir, + const osg::Vec3 &worldLightDir, const osg::Vec3 &worldLightUp = osg::Vec3(0,1,0) ); }; - + friend struct ViewData; Index: /OpenSceneGraph/trunk/include/osgShadow/ViewDependentShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/ViewDependentShadowMap (revision 12887) +++ /OpenSceneGraph/trunk/include/osgShadow/ViewDependentShadowMap (revision 13041) @@ -62,8 +62,8 @@ osg::Matrixd projectionMatrix; osg::Matrixd modelViewMatrix; - + typedef std::vector Vertices; Vertices corners; - + typedef std::vector Indices; typedef std::vector Faces; @@ -82,5 +82,5 @@ // forward declare class ViewDependentData; - + struct OSGSHADOW_EXPORT LightData : public osg::Referenced { @@ -88,7 +88,7 @@ virtual void setLightData(osg::RefMatrix* lm, const osg::Light* l, const osg::Matrixd& modelViewMatrix); - + ViewDependentData* _viewDependentData; - + osg::ref_ptr lightMatrix; osg::ref_ptr light; @@ -102,5 +102,5 @@ ActiveTextureUnits textureUnits; }; - + typedef std::list< osg::ref_ptr > LightDataList; @@ -112,5 +112,5 @@ ViewDependentData* _viewDependentData; - + unsigned int _textureUnit; osg::ref_ptr _texture; @@ -120,5 +120,5 @@ typedef std::list< osg::ref_ptr > ShadowDataList; - + class OSGSHADOW_EXPORT ViewDependentData : public osg::Referenced @@ -134,5 +134,5 @@ osg::StateSet* getStateSet() { return _stateset.get(); } - + virtual void releaseGLObjects(osg::State* = 0) const; @@ -163,5 +163,5 @@ virtual bool adjustPerspectiveShadowMapCameraSettings(osgUtil::RenderStage* renderStage, Frustum& frustum, LightData& positionedLight, osg::Camera* camera); - + virtual bool assignTexGenSettings(osgUtil::CullVisitor* cv, osg::Camera* camera, unsigned int textureUnit, osg::TexGen* texgen); @@ -186,5 +186,5 @@ osg::ref_ptr _fallbackBaseTexture; osg::ref_ptr _fallbackShadowMapTexture; - + typedef std::vector< osg::ref_ptr > Uniforms; Uniforms _uniforms; Index: /OpenSceneGraph/trunk/include/osgShadow/ConvexPolyhedron =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/ConvexPolyhedron (revision 12139) +++ /OpenSceneGraph/trunk/include/osgShadow/ConvexPolyhedron (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. * @@ -26,6 +26,6 @@ // Honors should go to Robert Osfield for writing such useful piece of code. // First incarnations of my ConvexPolyhedron were derived from CustomPolytope. -// Later I made a number of modifications aimed at improving convex hull -// precision of intersection & extrusion operations and ended up with code +// Later I made a number of modifications aimed at improving convex hull +// precision of intersection & extrusion operations and ended up with code // so mixed that I decided to rewrite it as separate class. //////////////////////////////////////////////////////////////////////////////// @@ -68,5 +68,5 @@ ( const Face & face0, const Face & face1, Face & face ); - void mergeCoplanarFaces( const double & plane_normal_dot_tolerance = 0.0, + void mergeCoplanarFaces( const double & plane_normal_dot_tolerance = 0.0, const double & plane_distance_tolerance = 0.0 ); @@ -76,5 +76,5 @@ static int pointsColinear ( const osg::Vec3d & va, const osg::Vec3d & vb, const osg::Vec3d & vc, - const double & edge_normal_dot_tolerance = 0.0, + const double & edge_normal_dot_tolerance = 0.0, const double & null_edge_length_tolerance = 0.0 ); Index: /OpenSceneGraph/trunk/include/osgShadow/ShadowSettings =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/ShadowSettings (revision 12887) +++ /OpenSceneGraph/trunk/include/osgShadow/ShadowSettings (revision 13041) @@ -38,5 +38,5 @@ unsigned int getBaseShadowTextureUnit() const { return _baseShadowTextureUnit; } - /** Set whether to use osg::StateAttribute::OVERRIDE for the shadow map texture. + /** Set whether to use osg::StateAttribute::OVERRIDE for the shadow map texture. * Enabling override will force the shadow map texture to override any texture set on the shadow maps texture unit.*/ void setUseOverrideForShadowMapTexture(bool useOverride) { _useShadowMapTextureOverride = useOverride; } @@ -73,5 +73,5 @@ double getPerspectiveShadowMapCutOffAngle() const { return _perspectiveShadowMapCutOffAngle; } - + void setNumShadowMapsPerLight(unsigned int numShadowMaps) { _numShadowMapsPerLight = numShadowMaps; } unsigned int getNumShadowMapsPerLight() const { return _numShadowMapsPerLight; } @@ -85,5 +85,5 @@ void setMultipleShadowMapHint(MultipleShadowMapHint hint) { _multipleShadowMapHint = hint; } MultipleShadowMapHint getMultipleShadowMapHint() const { return _multipleShadowMapHint; } - + enum ShaderHint @@ -96,8 +96,8 @@ void setShaderHint(ShaderHint shaderHint) { _shaderHint = shaderHint; } ShaderHint getShaderHint() const { return _shaderHint; } - + void setDebugDraw(bool debugDraw) { _debugDraw = debugDraw; } bool getDebugDraw() const { return _debugDraw; } - + protected: @@ -115,5 +115,5 @@ unsigned int _numShadowMapsPerLight; MultipleShadowMapHint _multipleShadowMapHint; - + ShaderHint _shaderHint; bool _debugDraw; Index: /OpenSceneGraph/trunk/include/osgShadow/ShadowTexture =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/ShadowTexture (revision 6217) +++ /OpenSceneGraph/trunk/include/osgShadow/ShadowTexture (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -29,7 +29,7 @@ ShadowTexture(const ShadowTexture& es, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - + META_Object(osgShadow, ShadowTexture); - + /** Set the texture unit that the shadow texture will be applied on.*/ void setTextureUnit(unsigned int unit); @@ -37,18 +37,18 @@ /** Get the texture unit that the shadow texture will be applied on.*/ unsigned int getTextureUnit() const { return _textureUnit; } - - + + /** initialize the ShadowedScene and local cached data structures.*/ virtual void init(); - + /** run the update traversal of the ShadowedScene and update any loca chached data structures.*/ virtual void update(osg::NodeVisitor& nv); - + /** run the cull traversal of the ShadowedScene and set up the rendering for this ShadowTechnique.*/ virtual void cull(osgUtil::CullVisitor& cv); - + /** Clean scene graph from any shadow technique specific nodes, state and drawables.*/ virtual void cleanSceneGraph(); - + protected : Index: /OpenSceneGraph/trunk/include/osgShadow/ShadowedScene =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/ShadowedScene (revision 12782) +++ /OpenSceneGraph/trunk/include/osgShadow/ShadowedScene (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -29,19 +29,19 @@ { public: - + ShadowedScene(ShadowTechnique* st=0); ShadowedScene(const ShadowedScene& es, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - + META_Node(osgShadow, ShadowedScene); - + virtual void traverse(osg::NodeVisitor& nv); - + void setReceivesShadowTraversalMask(unsigned int mask) { _receivesShadowTraversalMask = mask; } unsigned int getReceivesShadowTraversalMask() const { return _receivesShadowTraversalMask; } - + void setCastsShadowTraversalMask(unsigned int mask) { _castsShadowTraversalMask = mask; } unsigned int getCastsShadowTraversalMask() const { return _castsShadowTraversalMask; } - + void setShadowSettings(ShadowSettings* ss); ShadowSettings* getShadowSettings() { return _shadowSettings.get(); } @@ -55,7 +55,7 @@ void cleanSceneGraph(); - /** Dirty any cache data structures held in the attached ShadowTechnqiue.*/ + /** Dirty any cache data structures held in the attached ShadowTechnqiue.*/ void dirty(); - + /** Resize any per context GLObject buffers to specified size. */ virtual void resizeGLObjectBuffers(unsigned int maxSize); @@ -75,5 +75,5 @@ osg::ref_ptr _shadowSettings; osg::ref_ptr _shadowTechnique; - + }; Index: /OpenSceneGraph/trunk/include/osgShadow/ParallelSplitShadowMap =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/ParallelSplitShadowMap (revision 12139) +++ /OpenSceneGraph/trunk/include/osgShadow/ParallelSplitShadowMap (revision 13041) @@ -69,5 +69,5 @@ /** Set the texture resolution */ inline void setTextureResolution(unsigned int resolution) { _resolution = resolution; } - + /** Get the texture resolution */ inline unsigned int getTextureResolution() const { return _resolution; } @@ -87,5 +87,5 @@ /** Set min near distance for splits */ inline void setMinNearDistanceForSplits(double nd){ _split_min_near_dist=nd; } - + /** Get min near distance for splits */ inline double getMinNearDistanceForSplits() const { return _split_min_near_dist; } @@ -96,5 +96,5 @@ */ inline void setUserLight(osg::Light* light) { _userLight = light; } - + /** get the user defined light for shadow simulation */ inline const osg::Light* getUserLight() const { return _userLight.get(); } @@ -102,5 +102,5 @@ /** Set the values for the ambient bias the shader will use.*/ void setAmbientBias(const osg::Vec2& ambientBias ); - + /** Get the values for the ambient bias the shader will use.*/ const osg::Vec2& getAmbientBias() const { return _ambientBias; } @@ -130,5 +130,5 @@ /** set split calculation mode */ inline void setSplitCalculationMode(SplitCalcMode scm=SPLIT_EXP) { _SplitCalcMode = scm; } - + /** get split calculation mode */ inline SplitCalcMode getSplitCalculationMode() const { return _SplitCalcMode; } Index: /OpenSceneGraph/trunk/include/osgShadow/OccluderGeometry =================================================================== --- /OpenSceneGraph/trunk/include/osgShadow/OccluderGeometry (revision 7038) +++ /OpenSceneGraph/trunk/include/osgShadow/OccluderGeometry (revision 13041) @@ -1,12 +1,12 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or * (at your option) any later version. The full license is in LICENSE file * included with this distribution, and on the openscenegraph.org website. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ @@ -30,5 +30,5 @@ * OccluderGeometry supports the computation of silhouette edges and shadow volume geometries, as well as use as geometry that one can rendering * into a shadow map or end caps for the ZP+ algorithm. OccluderGeometry may be of the same resolution as an underlying geometry that it - * represents, or can be of lower resolution and combine manager seperate geometries together into a single shadow casting object. + * represents, or can be of lower resolution and combine manager seperate geometries together into a single shadow casting object. * OccluderGeometry may be attached as UserData to Nodes or to Drawables. */ class OSGSHADOW_EXPORT OccluderGeometry : public osg::Drawable @@ -38,5 +38,5 @@ OccluderGeometry(const OccluderGeometry& oc, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - + virtual Object* cloneType() const { return new OccluderGeometry(); } virtual Object* clone(const osg::CopyOp& copyop) const { return new OccluderGeometry(*this,copyop); } @@ -44,16 +44,16 @@ virtual const char* libraryName() const { return "osgShadow"; } virtual const char* className() const { return "OccluderGeometry"; } - + /** Compute an occluder geometry containing all the geometry in specified subgraph.*/ void computeOccluderGeometry(osg::Node* subgraph, osg::Matrix* matrix=0, float sampleRatio=1.0f); - + /** Compute an occlud