mirror of
https://github.com/OpenCMT/uLib.git
synced 2025-12-06 07:21:31 +01:00
Removed dependencies from Core lib
This commit is contained in:
@@ -26,25 +26,25 @@
|
||||
|
||||
|
||||
|
||||
/*
|
||||
/*
|
||||
* <one line to give the program's name and a brief idea of what it does.>
|
||||
* Copyright (C) 2012 Andrea Rigoni Garola <andrea@pcimg05>
|
||||
*
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as
|
||||
* published by the Free Software Foundation; either version 2.1 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301 USA
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -54,9 +54,6 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <Eigen/Dense>
|
||||
#include "Core/Types.h"
|
||||
#include "Core/Serializable.h"
|
||||
|
||||
|
||||
|
||||
//// BOOST SERIALIZATION ///////////////////////////////////////////////////////
|
||||
@@ -109,6 +106,7 @@ std::ostream & operator << (std::ostream &os, const Eigen::Matrix<T,size,1> &vec
|
||||
|
||||
namespace uLib {
|
||||
|
||||
typedef id_t Id_t;
|
||||
|
||||
typedef int Scalari;
|
||||
typedef unsigned int Scalarui;
|
||||
@@ -199,7 +197,7 @@ public:
|
||||
_HPoint3f<p>(Vector3f &in) : BaseClass(in.homogeneous()) { this->operator()(3) = p; }
|
||||
|
||||
void operator delete(void* _p, size_t _s) {}
|
||||
|
||||
|
||||
// This constructor allows to construct MyVectorType from Eigen expressions
|
||||
template<typename OtherDerived>
|
||||
inline _HPoint3f<p>(const Eigen::MatrixBase<OtherDerived>& other)
|
||||
@@ -264,6 +262,9 @@ operator<< (std::ostream& stream, const HError3f &err) {
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// SERIALIZTION //
|
||||
|
||||
#ifdef ULIB_SERIALIZATION_ON
|
||||
#include "Core/Serializable.h"
|
||||
|
||||
ULIB_SERIALIZABLE(uLib::HPoint3f)
|
||||
|
||||
ULIB_SERIALIZABLE(uLib::HVector3f)
|
||||
@@ -272,7 +273,7 @@ ULIB_SERIALIZABLE(uLib::HVector3f)
|
||||
ULIB_SERIALIZABLE(uLib::HLine3f)
|
||||
|
||||
ULIB_SERIALIZABLE(uLib::HError3f)
|
||||
|
||||
#endif // ULIB_SERIALIZATION_ON
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user