Have added a #define USE_DEPRECATED_API to include/osg/Export, and
various osg header and source files to optional compile in deprecated parts of the OSG API. Have renamed osg::Transparency osg::BlendFunc to bring it in line with the rest of the OSG's StateAttribute classes which are named after their OpenGL counterparts. include/osg/Transparency still exists and is simply a typedef to BlendFunc and is enclosed in a #ifdef USE_DEPRECTATED_API block. The matrix methods in the osg::Transform class have been moved/replicated in a osg::MatrixTransform sublcass from osg::Transform. The old matrix functionality is still present in the osg::Transform class but is guard by #ifdef USG_DEPRECATED_API blocks. One should now think of osg::Transform as being a Transform Node base class. MatrixTransform has all the functionality of the original Transform class, so should be used instead.
This commit is contained in:
@@ -269,6 +269,10 @@ SOURCE=..\..\src\osg\Matrix.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\osg\MatrixTransform.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\osg\MemoryManager.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -377,7 +381,7 @@ SOURCE=..\..\src\osg\Transform.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\osg\Transparency.cpp
|
||||
SOURCE=..\..\src\osg\BlendFunc.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -585,6 +589,10 @@ SOURCE=..\..\Include\Osg\Matrix
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\Include\Osg\MatrixTransform
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\osg\mem_ptr
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -729,7 +737,7 @@ SOURCE=..\..\Include\Osg\Transform
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\Include\Osg\Transparency
|
||||
SOURCE=..\..\Include\Osg\BlendFunc
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
||||
@@ -270,7 +270,7 @@ SOURCE=..\..\..\src\osgPlugins\osg\Transform.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\src\osgPlugins\osg\Transparency.cpp
|
||||
SOURCE=..\..\..\src\osgPlugins\osg\BlendFunc.cpp
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Group "Header Files"
|
||||
|
||||
Reference in New Issue
Block a user