From fae2852db72c469133d78d590de94983f68c13fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 23 Feb 2018 11:20:29 +0100 Subject: [PATCH] SceneGraph: removed long-deprecated AbstractCamera class and related headers. Use Camera, BasicCamera2D, BasicCamera3D, Camera2D and Camera3D classes and the header instead. --- doc/compilation-speedup.dox | 2 +- doc/scenegraph.dox | 6 +- src/Magnum/SceneGraph/AbstractCamera.h | 81 ------------------------ src/Magnum/SceneGraph/AbstractCamera.hpp | 41 ------------ src/Magnum/SceneGraph/CMakeLists.txt | 10 --- src/Magnum/SceneGraph/Camera2D.h | 41 ------------ src/Magnum/SceneGraph/Camera2D.hpp | 41 ------------ src/Magnum/SceneGraph/Camera3D.h | 41 ------------ src/Magnum/SceneGraph/Camera3D.hpp | 41 ------------ src/Magnum/SceneGraph/SceneGraph.h | 12 ---- 10 files changed, 4 insertions(+), 312 deletions(-) delete mode 100644 src/Magnum/SceneGraph/AbstractCamera.h delete mode 100644 src/Magnum/SceneGraph/AbstractCamera.hpp delete mode 100644 src/Magnum/SceneGraph/Camera2D.h delete mode 100644 src/Magnum/SceneGraph/Camera2D.hpp delete mode 100644 src/Magnum/SceneGraph/Camera3D.h delete mode 100644 src/Magnum/SceneGraph/Camera3D.hpp diff --git a/doc/compilation-speedup.dox b/doc/compilation-speedup.dox index 14337df6c..938ab68d9 100644 --- a/doc/compilation-speedup.dox +++ b/doc/compilation-speedup.dox @@ -96,7 +96,7 @@ Templated classes having code in template implementation files state in their documentation all common specializations that are already compiled in the libraries. So, unless the templated class is too generic or you need something special, you don't have to mess with template implementation files at all. See -@ref SceneGraph::Object or @ref SceneGraph::AbstractCamera for an example. +@ref SceneGraph::Object or @ref SceneGraph::Camera for an example. Sometimes, however, you need to use your own specialization and that's why template implementation files are installed along with the library. For example diff --git a/doc/scenegraph.dox b/doc/scenegraph.dox index 659aae2a1..23dc73db4 100644 --- a/doc/scenegraph.dox +++ b/doc/scenegraph.dox @@ -164,9 +164,9 @@ have to add a *feature* to it. Magnum provides the following builtin features. See documentation of each class for more detailed information and usage examples: -- @ref SceneGraph::AbstractCamera "SceneGraph::Camera*D" --- Handles - projection matrix, aspect ratio correction etc.. Used for rendering parts - of the scene. +- @ref SceneGraph::Camera "SceneGraph::Camera*D" --- Handles projection + matrix, aspect ratio correction etc.. Used for rendering parts of the + scene. - @ref SceneGraph::Drawable "SceneGraph::Drawable*D" --- Adds drawing functionality to given object. Group of drawables can be then rendered using the camera feature. diff --git a/src/Magnum/SceneGraph/AbstractCamera.h b/src/Magnum/SceneGraph/AbstractCamera.h deleted file mode 100644 index db8a565c1..000000000 --- a/src/Magnum/SceneGraph/AbstractCamera.h +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef Magnum_SceneGraph_AbstractCamera_h -#define Magnum_SceneGraph_AbstractCamera_h -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/** @file - * @brief Use @ref Magnum/SceneGraph/Camera.h instead. - */ - -#include "Magnum/configure.h" - -#ifdef MAGNUM_BUILD_DEPRECATED -#include "Magnum/SceneGraph/Camera.h" -CORRADE_DEPRECATED_FILE("use Magnum/SceneGraph/Camera.h instead") - -namespace Magnum { namespace SceneGraph { - -/** - * @brief @copybrief Camera - * @deprecated Use @ref Camera instead. - */ -#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */ -template using AbstractCamera CORRADE_DEPRECATED_ALIAS("use Camera instead") = Camera; -#endif - -/** - * @brief @copybrief BasicCamera2D - * @deprecated Use @ref BasicCamera2D instead. - */ -#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */ -template using AbstractBasicCamera2D CORRADE_DEPRECATED_ALIAS("use BasicCamera2D instead") = BasicCamera2D; -#endif - -/** - * @brief @copybrief Camera2D - * @deprecated Use @ref Camera2D instead. - */ -CORRADE_DEPRECATED("use Camera2D instead") typedef Camera2D AbstractCamera2D; - -/** - * @brief @copybrief BasicCamera3D - * @deprecated Use @ref BasicCamera3D instead. - */ -#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */ -template using AbstractBasicCamera3D CORRADE_DEPRECATED_ALIAS("use BasicCamera3D instead") = BasicCamera3D; -#endif - -/** - * @brief @copybrief Camera3D - * @deprecated Use @ref Camera3D instead. - */ -CORRADE_DEPRECATED("use Camera3D instead") typedef Camera3D AbstractCamera3D; - -}} -#else -#error use Magnum/SceneGraph/Camera.h instead -#endif - -#endif diff --git a/src/Magnum/SceneGraph/AbstractCamera.hpp b/src/Magnum/SceneGraph/AbstractCamera.hpp deleted file mode 100644 index b43d9bb8e..000000000 --- a/src/Magnum/SceneGraph/AbstractCamera.hpp +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef Magnum_SceneGraph_AbstractCamera_hpp -#define Magnum_SceneGraph_AbstractCamera_hpp -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/** @file - * @deprecated Use @ref Magnum/SceneGraph/Camera.hpp instead. - */ - -#include "Magnum/configure.h" - -#ifdef MAGNUM_BUILD_DEPRECATED -#include "Magnum/SceneGraph/Camera.hpp" -CORRADE_DEPRECATED_FILE("use Magnum/SceneGraph/Camera.hpp instead") -#else -#error use Magnum/SceneGraph/Camera.hpp instead -#endif - -#endif diff --git a/src/Magnum/SceneGraph/CMakeLists.txt b/src/Magnum/SceneGraph/CMakeLists.txt index c2571e6f4..a56c0a984 100644 --- a/src/Magnum/SceneGraph/CMakeLists.txt +++ b/src/Magnum/SceneGraph/CMakeLists.txt @@ -65,16 +65,6 @@ set(MagnumSceneGraph_HEADERS visibility.h) -if(MAGNUM_BUILD_DEPRECATED) - list(APPEND MagnumSceneGraph_HEADERS - AbstractCamera.h - AbstractCamera.hpp - Camera2D.h - Camera2D.hpp - Camera3D.h - Camera3D.hpp) -endif() - # Objects shared between main and test library add_library(MagnumSceneGraphObjects OBJECT ${MagnumSceneGraph_SRCS} diff --git a/src/Magnum/SceneGraph/Camera2D.h b/src/Magnum/SceneGraph/Camera2D.h deleted file mode 100644 index 0e6388d59..000000000 --- a/src/Magnum/SceneGraph/Camera2D.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef Magnum_SceneGraph_Camera2D_h -#define Magnum_SceneGraph_Camera2D_h -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/** @file - * @deprecated Use @ref Magnum/SceneGraph/Camera.h instead. - */ - -#include "Magnum/configure.h" - -#ifdef MAGNUM_BUILD_DEPRECATED -#include "Magnum/SceneGraph/Camera.h" -CORRADE_DEPRECATED_FILE("use Magnum/SceneGraph/Camera.h instead") -#else -#error use Magnum/SceneGraph/Camera.h instead -#endif - -#endif diff --git a/src/Magnum/SceneGraph/Camera2D.hpp b/src/Magnum/SceneGraph/Camera2D.hpp deleted file mode 100644 index 3259c08b5..000000000 --- a/src/Magnum/SceneGraph/Camera2D.hpp +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef Magnum_SceneGraph_Camera2D_hpp -#define Magnum_SceneGraph_Camera2D_hpp -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/** @file - * @deprecated Use @ref Magnum/SceneGraph/Camera.hpp instead. - */ - -#include "Magnum/configure.h" - -#ifdef MAGNUM_BUILD_DEPRECATED -#include "Magnum/SceneGraph/Camera.hpp" -CORRADE_DEPRECATED_FILE("use Magnum/SceneGraph/Camera.hpp instead") -#else -#error use Magnum/SceneGraph/Camera.hpp instead -#endif - -#endif diff --git a/src/Magnum/SceneGraph/Camera3D.h b/src/Magnum/SceneGraph/Camera3D.h deleted file mode 100644 index d9d4235b8..000000000 --- a/src/Magnum/SceneGraph/Camera3D.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef Magnum_SceneGraph_Camera3D_h -#define Magnum_SceneGraph_Camera3D_h -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/** @file - * @deprecated Use @ref Magnum/SceneGraph/Camera.h instead. - */ - -#include "Magnum/configure.h" - -#ifdef MAGNUM_BUILD_DEPRECATED -#include "Magnum/SceneGraph/Camera.h" -CORRADE_DEPRECATED_FILE("use Magnum/SceneGraph/Camera.h instead") -#else -#error use Magnum/SceneGraph/Camera.h instead -#endif - -#endif diff --git a/src/Magnum/SceneGraph/Camera3D.hpp b/src/Magnum/SceneGraph/Camera3D.hpp deleted file mode 100644 index 3d2aa9872..000000000 --- a/src/Magnum/SceneGraph/Camera3D.hpp +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef Magnum_SceneGraph_Camera3D_hpp -#define Magnum_SceneGraph_Camera3D_hpp -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/** @file - * @deprecated Use @ref Magnum/SceneGraph/Camera.hpp instead. - */ - -#include "Magnum/configure.h" - -#ifdef MAGNUM_BUILD_DEPRECATED -#include "Magnum/SceneGraph/Camera.hpp" -CORRADE_DEPRECATED_FILE("use Magnum/SceneGraph/Camera.hpp instead") -#else -#error use Magnum/SceneGraph/Camera.hpp instead -#endif - -#endif diff --git a/src/Magnum/SceneGraph/SceneGraph.h b/src/Magnum/SceneGraph/SceneGraph.h index 2040b67f7..cb6a0ba78 100644 --- a/src/Magnum/SceneGraph/SceneGraph.h +++ b/src/Magnum/SceneGraph/SceneGraph.h @@ -31,10 +31,6 @@ #include "Magnum/Types.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#endif - namespace Magnum { namespace SceneGraph { #ifndef DOXYGEN_GENERATING_OUTPUT @@ -104,14 +100,6 @@ template using BasicCamera3D = Camera<3, T>; typedef BasicCamera2D Camera2D; typedef BasicCamera3D Camera3D; -#ifdef MAGNUM_BUILD_DEPRECATED -template using AbstractCamera CORRADE_DEPRECATED_ALIAS("use BasicCamera2D instead") = Camera; -template using AbstractBasicCamera2D CORRADE_DEPRECATED_ALIAS("use BasicCamera2D instead") = BasicCamera2D; -CORRADE_DEPRECATED("use Camera2D instead") typedef Camera2D AbstractCamera2D; -template using AbstractBasicCamera3D CORRADE_DEPRECATED_ALIAS("use BasicCamera3D instead") = BasicCamera3D; -CORRADE_DEPRECATED("use Camera3D instead") typedef Camera3D AbstractCamera3D; -#endif - template class Drawable; template using BasicDrawable2D = Drawable<2, T>; template using BasicDrawable3D = Drawable<3, T>;