Commit d2c6d506 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'cleanup-planes' into 'master'

Merge duplicated plane implementatins into ACG

See merge request !2
parents 49fa186b 07d4c2e9
......@@ -283,7 +283,7 @@ ACG::Vec3d PlaneNode::yDirection()
//----------------------------------------------------------------
Plane& PlaneNode::getPlane()
PlaneNode::Plane& PlaneNode::getPlane()
{
return plane_;
}
......
......@@ -58,7 +58,7 @@
//== INCLUDES =================================================================
#include <ObjectTypes/Plane/PlaneType.hh>
#include <ACG/Geometry/Types/PlaneType.hh>
#include <ACG/Scenegraph/BaseNode.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include <ACG/Math/Matrix4x4T.hh>
......@@ -74,6 +74,7 @@
class OBJECTTYPEDLLEXPORT PlaneNode : public ACG::SceneGraph::BaseNode
{
public:
using Plane = ACG::Geometry::Plane;
/** \brief Construct a plane rendering node
*
* @param _parent The parent node in the scenegraph
......
......@@ -64,13 +64,16 @@
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
#include "PlaneTypes.hh"
#include <ACG/Geometry/Types/PlaneType.hh>
#include "PlaneNode.hh"
//== TYPEDEFS =================================================================
// //== CLASS DEFINITION =========================================================
class OBJECTTYPEDLLEXPORT PlaneObject : public BaseObjectData {
using Plane = ACG::Geometry::Plane;
friend class TypePlanePlugin;
......
/*===========================================================================*\
* *
* OpenFlipper *
* Copyright (c) 2001-2015, RWTH-Aachen University *
* Department of Computer Graphics and Multimedia *
* All rights reserved. *
* www.openflipper.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenFlipper. *
*---------------------------------------------------------------------------*
* *
* Redistribution and use in source and binary forms, with or without *
* modification, are permitted provided that the following conditions *
* are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice, *
* this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. Neither the name of the copyright holder nor the names of its *
* contributors may be used to endorse or promote products derived from *
* this software without specific prior written permission. *
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER *
* OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, *
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, *
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR *
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF *
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING *
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS *
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Author$ *
* $Date$ *
* *
\*===========================================================================*/
#include "PlaneType.hh"
//== IMPLEMENTATION ==========================================================
void Plane::setPlane(const ACG::Vec3d& _position, const ACG::Vec3d& _xDirection, const ACG::Vec3d& _yDirection)
{
position = _position;
xDirection = _xDirection;
yDirection = _yDirection;
normal = (_xDirection % _yDirection).normalize();
}
//----------------------------------------------------------------
void Plane::setPlane(const ACG::Vec3d& _position, const ACG::Vec3d& _normal)
{
//find a non zero component
int comp = -1;
for (int i=0; i < 3; i++)
if ( _normal[i] != 0.0 ){
comp = i;
break;
}
if (comp == -1){
std::cerr << "PlaneNode: normal is invalid!" << std::endl;
return;
}
//compute orthogonal vectors in the plane
xDirection[comp] = (-_normal[ (comp + 1) % 3 ] - _normal[(comp + 2) % 3]) / _normal[comp];
xDirection[ (comp + 1) % 3 ] = 1;
xDirection[ (comp + 2) % 3 ] = 1;
xDirection = xDirection.normalize();
yDirection = _normal % xDirection;
yDirection = yDirection.normalize();
position = _position;
normal = _normal;
}
//----------------------------------------------------------------
void Plane::transform(const ACG::Matrix4x4d& _mat)
{
position = _mat.transform_point(position);
xDirection = _mat.transform_vector(xDirection);
yDirection = _mat.transform_vector(yDirection);
normal = (xDirection % yDirection).normalize();
}
//----------------------------------------------------------------
void Plane::setSize(double _xDirection, double _yDirection)
{
xDirection = xDirection.normalize() * _xDirection;
yDirection = yDirection.normalize() * _yDirection;
}
//=============================================================================
/*===========================================================================*\
* *
* OpenFlipper *
* Copyright (c) 2001-2015, RWTH-Aachen University *
* Department of Computer Graphics and Multimedia *
* All rights reserved. *
* www.openflipper.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenFlipper. *
*---------------------------------------------------------------------------*
* *
* Redistribution and use in source and binary forms, with or without *
* modification, are permitted provided that the following conditions *
* are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice, *
* this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. Neither the name of the copyright holder nor the names of its *
* contributors may be used to endorse or promote products derived from *
* this software without specific prior written permission. *
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER *
* OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, *
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, *
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR *
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF *
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING *
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS *
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Author$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS Plane
//
//=============================================================================
#ifndef PLANE_HH
#define PLANE_HH
//== INCLUDES =================================================================
#include <ACG/Math/Matrix4x4T.hh>
#include <ACG/Math/VectorT.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
//== NAMESPACES ===============================================================
//== CLASS DEFINITION =========================================================
/** \class Plane PlaneType.hh <ObjectTypes/Plane/PlaneType.hh>
This class defines a simple plane
**/
class OBJECTTYPEDLLEXPORT Plane {
public:
/** \brief Set plane
*
* @param _position One point on the plane. Will be used as corner point point for rendering in the PlaneNode
* @param _xDirection Vector pointing in planes x direction
* @param _yDirection Vector pointing in planes y direction
*/
void setPlane(const ACG::Vec3d& _position, const ACG::Vec3d& _xDirection, const ACG::Vec3d& );
/** \brief Set plane with given normal and one point
*
* @param _position One point on the plane. Will be used as corner point for rendering in the PlaneNode
* @param _normal Plane normal
*/
void setPlane(const ACG::Vec3d & _position, const ACG::Vec3d & _normal);
/** \brief Set plane size
*
* Scales the plane such that the x and y direction vectors have the given lengths
*
* @param _xDirection Size in x direction
* @param _yDirection Size in y direction
*/
void setSize(double _xDirection, double _yDirection);
/** \brief Transform the plane with given matrix
*
*
* @param _mat Transformation matrix.
*/
void transform(const ACG::Matrix4x4d & _mat);
public:
ACG::Vec3d position;
ACG::Vec3d normal;
ACG::Vec3d xDirection;
ACG::Vec3d yDirection;
};
//=============================================================================
#endif // PLANE_HH defined
//=============================================================================
......@@ -58,7 +58,8 @@
//== INCLUDES =================================================================
#include <ObjectTypes/Plane/PlaneType.hh>
#include <ACG/Geometry/Types/PlaneType.hh>
using ACG::Geometry::Plane;
#include <ObjectTypes/Plane/PlaneNode.hh>
//== TYPEDEFS FOR SIMPLER ACCESS ==============================================
......
......@@ -59,6 +59,7 @@
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
#include "PlaneObject.hh"
/** The Namespace PluginFunctions contains functions for all plugins. */
namespace PluginFunctions {
......@@ -83,7 +84,7 @@ PlaneNode* planeNode( BaseObjectData* _object );
* Plane will be returned. Otherwise a NULL pointer is returned.
*/
OBJECTTYPEDLLEXPORT
Plane* plane( BaseObjectData* _object );
ACG::Geometry::Plane* plane( BaseObjectData* _object );
/** \brief Cast an BaseObject to a PlaneObject if possible
*
......
......@@ -46,6 +46,7 @@
#include <ACG/GL/GLState.hh>
#include <ACG/Math/VectorT.hh>
#include <ACG/Geometry/Types/PlaneType.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
......@@ -118,6 +119,7 @@ class OBJECTTYPEDLLEXPORT QtPlaneSelect : public QObject
PlaneNode* planeNode_;
private:
using Plane = ACG::Geometry::Plane;
Plane plane_;
void setPlaneAndSize(const ACG::Vec3d& _sourcePoint3D,const ACG::Vec3d& _target2D);
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment