Hi,
here are also the patches of the base class, but they're really
just the output of the fcEdit..
Toni
Index: OSGFBOViewportBase.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/System/Window/OSGFBOViewportBase.cpp,v
retrieving revision 1.1
diff -u -r1.1 OSGFBOViewportBase.cpp
--- OSGFBOViewportBase.cpp 12 Mar 2007 15:03:02 -0000 1.1
+++ OSGFBOViewportBase.cpp 27 Aug 2007 16:54:51 -0000
@@ -106,6 +106,9 @@
const OSG::BitVector FBOViewportBase::ReadBufferFieldMask =
(TypeTraits<BitVector>::One << FBOViewportBase::ReadBufferFieldId);
+const OSG::BitVector FBOViewportBase::IgnoreCameraDecoratorsFieldMask =
+ (TypeTraits<BitVector>::One <<
FBOViewportBase::IgnoreCameraDecoratorsFieldId);
+
const OSG::BitVector FBOViewportBase::MTInfluenceMask =
(Inherited::MTInfluenceMask) |
(static_cast<BitVector>(0x0) << Inherited::NextFieldId);
@@ -155,6 +158,9 @@
/*! \var bool FBOViewportBase::_sfReadBuffer
Reads current buffer back into image.
*/
+/*! \var bool FBOViewportBase::_sfIgnoreCameraDecorators
+ whether the render method should ignore CameraDecorators or not
+*/
//! FBOViewport description
@@ -229,7 +235,12 @@
"readBuffer",
ReadBufferFieldId, ReadBufferFieldMask,
false,
- (FieldAccessMethod) &FBOViewportBase::getSFReadBuffer)
+ (FieldAccessMethod) &FBOViewportBase::getSFReadBuffer),
+ new FieldDescription(SFBool::getClassType(),
+ "ignoreCameraDecorators",
+ IgnoreCameraDecoratorsFieldId,
IgnoreCameraDecoratorsFieldMask,
+ false,
+ (FieldAccessMethod)
&FBOViewportBase::getSFIgnoreCameraDecorators)
};
@@ -322,6 +333,7 @@
_sfStencilBufferIndex (UInt32(0)),
_sfDirty (bool(true)),
_sfReadBuffer (bool(false)),
+ _sfIgnoreCameraDecorators (bool(true)),
Inherited()
{
}
@@ -345,6 +357,7 @@
_sfStencilBufferIndex (source._sfStencilBufferIndex ),
_sfDirty (source._sfDirty ),
_sfReadBuffer (source._sfReadBuffer ),
+ _sfIgnoreCameraDecorators (source._sfIgnoreCameraDecorators ),
Inherited (source)
{
}
@@ -431,6 +444,11 @@
returnValue += _sfReadBuffer.getBinSize();
}
+ if(FieldBits::NoField != (IgnoreCameraDecoratorsFieldMask & whichField))
+ {
+ returnValue += _sfIgnoreCameraDecorators.getBinSize();
+ }
+
return returnValue;
}
@@ -510,6 +528,11 @@
_sfReadBuffer.copyToBin(pMem);
}
+ if(FieldBits::NoField != (IgnoreCameraDecoratorsFieldMask & whichField))
+ {
+ _sfIgnoreCameraDecorators.copyToBin(pMem);
+ }
+
}
@@ -588,6 +611,11 @@
_sfReadBuffer.copyFromBin(pMem);
}
+ if(FieldBits::NoField != (IgnoreCameraDecoratorsFieldMask & whichField))
+ {
+ _sfIgnoreCameraDecorators.copyFromBin(pMem);
+ }
+
}
@@ -640,6 +668,9 @@
if(FieldBits::NoField != (ReadBufferFieldMask & whichField))
_sfReadBuffer.syncWith(pOther->_sfReadBuffer);
+ if(FieldBits::NoField != (IgnoreCameraDecoratorsFieldMask & whichField))
+ _sfIgnoreCameraDecorators.syncWith(pOther->_sfIgnoreCameraDecorators);
+
}
#else
@@ -683,6 +714,9 @@
if(FieldBits::NoField != (ReadBufferFieldMask & whichField))
_sfReadBuffer.syncWith(pOther->_sfReadBuffer);
+ if(FieldBits::NoField != (IgnoreCameraDecoratorsFieldMask & whichField))
+ _sfIgnoreCameraDecorators.syncWith(pOther->_sfIgnoreCameraDecorators);
+
if(FieldBits::NoField != (ExcludeNodesFieldMask & whichField))
_mfExcludeNodes.syncWith(pOther->_mfExcludeNodes, sInfo);
@@ -744,7 +778,7 @@
namespace
{
- static Char8 cvsid_cpp [] = "@(#)$Id: OSGFBOViewportBase.cpp,v 1.1
2007/03/12 15:03:02 a-m-z Exp $";
+ static Char8 cvsid_cpp [] = "@(#)$Id: FCBaseTemplate_cpp.h,v 1.47
2006/03/17 17:03:19 pdaehne Exp $";
static Char8 cvsid_hpp [] = OSGFBOVIEWPORTBASE_HEADER_CVSID;
static Char8 cvsid_inl [] = OSGFBOVIEWPORTBASE_INLINE_CVSID;
Index: OSGFBOViewportBase.h
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/System/Window/OSGFBOViewportBase.h,v
retrieving revision 1.1
diff -u -r1.1 OSGFBOViewportBase.h
--- OSGFBOViewportBase.h 12 Mar 2007 15:03:02 -0000 1.1
+++ OSGFBOViewportBase.h 27 Aug 2007 16:54:51 -0000
@@ -81,6 +81,7 @@
#include <OSGUInt32Fields.h> // StencilBufferIndex type
#include <OSGBoolFields.h> // Dirty type
#include <OSGBoolFields.h> // ReadBuffer type
+#include <OSGBoolFields.h> // IgnoreCameraDecorators type
#include <OSGFBOViewportFields.h>
@@ -104,21 +105,22 @@
enum
{
- EnabledFieldId = Inherited::NextFieldId,
- ExcludeNodesFieldId = EnabledFieldId + 1,
- RenderNodesFieldId = ExcludeNodesFieldId + 1,
- TexturesFieldId = RenderNodesFieldId + 1,
- FboOnFieldId = TexturesFieldId + 1,
- StorageWidthFieldId = FboOnFieldId + 1,
- StorageHeightFieldId = StorageWidthFieldId + 1,
- GenCubemapsFieldId = StorageHeightFieldId + 1,
- GenDepthmapsFieldId = GenCubemapsFieldId + 1,
- FrameBufferIndexFieldId = GenDepthmapsFieldId + 1,
- DepthBufferIndexFieldId = FrameBufferIndexFieldId + 1,
- StencilBufferIndexFieldId = DepthBufferIndexFieldId + 1,
- DirtyFieldId = StencilBufferIndexFieldId + 1,
- ReadBufferFieldId = DirtyFieldId + 1,
- NextFieldId = ReadBufferFieldId + 1
+ EnabledFieldId = Inherited::NextFieldId,
+ ExcludeNodesFieldId = EnabledFieldId + 1,
+ RenderNodesFieldId = ExcludeNodesFieldId + 1,
+ TexturesFieldId = RenderNodesFieldId + 1,
+ FboOnFieldId = TexturesFieldId + 1,
+ StorageWidthFieldId = FboOnFieldId + 1,
+ StorageHeightFieldId = StorageWidthFieldId + 1,
+ GenCubemapsFieldId = StorageHeightFieldId + 1,
+ GenDepthmapsFieldId = GenCubemapsFieldId + 1,
+ FrameBufferIndexFieldId = GenDepthmapsFieldId + 1,
+ DepthBufferIndexFieldId = FrameBufferIndexFieldId + 1,
+ StencilBufferIndexFieldId = DepthBufferIndexFieldId + 1,
+ DirtyFieldId = StencilBufferIndexFieldId + 1,
+ ReadBufferFieldId = DirtyFieldId + 1,
+ IgnoreCameraDecoratorsFieldId = ReadBufferFieldId + 1,
+ NextFieldId = IgnoreCameraDecoratorsFieldId + 1
};
static const OSG::BitVector EnabledFieldMask;
@@ -135,6 +137,7 @@
static const OSG::BitVector StencilBufferIndexFieldMask;
static const OSG::BitVector DirtyFieldMask;
static const OSG::BitVector ReadBufferFieldMask;
+ static const OSG::BitVector IgnoreCameraDecoratorsFieldMask;
static const OSG::BitVector MTInfluenceMask;
@@ -172,6 +175,7 @@
SFBool *getSFGenDepthmaps (void);
SFBool *getSFDirty (void);
SFBool *getSFReadBuffer (void);
+ SFBool *getSFIgnoreCameraDecorators(void);
bool &getEnabled (void);
const bool &getEnabled (void) const;
@@ -189,6 +193,8 @@
const bool &getDirty (void) const;
bool &getReadBuffer (void);
const bool &getReadBuffer (void) const;
+ bool &getIgnoreCameraDecorators(void);
+ const bool &getIgnoreCameraDecorators(void) const;
NodePtr &getExcludeNodes (const UInt32 index);
MFNodePtr &getExcludeNodes (void);
const MFNodePtr &getExcludeNodes (void) const;
@@ -212,6 +218,7 @@
void setGenDepthmaps ( const bool &value );
void setDirty ( const bool &value );
void setReadBuffer ( const bool &value );
+ void setIgnoreCameraDecorators( const bool &value );
/*! \} */
/*---------------------------------------------------------------------*/
@@ -268,6 +275,7 @@
SFUInt32 _sfStencilBufferIndex;
SFBool _sfDirty;
SFBool _sfReadBuffer;
+ SFBool _sfIgnoreCameraDecorators;
/*! \} */
/*---------------------------------------------------------------------*/
@@ -370,6 +378,6 @@
OSG_END_NAMESPACE
-#define OSGFBOVIEWPORTBASE_HEADER_CVSID "@(#)$Id: OSGFBOViewportBase.h,v 1.1
2007/03/12 15:03:02 a-m-z Exp $"
+#define OSGFBOVIEWPORTBASE_HEADER_CVSID "@(#)$Id: FCBaseTemplate_h.h,v 1.40
2005/07/20 00:10:14 vossg Exp $"
#endif /* _OSGFBOVIEWPORTBASE_H_ */
Index: OSGFBOViewportBase.inl
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/System/Window/OSGFBOViewportBase.inl,v
retrieving revision 1.1
diff -u -r1.1 OSGFBOViewportBase.inl
--- OSGFBOViewportBase.inl 12 Mar 2007 15:03:02 -0000 1.1
+++ OSGFBOViewportBase.inl 27 Aug 2007 16:54:51 -0000
@@ -194,6 +194,13 @@
return &_sfReadBuffer;
}
+//! Get the FBOViewport::_sfIgnoreCameraDecorators field.
+inline
+SFBool *FBOViewportBase::getSFIgnoreCameraDecorators(void)
+{
+ return &_sfIgnoreCameraDecorators;
+}
+
//! Get the value of the FBOViewport::_sfEnabled field.
inline
@@ -426,6 +433,27 @@
_sfReadBuffer.setValue(value);
}
+//! Get the value of the FBOViewport::_sfIgnoreCameraDecorators field.
+inline
+bool &FBOViewportBase::getIgnoreCameraDecorators(void)
+{
+ return _sfIgnoreCameraDecorators.getValue();
+}
+
+//! Get the value of the FBOViewport::_sfIgnoreCameraDecorators field.
+inline
+const bool &FBOViewportBase::getIgnoreCameraDecorators(void) const
+{
+ return _sfIgnoreCameraDecorators.getValue();
+}
+
+//! Set the value of the FBOViewport::_sfIgnoreCameraDecorators field.
+inline
+void FBOViewportBase::setIgnoreCameraDecorators(const bool &value)
+{
+ _sfIgnoreCameraDecorators.setValue(value);
+}
+
//! Get the value of the \a index element the FBOViewport::_mfExcludeNodes
field.
inline
@@ -492,5 +520,5 @@
OSG_END_NAMESPACE
-#define OSGFBOVIEWPORTBASE_INLINE_CVSID "@(#)$Id: OSGFBOViewportBase.inl,v 1.1
2007/03/12 15:03:02 a-m-z Exp $"
+#define OSGFBOVIEWPORTBASE_INLINE_CVSID "@(#)$Id: FCBaseTemplate_inl.h,v 1.20
2002/12/04 14:22:22 dirk Exp $"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Opensg-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensg-users
