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

Added ShadowMap::s/getAmbientBias, updated NEWS and wrappers

Browse Source
This commit is contained in:
Robert Osfield
2007-06-15 12:59:22 +00:00
parent f4c4ba9d10
commit 08d3b13430
4 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
NEWS.txt
View File

@@ -1,6 +1,42 @@
OSG News
========
!!![OpenSceneGraph] 2.0 relase introduces new osgViewer, osgShadow and osgManipulator libraries, new build system, improved mulit-core, multi-GPU support.
PERTHSHIRE, Scotland - 15th June 2007 - [=OpenSceneGraph=] Professional Services announces the release of [=OpenSceneGraph=] 2.0, the industry's leading open source scene graph technology, designed to accelerate application development and improve 3D graphics performance. [=OpenSceneGraph=] 1.2, written entirely in Standard C++ and built upon [=OpenGL=], offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets a real time visualization tool which rivals established commercial scene graph toolkits in functionality and performance. [=OpenSceneGraph=] 2.0 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and [=FreeBSD=] operating systems.
!!!Open-source development delivers industry-leading features and performance
[=OpenSceneGraph=] 2.0 release is the culmination of 8 years work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real world applications, and actively participating in its development, testing and refinement. The end result is a high quality library with a feature set relevant to application developers' needs. Features include:
The theme for the 2.0 release has been making the [=OpenSceneGraph=] easier to use, yet more flexible and powerful.
!!!Downloads and Licensing
[=OpenSceneGraph=] is open-source so full source code is provided, and can be copied, modified and used free of charge for commercial and non-commercial use. Access to the source allows end users greater flexibility in how they develop, debug and deploy their applications. They gain productivity and freedom by being able to leverage the tool chain in accordance with their own release cycles. Downloads of binaries and source can be found in the [[http://www.openscenegraph.com/osgwiki/pmwiki.php/Downloads/Downloads Downloads]] section of the openscenegraph.org website.
[=OpenSceneGraph=] is released under the [[http://www.openscenegraph.com/osgwiki/pmwiki.php/Legal/Legal [=OpenSceneGraph=] Public License]], which is based on the Lesser GNU Public License (LGPL), permitting the software to be used free of charge across the full spectrum of commercial and open source applications. Furthermore, it allows both static and dynamic linking of the [=OpenSceneGraph=] libraries without restricting the licensing of the user's software.
!!!OpenSceneGraph Books now available!
See http:://www.osgbooks.org
!!!Professional support and services
[=OpenSceneGraph=] project is backed up with professional services by [=OpenSceneGraph=] Professional Services, based in Scotland, and Skew-Matrix and Blue-Newt both based in the USA.
* Confidential Professional Support
* Bespoke development
* Consultancy
* Training
!!!Community support and contributions
The diverse and growing community of over 1700 developers is centered around the public osg-users mailing list, where members discuss how best to use [=OpenSceneGraph=], provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists.
The [=OpenSceneGraph=] project owes a great deal to the community for its development and support, in particular we wish to thank the [[http://openscenegraph.com/osgwiki/pmwiki.php/Documentation/Contributors 264 individuals]] from around the world that have directly contributed to the development and refinement of the [=OpenSceneGraph=] code base.
Robert Osfield\\
Project Lead and Proprietor [=OpenSceneGraph=] Professional Services
!!![=OpenSceneGraph=] 1.2 release introduces Windows 64bit and AIX support, COLLADA support, processor affinity and texture atlas builder.
PERTHSHIRE, Scotland - 12th September 2006 - [=OpenSceneGraph=] Professional Services announces the release of [=OpenSceneGraph=] 1.2, the industry's leading open source scene graph technology, designed to accelerate application development and improve 3D graphics performance. [=OpenSceneGraph=] 1.2, written entirely in Standard C++ and built upon [=OpenGL=], offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets a real time visualization tool which rivals established commercial scene graph toolkits in functionality and performance. [=OpenSceneGraph=] 1.2 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and [=FreeBSD=] operating systems.

10
include/osgShadow/ShadowMap
View File

@@ -36,8 +36,13 @@ class OSGSHADOW_EXPORT ShadowMap : public ShadowTechnique
/** Get the texture unit that the shadow texture will be applied on.*/
unsigned int getTextureUnit() const { return _textureUnit; }
/** Set the values for the ambient bias the shader will use.*/
void setAmbientBias(const osg::Vec2& ambientBias );
/** Get the values that are used for the ambient bias in the shader.*/
const osg::Vec2& getAmbientBias() const { return _ambientBias; }
/** initialize the ShadowedScene and local cached data structures.*/
virtual void init();
@@ -60,6 +65,7 @@ class OSGSHADOW_EXPORT ShadowMap : public ShadowTechnique
osg::ref_ptr<osg::Texture2D> _texture;
osg::ref_ptr<osg::StateSet> _stateset;
unsigned int _textureUnit;
osg::Vec2 _ambientBias;
};

7
src/osgShadow/ShadowMap.cpp
View File

@@ -64,6 +64,11 @@ void ShadowMap::setTextureUnit(unsigned int unit)
_textureUnit = unit;
}
void ShadowMap::setAmbientBias(const osg::Vec2& ambientBias)
{
_ambientBias = ambientBias;
}
void ShadowMap::init()
{
if (!_shadowedScene) return;
@@ -156,7 +161,7 @@ void ShadowMap::init()
_stateset->addUniform(shadowTextureSampler);
}
osg::Uniform* ambientBias = new osg::Uniform("ambientBias",osg::Vec2(0.3f,1.2f));
osg::Uniform* ambientBias = new osg::Uniform("ambientBias",_ambientBias);
_stateset->addUniform(ambientBias);
#endif

14
src/osgWrappers/osgShadow/ShadowMap.cpp
View File

@@ -13,6 +13,7 @@
#include <osg/CopyOp>
#include <osg/NodeVisitor>
#include <osg/Object>
#include <osg/Vec2>
#include <osgShadow/ShadowMap>
#include <osgUtil/CullVisitor>
@@ -69,6 +70,16 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowMap)
__unsigned_int__getTextureUnit,
"Get the texture unit that the shadow texture will be applied on. ",
"");
I_Method1(void, setAmbientBias, IN, const osg::Vec2 &, ambientBias,
Properties::NON_VIRTUAL,
__void__setAmbientBias__C5_osg_Vec2_R1,
"Set the values for the ambient bias the shader will use. ",
"");
I_Method0(const osg::Vec2 &, getAmbientBias,
Properties::NON_VIRTUAL,
__C5_osg_Vec2_R1__getAmbientBias,
"Get the values that are used for the ambient bias in the shader. ",
"");
I_Method0(void, init,
Properties::VIRTUAL,
__void__init,
@@ -89,6 +100,9 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowMap)
__void__cleanSceneGraph,
"Clean scene graph from any shadow technique specific nodes, state and drawables. ",
"");
I_SimpleProperty(const osg::Vec2 &, AmbientBias,
__C5_osg_Vec2_R1__getAmbientBias,
__void__setAmbientBias__C5_osg_Vec2_R1);
I_SimpleProperty(unsigned int, TextureUnit,
__unsigned_int__getTextureUnit,
__void__setTextureUnit__unsigned_int);