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

Fixes to help C# binding dev.

Browse Source
This commit is contained in:
Robert Osfield 2007-05-26 15:49:35 +00:00
parent 27a1406819
commit 005268e982
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/CullSettings
View File

@ -52,7 +52,7 @@ class OSG_EXPORT CullSettings
}
void setDefaults();
virtual void setDefaults();
enum VariablesMask

7
include/osgUtil/SceneView
View File

@ -52,10 +52,13 @@ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings
COMPILE_GLOBJECTS_AT_INIT
};
/* Set defaults. */
virtual void setDefaults() { setDefaults(STANDARD_SETTINGS); }
/** Set scene view to use default global state, light, camera
* and render visitor.
*/
void setDefaults(unsigned int options = STANDARD_SETTINGS);
virtual void setDefaults(unsigned int options);
/** Set the camera used to represent the camera view of this SceneView.*/
void setCamera(osg::Camera* camera);
@ -423,7 +426,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings
virtual osg::Matrixd computeRightEyeViewImplementation(const osg::Matrixd& view) const;
/** Inherit the local cull settings variable from specified CullSettings object, according to the inheritance mask.*/
void inheritCullSettings(const CullSettings& settings) { inheritCullSettings(settings, _inheritanceMask); }
virtual void inheritCullSettings(const CullSettings& settings) { inheritCullSettings(settings, _inheritanceMask); }
/** Inherit the local cull settings variable from specified CullSettings object, according to the inheritance mask.*/
virtual void inheritCullSettings(const osg::CullSettings& settings, unsigned int inheritanceMask);

2
src/osgUtil/SceneView.cpp
View File

@ -159,6 +159,8 @@ SceneView::~SceneView()
void SceneView::setDefaults(unsigned int options)
{
osg::CullSettings::setDefaults();
_camera->getProjectionMatrix().makePerspective(50.0f,1.4f,1.0f,10000.0f);
_camera->getViewMatrix().makeIdentity();