Commit 98096802 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Some pre-merge clean-up:

* undo changes to .gitignore (regarding SWIG temporary files)
* moved implementation of PositionData and TransformData from header to source file
parent ccae23dd
......@@ -44,3 +44,6 @@ moc_*.cxx_parameters
# TBB library in ext/
ext/tbb
# SWIG wrapper code
*LUA_wrap.cxx
// ================================================================================================
//
// This file is part of the CAMPVis Software Framework.
//
// If not explicitly stated otherwise: Copyright (C) 2012-2014, all rights reserved,
// Christian Schulte zu Berge <christian.szb@in.tum.de>
// Chair for Computer Aided Medical Procedures
// Technische Universitaet Muenchen
// Boltzmannstr. 3, 85748 Garching b. Muenchen, Germany
//
// For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
// except in compliance with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software distributed under the
// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
// either express or implied. See the License for the specific language governing permissions
// and limitations under the License.
//
// ================================================================================================
#include "positiondata.h"
namespace campvis {
PositionData::PositionData( const tgt::vec3 &position, const tgt::vec4 &quaternion /*= tgt::vec4(0.f, 0.f, 0.f, 0.f) */ )
: AbstractData()
, _position(position)
, _quaternion(quaternion)
{
}
PositionData::~PositionData() {
}
PositionData* PositionData::clone() const {
return new PositionData(*this);
}
size_t PositionData::getLocalMemoryFootprint() const {
return sizeof(PositionData);
}
size_t PositionData::getVideoMemoryFootprint() const {
return 0;
}
}
......@@ -41,54 +41,52 @@ namespace campvis {
* \param position The initial position
* \param quaternion The initial quaternion/orientation
*/
explicit PositionData(const tgt::vec3 &position, const tgt::vec4 &quaternion = tgt::vec4(0.f, 0.f, 0.f, 0.f) )
: AbstractData()
, _position(position)
, _quaternion(quaternion)
{ };
explicit PositionData(const tgt::vec3 &position, const tgt::vec4 &quaternion = tgt::vec4(0.f, 0.f, 0.f, 0.f) );;
/**
* Virtual destructor
*/
virtual ~PositionData() {};
virtual ~PositionData();;
/// \see AbstractData::clone()
virtual PositionData* clone() const {
return new PositionData(*this);
};
virtual PositionData* clone() const;;
/// \see AbstractData::getLocalMemoryFootprint()
virtual size_t getLocalMemoryFootprint() const {
return sizeof(PositionData);
};
virtual size_t getLocalMemoryFootprint() const;;
/// \see AbstractData::getVideoMemoryFootprint()
virtual size_t getVideoMemoryFootprint() const {
return 0;
};
virtual size_t getVideoMemoryFootprint() const;;
/**
* Gets the quaternion
* \return _quaternion
**/
tgt::vec4 getQuaternion() const { return _quaternion; }
tgt::vec4 getQuaternion() const {
return _quaternion;
}
/**
* Sets the quaternion.
* \param val New quaternion vector
**/
void setQuaternion(const tgt::vec4 &val) { _quaternion = val; }
void setQuaternion(const tgt::vec4 &val) {
_quaternion = val;
}
/**
* Gets the position
* \return _position
**/
tgt::vec3 getPosition() const { return _position; }
tgt::vec3 getPosition() const {
return _position;
}
/**
* Sets the position.
* \param val New position vector
**/
void setPosition(const tgt::vec3 &val) { _position = val; }
void setPosition(const tgt::vec3 &val) {
_position = val;
}
protected:
......@@ -98,4 +96,4 @@ namespace campvis {
}
#endif // POSITION_H__
\ No newline at end of file
#endif // POSITION_H__
// ================================================================================================
//
// This file is part of the CAMPVis Software Framework.
//
// If not explicitly stated otherwise: Copyright (C) 2012-2014, all rights reserved,
// Christian Schulte zu Berge <christian.szb@in.tum.de>
// Chair for Computer Aided Medical Procedures
// Technische Universitaet Muenchen
// Boltzmannstr. 3, 85748 Garching b. Muenchen, Germany
//
// For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
// except in compliance with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software distributed under the
// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
// either express or implied. See the License for the specific language governing permissions
// and limitations under the License.
//
// ================================================================================================
#include "transformdata.h"
namespace campvis {
TransformData::TransformData(const tgt::mat4 & transform)
: AbstractData()
, _transform(transform)
{
}
TransformData::~TransformData() {
}
TransformData* TransformData::clone() const {
return new TransformData(*this);
}
size_t TransformData::getLocalMemoryFootprint() const {
return sizeof(TransformData);
}
size_t TransformData::getVideoMemoryFootprint() const {
return 0;
}
}
......@@ -40,41 +40,35 @@ namespace campvis {
* Constructor, Creates a new light source.
* \param transform The transformation
*/
explicit TransformData(const tgt::mat4 & transform)
: AbstractData()
, _transform(transform)
{
};
explicit TransformData(const tgt::mat4 & transform);
/**
* Virtual destructor
*/
virtual ~TransformData() {};
virtual ~TransformData();
/// \see AbstractData::clone()
virtual TransformData* clone() const {
return new TransformData(*this);
};
virtual TransformData* clone() const;
/// \see AbstractData::getLocalMemoryFootprint()
virtual size_t getLocalMemoryFootprint() const {
return sizeof(TransformData);
};
virtual size_t getLocalMemoryFootprint() const;
/// \see AbstractData::getVideoMemoryFootprint()
virtual size_t getVideoMemoryFootprint() const {
return 0;
};
virtual size_t getVideoMemoryFootprint() const;
/**
* Gets the transformation
* \return _transform
**/
tgt::mat4 getTransform() const { return _transform; }
tgt::mat4 getTransform() const {
return _transform;
}
/**
* Sets the transformation.
* \param _transformation New transformation matrix
**/
void setTransform(const tgt::mat4 & val) { _transform = val; }
void setTransform(const tgt::mat4 & val) {
_transform = val;
}
protected:
......@@ -83,4 +77,4 @@ namespace campvis {
}
#endif // TRANSFORMDATA_H__
\ No newline at end of file
#endif // TRANSFORMDATA_H__
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