Skip to content

Commit

Permalink
python: initial SceneGraph bits.
Browse files Browse the repository at this point in the history
  • Loading branch information
mosra committed May 21, 2019
1 parent 113a2fe commit 2924454
Show file tree
Hide file tree
Showing 8 changed files with 342 additions and 4 deletions.
6 changes: 4 additions & 2 deletions doc/python/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
import magnum.platform.glfw
import magnum.platform.sdl2
import magnum.shaders
import magnum.scenegraph

# So the doc see everything
# TODO: use just +=, m.css should reorder this on its own
magnum.__all__ = ['math', 'gl', 'platform', 'shaders'] + magnum.__all__
magnum.__all__ = ['math', 'gl', 'platform', 'shaders', 'scenegraph'] + magnum.__all__

# TODO ugh... can this be expressed directly in pybind?
magnum.gl.__annotations__ = {}
Expand All @@ -43,7 +44,8 @@
'magnum.rst',
'magnum.gl.rst',
'magnum.math.rst',
'magnum.platform.rst'
'magnum.platform.rst',
'magnum.scenegraph.rst'
]

LINKS_NAVBAR2 = [
Expand Down
83 changes: 83 additions & 0 deletions doc/python/magnum.scenegraph.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
..
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Vladimír Vondruš <mosra@centrum.cz>

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.
..
.. py:module:: magnum.scenegraph
The Python API for :dox:`SceneGraph` provides, similarly to C++, multiple
different transformation implementations. Recommended usage is importing
desired implementation akin to :cpp:`typedef`\ ing the types in C++:

.. code-figure::

.. code:: c++

#include <Magnum/SceneGraph/Object.h>
#include <Magnum/SceneGraph/Scene.h>
#include <Magnum/SceneGraph/MatrixTransformation3D.h>

typedef SceneGraph::Scene<SceneGraph::MatrixTransformation3D> Scene3D;
typedef SceneGraph::Object<SceneGraph::MatrixTransformation3D> Object3D;

C++

.. code-figure::

.. code:: py
from magnum import scenegraph
from magnum.scenegraph.matrix import Scene3D, Object3D
Python

`Scene vs Object`_
==================

In C++, the Scene is a subclass of Object. However, because the Scene
object is not transformable nor it's possible to attach features to it,
most of the inherited API is unusable. This could be considered a wart of
the C++ API, so the Python bindings expose Scene and Object as two
unrelated types and all APIs that can take either a Scene or an Object
have corresponding overloads.

`Reference counting`_
=====================

Compared to C++, the following is done with all Object instances created
on Python side:

- the object is additionally referenced by its parent (if there's any)
so objects created in local scope stay alive even after exiting the
scope
- deleting its parent (either due to it going out of scope in C++ or
using :py:`del` in Python) will cause it to have no parent (instead of
being cascade deleted as well)
- in order to actually destroy an object, it has to have no parent

For features it's a bit different, as it's not possible to have a feature
that's not attached to any object:

.. note-danger::

UH OH cyclic refs in pybind HOW
2 changes: 1 addition & 1 deletion package/ci/travis-desktop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ cmake .. \
-DWITH_GL=ON \
-DWITH_MESHTOOLS=OFF \
-DWITH_PRIMITIVES=OFF \
-DWITH_SCENEGRAPH=OFF \
-DWITH_SCENEGRAPH=ON \
-DWITH_SHADERS=ON \
-DWITH_TEXT=OFF \
-DWITH_TEXTURETOOLS=OFF \
Expand Down
1 change: 1 addition & 0 deletions src/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ add_subdirectory(magnum)
# configure_file() and then replacing generator expressions with file(GENERATE)
foreach(target
magnum_gl
magnum_scenegraph
magnum_shaders
magnum_platform_egl
magnum_platform_glx
Expand Down
15 changes: 14 additions & 1 deletion src/python/magnum/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#

# *Not* REQUIRED
find_package(Magnum COMPONENTS GL Shaders)
find_package(Magnum COMPONENTS GL Shaders SceneGraph)

set(magnum_SRCS
magnum.cpp
Expand Down Expand Up @@ -55,6 +55,19 @@ if(Magnum_GL_FOUND)
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()

if(Magnum_SceneGraph_FOUND)
set(magnum_scenegraph_SRCS
scenegraph.cpp)

pybind11_add_module(magnum_scenegraph ${magnum_scenegraph_SRCS})
target_include_directories(magnum_scenegraph PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_scenegraph PRIVATE Magnum::SceneGraph)
set_target_properties(magnum_scenegraph PROPERTIES
FOLDER "python"
OUTPUT_NAME "scenegraph"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()

if(Magnum_Shaders_FOUND)
set(magnum_shaders_SRCS
shaders.cpp)
Expand Down
181 changes: 181 additions & 0 deletions src/python/magnum/scenegraph.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Vladimír Vondruš <mosra@centrum.cz>
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.
*/

#include <pybind11/pybind11.h>
#include <Magnum/SceneGraph/Object.h>
#include <Magnum/SceneGraph/Scene.h>
#include <Magnum/SceneGraph/MatrixTransformation2D.h>
#include <Magnum/SceneGraph/MatrixTransformation3D.h>

#include "magnum/bootstrap.h"

namespace magnum { namespace {

template<class Transformation> class PyObject: public SceneGraph::Object<Transformation> {
public:
PyObject(SceneGraph::Object<Transformation>* parent): SceneGraph::Object<Transformation>{parent} {}

private:
void doErase() override {}
};

template<class Transformation> void scene(py::class_<SceneGraph::Scene<Transformation>>& c) {
c.def(py::init(), "Constructor");
}

template<UnsignedInt dimensions, class Transformation> void object(py::class_<PyObject<Transformation>>& c) {
c
.def(py::init([](PyObject<Transformation>* parent) {
return new PyObject<Transformation>{parent};
}), "Constructor", py::arg("parent") = nullptr)
.def(py::init([](SceneGraph::Scene<Transformation>* parent) {
return new PyObject<Transformation>{parent};
}), "Constructor", py::arg("parent") = nullptr)

/* Properties */
.def_property_readonly("scene", [](PyObject<Transformation>& self) {
return static_cast<SceneGraph::Scene<Transformation>*>(self.scene());
}, "Scene or None if the object is not a part of any scene")
.def_property("parent", [](PyObject<Transformation>& self) {
return static_cast<PyObject<Transformation>*>(self.parent());
}, [](PyObject<Transformation>& self, PyObject<Transformation>* parent) {
self.setParent(parent);
}, "Parent object or None if this is the root object")

/* Matrix transformation APIs */
.def("transformation_matrix", &PyObject<Transformation>::transformationMatrix,
"Transformation matrix")
.def("absolute_transformation_matrix", &PyObject<Transformation>::absoluteTransformationMatrix,
"Transformation matrix relative to the root object")

/* Transformation APIs common to all implementations */
.def_property("transformation",
&PyObject<Transformation>::transformation,
&PyObject<Transformation>::setTransformation,
"Object transformation")
.def("absolute_transformation", &PyObject<Transformation>::absoluteTransformation,
"Transformation relative to the root object")
.def("reset_transformation", [](PyObject<Transformation>& self) {
self.resetTransformation();
}, "Reset the transformation")
.def("transform", [](PyObject<Transformation>& self, const typename Transformation::DataType& transformation) {
self.transform(transformation);
}, "Transform the object")
.def("transform_local", [](PyObject<Transformation>& self, const typename Transformation::DataType& transformation) {
self.transformLocal(transformation);
}, "Transform the object as a local transformation")
.def("translate", [](PyObject<Transformation>& self, const VectorTypeFor<dimensions, typename Transformation::DataType::Type>& vector) {
self.translate(vector);
}, "Translate the object")
.def("translate_local", [](PyObject<Transformation>& self, const VectorTypeFor<dimensions, typename Transformation::DataType::Type>& vector) {
self.translateLocal(vector);
}, "Translate the object as a local transformation");
}

template<class Transformation> void object2D(py::class_<PyObject<Transformation>>& c) {
c
.def("rotate", [](PyObject<Transformation>& self, const Radd angle) {
self.rotate(static_cast<Math::Rad<typename Transformation::DataType::Type>>(angle));
}, "Rotate the object")
.def("rotate_local", [](PyObject<Transformation>& self, const Radd angle) {
self.rotateLocal(static_cast<Math::Rad<typename Transformation::DataType::Type>>(angle));
}, "Rotate the object as a local transformation");
}

template<class Transformation> void object3D(py::class_<PyObject<Transformation>>& c) {
c
.def("rotate", [](PyObject<Transformation>& self, const Radd angle, const Math::Vector3<typename Transformation::DataType::Type>& normalizedAxis) {
self.rotate(static_cast<Math::Rad<typename Transformation::DataType::Type>>(angle), normalizedAxis);
}, "Rotate the object as a local transformation", py::arg("angle"), py::arg("normalized_axis"))
.def("rotate_local", [](PyObject<Transformation>& self, const Radd angle, const Math::Vector3<typename Transformation::DataType::Type>& normalizedAxis) {
self.rotateLocal(static_cast<Math::Rad<typename Transformation::DataType::Type>>(angle), normalizedAxis);
}, "Rotate the object as a local transformation", py::arg("angle"), py::arg("normalized_axis"))
.def("rotateX", [](PyObject<Transformation>& self, const Radd angle) {
self.rotateX(static_cast<Math::Rad<typename Transformation::DataType::Type>>(angle));
}, "Rotate the object around X axis")
.def("rotate_x_local", [](PyObject<Transformation>& self, const Radd angle) {
self.rotateXLocal(static_cast<Math::Rad<typename Transformation::DataType::Type>>(angle));
}, "Rotate the object around X axis as a local transformation")
.def("rotate_y", [](PyObject<Transformation>& self, const Radd angle) {
self.rotateY(static_cast<Math::Rad<typename Transformation::DataType::Type>>(angle));
}, "Rotate the object around Y axis")
.def("rotate_y_local", [](PyObject<Transformation>& self, const Radd angle) {
self.rotateYLocal(static_cast<Math::Rad<typename Transformation::DataType::Type>>(angle));
}, "Rotate the object around Y axis as a local transformation")
.def("rotate_z", [](PyObject<Transformation>& self, const Radd angle) {
self.rotateZ(static_cast<Math::Rad<typename Transformation::DataType::Type>>(angle));
}, "Rotate the object around Z axis")
.def("rotate_z_local", [](PyObject<Transformation>& self, const Radd angle) {
self.rotateZLocal(static_cast<Math::Rad<typename Transformation::DataType::Type>>(angle));
}, "Rotate the object around Z axis as a local transformation");
}

template<UnsignedInt dimensions, class Transformation> void objectScale(py::class_<PyObject<Transformation>>& c) {
c
.def("scale", [](PyObject<Transformation>& self, const VectorTypeFor<dimensions, typename Transformation::DataType::Type>& vector) {
self.scale(vector);
}, "Scale the object")
.def("scale_local", [](PyObject<Transformation>& self, const VectorTypeFor<dimensions, typename Transformation::DataType::Type>& vector) {
self.scaleLocal(vector);
}, "Scale the object as a local transformation")
.def("reflect", [](PyObject<Transformation>& self, const VectorTypeFor<dimensions, typename Transformation::DataType::Type>& vector) {
self.reflect(vector);
}, "Reflect the object")
.def("reflect_local", [](PyObject<Transformation>& self, const VectorTypeFor<dimensions, typename Transformation::DataType::Type>& vector) {
self.reflectLocal(vector);
}, "Reflect the object as a local transformation");
}

void scenegraph(py::module& m) {
{
py::module matrix = m.def_submodule("matrix");
matrix.doc() = "General matrix-based scene graph implementation";

py::class_<SceneGraph::Scene<SceneGraph::MatrixTransformation2D>> scene2D_{matrix, "Scene2D", "Two-dimensional scene with matrix-based transformation implementation"};
scene(scene2D_);

py::class_<SceneGraph::Scene<SceneGraph::MatrixTransformation3D>> scene3D_{matrix, "Scene3D", "Three-dimensional scene with matrix-based transformation implementation"};
scene(scene3D_);

py::class_<PyObject<SceneGraph::MatrixTransformation2D>> object2D_{matrix, "Object2D", "Two-dimensional object with matrix-based transformation implementation"};
object<2>(object2D_);
object2D(object2D_);
objectScale<2>(object2D_);

py::class_<PyObject<SceneGraph::MatrixTransformation3D>> object3D_{matrix, "Object3D", "Three-dimensional object with matrix-based transformation implementation"};
object<3>(object3D_);
object3D(object3D_);
objectScale<3>(object3D_);
}
}

}}

PYBIND11_MODULE(scenegraph, m) {
m.doc() = "Scene graph library";

magnum::scenegraph(m);
}

57 changes: 57 additions & 0 deletions src/python/magnum/test/test_scenegraph.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#
# This file is part of Magnum.
#
# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
# Vladimír Vondruš <mosra@centrum.cz>
#
# 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.
#

import unittest

from magnum import *
from magnum import scenegraph
from magnum.scenegraph.matrix import Object3D, Scene3D

class Object(unittest.TestCase):
def test_hierarchy(self):
scene = Scene3D()
a = Object3D()
self.assertIs(a.scene, None)

b = Object3D(parent=scene)
self.assertIs(b.scene, scene)
self.assertIs(b.parent, scene)

c = Object3D(parent=b)
self.assertIs(c.scene, scene)
self.assertIs(c.parent, b)

def test_transformation(self):
scene = Scene3D()

a = Object3D(scene)
self.assertEqual(a.transformation, Matrix4.identity_init())
self.assertEqual(a.absolute_transformation(), Matrix4.identity_init())

b = Object3D(a)
a.translate((3.0, 4.0, 5.0))
self.assertEqual(a.transformation, Matrix4.translation([3.0, 4.0, 5.0]))
self.assertEqual(b.transformation, Matrix4.identity_init())
self.assertEqual(b.absolute_transformation(), Matrix4.translation([3.0, 4.0, 5.0]))
Loading

0 comments on commit 2924454

Please sign in to comment.