Skip to content

Commit

Permalink
Shapes: this library is no more either.
Browse files Browse the repository at this point in the history
  • Loading branch information
mosra committed Mar 16, 2019
1 parent 930a323 commit aca02f5
Show file tree
Hide file tree
Showing 127 changed files with 27 additions and 8,176 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ cmake_dependent_option(WITH_TGAIMPORTER "Build TgaImporter plugin" OFF "NOT WITH
cmake_dependent_option(WITH_AUDIO "Build Audio library" OFF "NOT WITH_AL_INFO;NOT WITH_ANYAUDIOIMPORTER;NOT WITH_WAVAUDIOIMPORTER" ON)
option(WITH_DEBUGTOOLS "Build DebugTools library" ON)
cmake_dependent_option(WITH_MESHTOOLS "Build MeshTools library" ON "NOT WITH_OBJIMPORTER" ON)
option(WITH_SHAPES "Build Shapes library" OFF)
cmake_dependent_option(WITH_SCENEGRAPH "Build SceneGraph library" ON "NOT WITH_SHAPES" ON)
option(WITH_SCENEGRAPH "Build SceneGraph library" ON)
option(WITH_SHADERS "Build Shaders library" ON)
cmake_dependent_option(WITH_TEXT "Build Text library" ON "NOT WITH_FONTCONVERTER;NOT WITH_MAGNUMFONT;NOT WITH_MAGNUMFONTCONVERTER" ON)
cmake_dependent_option(WITH_TEXTURETOOLS "Build TextureTools library" ON "NOT WITH_TEXT;NOT WITH_DISTANCEFIELDCONVERTER" ON)
Expand Down
2 changes: 0 additions & 2 deletions Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,6 @@ ALIASES = \
"configurationvalueref{1}=@see @ref configurationvalues \"Corrade::Utility::ConfigurationValue<\1>\"" \
"configurationvalue{1}=@brief Configuration value parser and writer @xrefitem configurationvalues \"Configuration value parser and writer\" \"Configuration value parsers and writers for custom types\" Allows parsing and writing @ref \1 from and to @ref Corrade::Utility::Configuration and use it with @ref Corrade::Utility::Arguments." \
"tweakableliteral{1}=@brief Tweakable literal parser @xrefitem tweakableliterals \"Tweakable literal parser\" \"Tweakable literal parsers\" Allows using @ref \1 with @ref Corrade::Utility::Tweakable." \
"collisionoccurenceoperator{2}=@relatesalso \1 @brief Collision occurence of @ref \1 and @ref \2 @see @ref \2::operator%(const \1&) const" \
"collisionoperator{2}=@relatesalso \1 @brief Collision of @ref \1 and @ref \2 @see @ref \2::operator/(const \1&) const" \
"partialsupport=@xrefitem partialsupport \"Partially supported\" \"List of partially supported features\"" \
"thirdparty=@xrefitem credits-third-party \"Third-party components\" \"Third-party components\"" \
"todoc=@xrefitem todoc \"Documentation todo\" \"Documentation-related todo list\"" \
Expand Down
2 changes: 0 additions & 2 deletions Doxyfile-mcss
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ ALIASES = \
"configurationvalueref{1}=@see @ref configurationvalues \"Corrade::Utility::ConfigurationValue<\1>\"" \
"configurationvalue{1}=@brief Configuration value parser and writer @xrefitem configurationvalues \"Configuration value parser and writer\" \"Configuration value parsers and writers for custom types\" Allows parsing and writing @ref \1 from and to @ref Corrade::Utility::Configuration and use it with @ref Corrade::Utility::Arguments." \
"tweakableliteral{1}=@brief Tweakable literal parser @xrefitem tweakableliterals \"Tweakable literal parser\" \"Tweakable literal parsers\" Allows using @ref \1 with @ref Corrade::Utility::Tweakable." \
"collisionoccurenceoperator{2}=@relatesalso \1 @brief Collision occurence of @ref \1 and @ref \2 @see @ref \2::operator%(const \1&) const" \
"collisionoperator{2}=@relatesalso \1 @brief Collision of @ref \1 and @ref \2 @see @ref \2::operator/(const \1&) const" \
"partialsupport=@xrefitem partialsupport \"Partially supported\" \"List of partially supported features\"" \
"thirdparty=@xrefitem credits-third-party \"Third-party components\" \"Third-party components\"" \
"todoc=@xrefitem todoc \"Documentation todo\" \"Documentation-related todo list\"" \
Expand Down
2 changes: 0 additions & 2 deletions Doxyfile-public
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ ALIASES = \
"configurationvalueref{1}=@see @ref configurationvalues \"Corrade::Utility::ConfigurationValue<\1>\"" \
"configurationvalue{1}=@brief Configuration value parser and writer @xrefitem configurationvalues \"Configuration value parser and writer\" \"Configuration value parsers and writers for custom types\" Allows parsing and writing @ref \1 from and to @ref Corrade::Utility::Configuration and use it with @ref Corrade::Utility::Arguments." \
"tweakableliteral{1}=@brief Tweakable literal parser @xrefitem tweakableliterals \"Tweakable literal parser\" \"Tweakable literal parsers\" Allows using @ref \1 with @ref Corrade::Utility::Tweakable." \
"collisionoccurenceoperator{2}=@relatesalso \1 @brief Collision occurence of @ref \1 and @ref \2 @see @ref \2::operator%(const \1&) const" \
"collisionoperator{2}=@relatesalso \1 @brief Collision of @ref \1 and @ref \2 @see @ref \2::operator/(const \1&) const" \
"partialsupport=@xrefitem partialsupport \"Partially supported\" \"List of partially supported features\"" \
"thirdparty=@xrefitem credits-third-party \"Third-party components\" \"Third-party components\"" \
"todoc=@todo" \
Expand Down
11 changes: 4 additions & 7 deletions doc/building.dox
Original file line number Diff line number Diff line change
Expand Up @@ -500,9 +500,9 @@ information. See also @ref corrade-cmake and @ref Corrade/Corrade.h for
related info for the Corrade library.

By default the engine is built with nearly everything except the @ref Audio
and @ref Shapes libraries, plugins, command-line utilities and application
libraries (see below). Using the following `WITH_*` CMake options you can
specify which parts will be built and which not:
library, plugins, command-line utilities and application libraries (see below).
Using the following `WITH_*` CMake options you can specify which parts will be
built and which not:

- `WITH_AUDIO` --- Build the @ref Audio library. Depends on
[OpenAL](https://www.openal.org/), not built by default.
Expand All @@ -513,12 +513,9 @@ specify which parts will be built and which not:
building of the Trade library.
- `WITH_PRIMITIVES` --- Build the @ref Primitives library. Enables also
building of the Trade library.
- `WITH_SCENEGRAPH` --- Build the @ref SceneGraph library. Enabled
automatically if `WITH_SHAPES` is enabled.
- `WITH_SCENEGRAPH` --- Build the @ref SceneGraph library
- `WITH_SHADERS` --- Build the @ref Shaders library. Enables also building of
the GL library.
- `WITH_SHAPES` @m_class{m-label m-danger} **deprecated** --- Build the
@ref Shapes library. Enables also building of the SceneGraph library.
- `WITH_TEXT` --- Build the @ref Text library. Enables also building of
the TextureTools library.
- `WITH_TEXTURETOOLS` --- Build the @ref TextureTools library. Enabled
Expand Down
7 changes: 3 additions & 4 deletions doc/changelog-old.dox
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ for a high-level overview.
imported data
- @ref MeshTools::interleaveInto() for interleaving data into existing
buffer
- @ref Shapes::Shape::collision() function as complement to
@ref Shapes::Shape::collides()
- `Shapes::Shape::collision()` function as complement to
`Shapes::Shape::collides()`
- @ref Platform::GlutApplication::KeyEvent finally has more complete key
support
- @ref Math::Range::data() function, useful when querying range values from
Expand Down Expand Up @@ -672,8 +672,7 @@ for a high-level overview.
avoid accidental memory leaks
- New translation-only transformation in @ref SceneGraph supporting also
purely integral coordinates, useful e.g. for UI or 2D platformers.
- Detailed collision queries and new @ref Shapes::InvertedSphere "InvertedSphere"
shape in Shapes library
- Detailed collision queries and new `InvertedSphere` shape in Shapes library
- Texture support in @ref Shaders::Flat
- Mouse button queries in @ref Platform::Sdl2Application::MouseMoveEvent "Platform::*Application::MouseMoveEvent"

Expand Down
21 changes: 11 additions & 10 deletions doc/changelog.dox
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@ See also:

- Removed all aliases to @ref GL library functionality in the root namespace
(and root include path) which were deprecated in 2018.04
- Removed the `Shapes` library together with `DebugTools::ShapeRenderer`,
which was is a failed design experiment deprecated since 2018.10
- In order to be compatible with both Emscripten 1.38.27 and the versions
before, all Emscripten markup is now expected to have the HTML @cb{.html} <canvas> @ce element identified by @cb{.css} #canvas @ce. You need to:
- update your HTML markup to use
Expand Down Expand Up @@ -952,14 +954,13 @@ Released 2018-10-23, tagged as

@subsection changelog-2018-10-deprecated Deprecated APIs

- The @ref Magnum::Shapes library is a failed design experiment and is
scheduled for removal in a future release, together with
@ref DebugTools::ShapeRenderer. Related geometry algorithms were moved to
@ref Magnum::Math::Distance and @ref Magnum::Math::Intersection; if you
need a full-fledged physics library, please have look at
[Bullet](https://bulletphysics.org), which has Magnum integration in
@ref Magnum::BulletIntegration, or at [Box2D](https://box2d.org/), which
has a @ref examples-box2d "Magnum example" as well.
- The `Shapes` library is a failed design experiment and is scheduled for
removal in a future release, together with `DebugTools::ShapeRenderer`.
Related geometry algorithms were moved to @ref Math::Distance and
@ref Math::Intersection; if you need a full-fledged physics library, please
have look at [Bullet](https://bulletphysics.org), which has Magnum
integration in @ref BulletIntegration, or at [Box2D](https://box2d.org/),
which has a @ref examples-box2d "Magnum example" as well.
- @ref Platform::GlutApplication is based on an outdated toolkit and thus
scheduled for removal in a future release. Please consider switching to
@ref Platform::Sdl2Application or @ref Platform::GlfwApplication as soon as
Expand Down Expand Up @@ -1010,8 +1011,8 @@ Released 2018-10-23, tagged as

@subsection changelog-2018-10-compatibility Potential compatibility breakages, removed APIs

- The @ref Magnum::Shapes library is not built by default anymore due to its
deprecated status
- The `Shapes` library is not built by default anymore due to its deprecated
status
- @ref Audio::Playable is now by default omnidirectional instead of having
source in direction of negative Z axis (the direction has effect only when
setting inner and outer cone properties of @ref Audio::Source).
Expand Down
1 change: 0 additions & 1 deletion doc/cmake.dox
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ the components. The optional components are:
- `Primitives` --- @ref Primitives library
- `SceneGraph` --- @ref SceneGraph library
- `Shaders` --- @ref Shaders library
- `Shapes` @m_class{m-label m-danger} **deprecated** --- @ref Shapes library
- `Text` --- @ref Text library
- `TextureTools` --- @ref TextureTools library
- `Trade` --- @ref Trade library
Expand Down
13 changes: 0 additions & 13 deletions doc/coding-style.dox
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,6 @@ these are defined:
The @c \@glsl command expands to <tt>\@cb{.glsl}</tt>, making it possible to
have inline highlighted GLSL code snippets, similarly to @c \@cpp and @c \@cmake.

@subsubsection coding-style-documentation-commands-collisionoperator Shape collision operators

Out-of-class operators for collision and collision occurence in Shapes
namespace should be marked with @c \@collisionoperator and @c \@collisionoccurenceoperator,
e.g.:

@snippet coding-style.h collisionoperator

They will appear as related functions within documentation of class for which
the operator is implemented (not of class in which the operator is
implemented), thus efficiently connecting the two classes together in the
documentation.

@subsubsection coding-style-documentation-commands-extension Links to OpenGL, Vulkan and OpenAL extensions

If an OpenGL extension is referenced in the documentation, it should be done
Expand Down
1 change: 0 additions & 1 deletion doc/compilation-speedup.dox
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ available, each namespace has its own:
- @ref Magnum/Platform/Platform.h
- @ref Magnum/SceneGraph/SceneGraph.h
- @ref Magnum/Shaders/Shaders.h
- @ref Magnum/Shapes/Shapes.h
- @ref Magnum/Text/Text.h
- @ref Magnum/Trade/Trade.h
- @ref Magnum/Ui/Ui.h
Expand Down
4 changes: 0 additions & 4 deletions doc/custom-buildsystems-order.dot
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ digraph "Magnum library dependency order" {
MagnumPrimitives [label="Magnum\nPrimitives" class="m-info"]
MagnumSceneGraph [label="Magnum\nSceneGraph" class="m-info"]
MagnumShaders [label="Magnum\nShaders" class="m-info"]
MagnumShapes [label="Magnum\nShapes" class="m-dim"]
MagnumText [label="Magnum\nText" class="m-info"]
MagnumTextureTools [label="Magnum\nTextureTools" class="m-info"]
MagnumTrade [label="Magnum\nTrade" class="m-info"]
Expand All @@ -71,7 +70,6 @@ digraph "Magnum library dependency order" {
MagnumDebugTools -> MagnumMeshTools [style=dotted]
MagnumDebugTools -> MagnumPrimitives [style=dotted]
MagnumDebugTools -> MagnumShaders [style=dotted]
MagnumDebugTools -> MagnumShapes [style=dotted class="m-dim"]
MagnumDebugTools -> MagnumSceneGraph [style=dotted]

MagnumGL -> Magnum
Expand All @@ -87,8 +85,6 @@ digraph "Magnum library dependency order" {

MagnumShaders -> MagnumGL

MagnumShapes -> MagnumSceneGraph [class="m-dim"]

MagnumText -> MagnumTextureTools
MagnumText -> MagnumGL [style=dotted]

Expand Down
2 changes: 1 addition & 1 deletion doc/debug-tools.dox
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Example usage: visualizing object position, rotation and scaling using

@snippet MagnumDebugTools-gl.cpp debug-tools-renderers

See @ref DebugTools::ObjectRenderer and @ref DebugTools::ShapeRenderer for more
See @ref DebugTools::ObjectRenderer and @ref DebugTools::ForceRenderer for more
information.
*/
}
2 changes: 0 additions & 2 deletions doc/features.dox
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ necessary to read through everything, pick only what you need.
- @subpage opengl-wrapping --- @copybrief opengl-wrapping
- @subpage shaders --- @copybrief shaders
- @subpage scenegraph --- @copybrief scenegraph
- @subpage shapes @m_class{m-label m-danger} **deprecated** ---
@copybrief shapes
- @subpage debug-tools --- @copybrief debug-tools
- @subpage ui --- @copybrief ui
*/
Expand Down
38 changes: 0 additions & 38 deletions doc/namespaces.dox
Original file line number Diff line number Diff line change
Expand Up @@ -371,44 +371,6 @@ target_link_libraries(your-app Magnum::Shaders)
See @ref building, @ref cmake and @ref shaders for more information.
*/

/** @dir Magnum/Shapes
@brief Namespace @ref Magnum::Shapes

@deprecated The @ref Magnum::Shapes library is a failed design experiment and
is scheduled for removal in a future release. Related geometry algorithms
were moved to @ref Magnum::Math::Distance and @ref Magnum::Math::Intersection;
if you need a full-fledged physics library, please have look at
[Bullet](https://bulletphysics.org), which has Magnum integration in
@ref Magnum::BulletIntegration, or at [Box2D](https://box2d.org/), which
has a @ref examples-box2d "Magnum example" as well.
*/
/** @namespace Magnum::Shapes
@brief Shape library

@deprecated This library is a failed design experiment and is scheduled for
removal in a future release. Related geometry algorithms were moved to
@ref Math::Distance and @ref Math::Intersection; if you need a full-fledged
physics library, please have look at [Bullet](https://bulletphysics.org),
which has Magnum integration in @ref BulletIntegration, or at
[Box2D](https://box2d.org/), which has a @ref examples-box2d "Magnum example"
as well.

Collision detection system.

This library is built if `WITH_SHAPES` is enabled when building Magnum. To use
this library with CMake, you need to request the `Shapes` component of the
`Magnum` package and link to the `Magnum::Shapes` target:

@code{.cmake}
find_package(Magnum REQUIRED Shapes)

# ...
target_link_libraries(your-app Magnum::Shapes)
@endcode

See @ref building, @ref cmake and @ref shapes for more information.
*/

/** @dir Magnum/Text
* @brief Namespace @ref Magnum::Text
*/
Expand Down
6 changes: 0 additions & 6 deletions doc/scenegraph.dox
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,7 @@ for more detailed information and usage examples:
- @ref SceneGraph::Animable "SceneGraph::Animable*D" --- Adds animation
functionality to given object. Group of animables can be then controlled
using @ref SceneGraph::AnimableGroup "SceneGraph::AnimableGroup*D".
- @ref Shapes::Shape @m_class{m-label m-danger} **deprecated** --- Adds a
collision shape to given object. Group of shapes can be then controlled
using @ref Shapes::ShapeGroup "Shapes::ShapeGroup*D". See @ref shapes for
more information.
- @ref DebugTools::ObjectRenderer "DebugTools::ObjectRenderer*D",
@ref DebugTools::ShapeRenderer "DebugTools::ShapeRenderer*D"
@m_class{m-label m-danger} **deprecated**,
@ref DebugTools::ForceRenderer "DebugTools::ForceRenderer*D" --- Visualize
object properties, object shape or force vector for debugging purposes. See
@ref debug-tools for more information.
Expand Down
Loading

0 comments on commit aca02f5

Please sign in to comment.