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

69 lines
1.9 KiB
Plaintext
Raw Normal View History

Ran script to remove trailing spaces and tabs
2012-03-22 01:36:20 +08:00
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
Added new Copyright/License notice to header and source files.
2003-01-22 00:45:36 +08:00
*
Ran script to remove trailing spaces and tabs
2012-03-22 01:36:20 +08:00
* This library is open source and may be redistributed and/or modified under
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
Added new Copyright/License notice to header and source files.
2003-01-22 00:45:36 +08:00
* (at your option) any later version. The full license is in LICENSE file
* included with this distribution, and on the openscenegraph.org website.
Ran script to remove trailing spaces and tabs
2012-03-22 01:36:20 +08:00
*
Added new Copyright/License notice to header and source files.
2003-01-22 00:45:36 +08:00
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
Ran script to remove trailing spaces and tabs
2012-03-22 01:36:20 +08:00
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Added new Copyright/License notice to header and source files.
2003-01-22 00:45:36 +08:00
* OpenSceneGraph Public License for more details.
*/
Added a copyright notice to all core headers, which all begin with //C++ header to help scripts and editors pick up the fact that the file is a header file.
2001-10-04 23:12:57 +08:00
Renamed SG_LIBRARY and SG_EXPORT macro's to OSG_LIBRARY and OSG_EXPORT
2005-04-12 01:14:17 +08:00
#ifndef OSG_EXPORT_
#define OSG_EXPORT_ 1
Initial revision
2001-01-11 00:32:10 +08:00
From Wojciech Lewandowski, "I have restored MSVC disabled warnings in osg/Export. Difference is they are now disabled only when OSG_DISABLE_MSVC_WARNINGS macro is defined. This macro is set through CMake options and autogenerated in osg/Config. Simon suggested that it would be cool if we had more control over selected warnings. I tried to learn how to make selection of individual warning numbers possible, but had to gave up as my cmake skills were not sufficient. The only way I saw this possible would be adding one define for each MSVC warning number. But many definitions seemed too be to much clutter for osg/Config file so I rejected thar idea. For this it would be cool if autogenerated Config entries could more powerful than simple #define/#undef flags. Maybe Cmake gurus know how to do it. I have not reverted added Compiler options. I assume that one may want to have warnings enabled for the application but may not want to see them while OSG libraries and examples compile. Modified files: osg/Export - now explicitly includes osg/Config to make sure OSG_DISABLE_MSVC_WARNINGS is read osg/Config.in - declares OSG_DISABLE_MSVC_WARNINGS flag to be added to autogenerated osg/Config CMakeLists.txt - declares OSG_DISABLE_MSVC_WARNINGS as option with default ON setting "
2008-11-25 00:32:52 +08:00
#include<osg/Config>
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.
2002-07-12 22:25:10 +08:00
Ran script to remove trailing spaces and tabs
2012-03-22 01:36:20 +08:00
// disable VisualStudio warnings
From Wojciech Lewandowski, "I have restored MSVC disabled warnings in osg/Export. Difference is they are now disabled only when OSG_DISABLE_MSVC_WARNINGS macro is defined. This macro is set through CMake options and autogenerated in osg/Config. Simon suggested that it would be cool if we had more control over selected warnings. I tried to learn how to make selection of individual warning numbers possible, but had to gave up as my cmake skills were not sufficient. The only way I saw this possible would be adding one define for each MSVC warning number. But many definitions seemed too be to much clutter for osg/Config file so I rejected thar idea. For this it would be cool if autogenerated Config entries could more powerful than simple #define/#undef flags. Maybe Cmake gurus know how to do it. I have not reverted added Compiler options. I assume that one may want to have warnings enabled for the application but may not want to see them while OSG libraries and examples compile. Modified files: osg/Export - now explicitly includes osg/Config to make sure OSG_DISABLE_MSVC_WARNINGS is read osg/Config.in - declares OSG_DISABLE_MSVC_WARNINGS flag to be added to autogenerated osg/Config CMakeLists.txt - declares OSG_DISABLE_MSVC_WARNINGS as option with default ON setting "
2008-11-25 00:32:52 +08:00
#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
#pragma warning( disable : 4244 )
#pragma warning( disable : 4251 )
#pragma warning( disable : 4275 )
Added VS and gcc warning suppression to clean up a few last stubborn warnings
2009-02-05 19:10:32 +08:00
#pragma warning( disable : 4512 )
Added a couple more pragma's to resolve final Windows warnings
2009-02-06 23:39:44 +08:00
#pragma warning( disable : 4267 )
#pragma warning( disable : 4702 )
#pragma warning( disable : 4511 )
From Wojciech Lewandowski, "I have restored MSVC disabled warnings in osg/Export. Difference is they are now disabled only when OSG_DISABLE_MSVC_WARNINGS macro is defined. This macro is set through CMake options and autogenerated in osg/Config. Simon suggested that it would be cool if we had more control over selected warnings. I tried to learn how to make selection of individual warning numbers possible, but had to gave up as my cmake skills were not sufficient. The only way I saw this possible would be adding one define for each MSVC warning number. But many definitions seemed too be to much clutter for osg/Config file so I rejected thar idea. For this it would be cool if autogenerated Config entries could more powerful than simple #define/#undef flags. Maybe Cmake gurus know how to do it. I have not reverted added Compiler options. I assume that one may want to have warnings enabled for the application but may not want to see them while OSG libraries and examples compile. Modified files: osg/Export - now explicitly includes osg/Config to make sure OSG_DISABLE_MSVC_WARNINGS is read osg/Config.in - declares OSG_DISABLE_MSVC_WARNINGS flag to be added to autogenerated osg/Config CMakeLists.txt - declares OSG_DISABLE_MSVC_WARNINGS as option with default ON setting "
2008-11-25 00:32:52 +08:00
#endif
Add support for Metrowerks Codewarrior build under Windows.
2002-02-23 01:12:10 +08:00
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)
From Rodger James, changed the Win32 static library compilation support to use OSG_LIBRARY_STATIC to avoid problems with building libs when not required.
2005-11-18 17:52:24 +08:00
# if defined( OSG_LIBRARY_STATIC )
Convert tabs to spaces.
2005-11-18 01:44:48 +08:00
# define OSG_EXPORT
# elif defined( OSG_LIBRARY )
# define OSG_EXPORT __declspec(dllexport)
# else
# define OSG_EXPORT __declspec(dllimport)
From Rodger James, changed the Win32 static library compilation support to use OSG_LIBRARY_STATIC to avoid problems with building libs when not required.
2005-11-18 17:52:24 +08:00
# endif
Initial revision
2001-01-11 00:32:10 +08:00
#else
Convert tabs to spaces.
2005-11-18 01:44:48 +08:00
# define OSG_EXPORT
From Wojciech Lewandowski, "I have restored MSVC disabled warnings in osg/Export. Difference is they are now disabled only when OSG_DISABLE_MSVC_WARNINGS macro is defined. This macro is set through CMake options and autogenerated in osg/Config. Simon suggested that it would be cool if we had more control over selected warnings. I tried to learn how to make selection of individual warning numbers possible, but had to gave up as my cmake skills were not sufficient. The only way I saw this possible would be adding one define for each MSVC warning number. But many definitions seemed too be to much clutter for osg/Config file so I rejected thar idea. For this it would be cool if autogenerated Config entries could more powerful than simple #define/#undef flags. Maybe Cmake gurus know how to do it. I have not reverted added Compiler options. I assume that one may want to have warnings enabled for the application but may not want to see them while OSG libraries and examples compile. Modified files: osg/Export - now explicitly includes osg/Config to make sure OSG_DISABLE_MSVC_WARNINGS is read osg/Config.in - declares OSG_DISABLE_MSVC_WARNINGS flag to be added to autogenerated osg/Config CMakeLists.txt - declares OSG_DISABLE_MSVC_WARNINGS as option with default ON setting "
2008-11-25 00:32:52 +08:00
#endif
Initial revision
2001-01-11 00:32:10 +08:00
Added comment to explain #ifdefs for member templates.
2002-06-27 05:11:59 +08:00
// set up define for whether member templates are supported by VisualStudio compilers.
Added #idef to Export to add check for support for member templates.
2002-06-27 05:10:45 +08:00
#ifdef _MSC_VER
# if (_MSC_VER >= 1300)
# define __STL_MEMBER_TEMPLATES
# endif
#endif
Added a bunch of files synched with 0.8.42
2001-09-20 05:08:56 +08:00
/* Define NULL pointer value */
#ifndef NULL
Converted the instance of osgNew and osgDelete back to new and delete as part of depecating the include/osg/MemoryManager
2002-12-16 21:40:58 +08:00
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#endif
Added a bunch of files synched with 0.8.42
2001-09-20 05:08:56 +08:00
#endif
Addd high level introductory docs for all the libs
2004-11-27 00:01:04 +08:00
/**
\namespace osg
The core osg library provides the basic scene graph classes such as Nodes,
State and Drawables, and maths and general helper classes.
*/
Initial revision
2001-01-11 00:32:10 +08:00
#endif
From Rodger James, changed the Win32 static library compilation support to use OSG_LIBRARY_STATIC to avoid problems with building libs when not required.
2005-11-18 17:52:24 +08:00
Reference in New Issue Copy Permalink