diff options
author | Roman Pogribnyi <pogribnyi@gmail.com> | 2014-07-22 17:20:02 +0400 |
---|---|---|
committer | Roman Pogribnyi <pogribnyi@gmail.com> | 2014-07-22 17:20:02 +0400 |
commit | bab35daf74da926629e631f2e9ab6b143c93089b (patch) | |
tree | 9ccb06c7a57dfd8f2b673e207d8957e29c1cca0f /source/blender | |
parent | 5bd23adb6264e16f1f9c789cf1501c49469a6a9a (diff) |
unused files removed
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/python/manta_full/fluidsolver.h.reg.cpp | 26 | ||||
-rw-r--r-- | source/blender/python/manta_full/general.h | 151 |
2 files changed, 0 insertions, 177 deletions
diff --git a/source/blender/python/manta_full/fluidsolver.h.reg.cpp b/source/blender/python/manta_full/fluidsolver.h.reg.cpp deleted file mode 100644 index 4a1dbdec65e..00000000000 --- a/source/blender/python/manta_full/fluidsolver.h.reg.cpp +++ /dev/null @@ -1,26 +0,0 @@ - - - - - -// DO NOT EDIT ! -// This file is generated using the MantaFlow preprocessor (prep link). - - - - -#include "fluidsolver.h" -namespace Manta { -#ifdef _C_FluidSolver - static const Pb::Register _R_0 ("FluidSolver","Solver","PbClass"); - template<> const char* Namify<FluidSolver >::S = "FluidSolver"; - static const Pb::Register _R_1 ("FluidSolver","FluidSolver",FluidSolver::_W_0); - static const Pb::Register _R_2 ("FluidSolver","getGridSize",FluidSolver::_W_1); - static const Pb::Register _R_3 ("FluidSolver","printTimings",FluidSolver::_W_2); - static const Pb::Register _R_4 ("FluidSolver","saveMeanTimings",FluidSolver::_W_3); - static const Pb::Register _R_5 ("FluidSolver","printMemInfo",FluidSolver::_W_4); - static const Pb::Register _R_6 ("FluidSolver","step",FluidSolver::_W_5); - static const Pb::Register _R_7 ("FluidSolver","create",FluidSolver::_W_6); - static const Pb::Register _R_8 ("FluidSolver","timestep",FluidSolver::_GET_mDt,FluidSolver::_SET_mDt); -#endif -}
\ No newline at end of file diff --git a/source/blender/python/manta_full/general.h b/source/blender/python/manta_full/general.h deleted file mode 100644 index a4ac58a9635..00000000000 --- a/source/blender/python/manta_full/general.h +++ /dev/null @@ -1,151 +0,0 @@ - - - - - -// DO NOT EDIT ! -// This file is generated using the MantaFlow preprocessor (prep generate). - - - - -/****************************************************************************** - * - * MantaFlow fluid solver framework - * Copyright 2011 Tobias Pfaff, Nils Thuerey - * - * This program is free software, distributed under the terms of the - * GNU General Public License (GPL) - * http://www.gnu.org/licenses - * - * Globally used macros and functions - * - ******************************************************************************/ - -#ifndef _GENERAL_H -#define _GENERAL_H - -#include <iostream> -#include <sstream> -#include <cmath> - -namespace Manta { - -// activate debug mode if _DEBUG is defined (eg for windows) -#ifndef DEBUG -#ifdef _DEBUG -#define DEBUG 1 -#endif // _DEBUG -#endif // DEBUG - -// Standard exception -class Error : public std::exception -{ -public: - Error(const std::string& s) : mS(s) { -# ifdef DEBUG - // print error - std::cerr << "Aborting: "<< s <<" \n"; - // then force immedieate crash in debug mode - *(volatile int*)(0) = 1; -# endif - } - virtual ~Error() throw() {} - virtual const char* what() const throw() { return mS.c_str(); } -private: - std::string mS; -}; - -// mark unused parameter variables -#define unusedParameter(x) ((void)x) - -// Debug output functions and macros -extern int gDebugLevel; - -#define MSGSTREAM std::ostringstream msg; msg.precision(7); msg.width(9); -#define debMsg(mStr, level) if (_chklevel(level)) { MSGSTREAM; msg << mStr; std::cout << msg.str() << std::endl; } -inline bool _chklevel(int level=0) { return gDebugLevel >= level; } - -// error and assertation macros -#ifdef DEBUG -# define DEBUG_ONLY(a) a -#else -# define DEBUG_ONLY(a) -#endif -#define throwError(msg) { std::ostringstream __s; __s << msg << std::endl << "Error raised in " << __FILE__ << ":" << __LINE__; throw Manta::Error(__s.str()); } -#define errMsg(msg) throwError(msg); -#define assertMsg(cond,msg) if(!(cond)) throwError(msg) -#define assertDeb(cond,msg) DEBUG_ONLY( assertMsg(cond,msg) ) - -// template tricks -template<typename T> -struct remove_pointers { - typedef T type; -}; - -template<typename T> -struct remove_pointers<T*> { - typedef T type; -}; - -template<typename T> -struct remove_pointers<T&> { - typedef T type; -}; - -// Commonly used enums and types -//! Timing class for preformance measuring -struct MuTime { - MuTime() { get(); } - MuTime operator-(const MuTime& a) { MuTime b; b.time = time - a.time; return b; }; - MuTime operator+(const MuTime& a) { MuTime b; b.time = time + a.time; return b; }; - MuTime operator/(unsigned long a) { MuTime b; b.time = time / a; return b; }; - MuTime& operator+=(const MuTime& a) { time += a.time; return *this; } - MuTime& operator-=(const MuTime& a) { time -= a.time; return *this; } - MuTime& operator/=(unsigned long a) { time /= a; return *this; } - std::string toString(); - - void clear() { time = 0; } - void get(); - MuTime update(); - - unsigned long time; -}; -std::ostream& operator<< (std::ostream& os, const MuTime& t); - -//! generate a string with infos about the current mantaflow build -std::string buildInfoString(); - -// Some commonly used math helpers -template<class T> inline T square(T a) { - return a*a; -} -template<class T> inline T cubed(T a) { - return a*a; -} - -template<class T> inline T clamp(const T& val, const T& vmin, const T& vmax) { - if (val < vmin) return vmin; - if (val > vmax) return vmax; - return val; -} - -template<class T> inline T nmod(const T& a, const T& b); -template<> inline int nmod(const int& a, const int& b) { int c=a%b; return (c<0) ? (c+b) : c; } -template<> inline float nmod(const float& a, const float& b) { float c=std::fmod(a,b); return (c<0) ? (c+b) : c; } -template<> inline double nmod(const double& a, const double& b) { double c=std::fmod(a,b); return (c<0) ? (c+b) : c; } -template<class T> inline T safeDivide(const T& a, const T& b); -template<> inline int safeDivide<int>(const int &a, const int& b) { return (b) ? (a/b) : a; } -template<> inline float safeDivide<float>(const float &a, const float& b) { return (b) ? (a/b) : a; } -template<> inline double safeDivide<double>(const double &a, const double& b) { return (b) ? (a/b) : a; } - -inline bool c_isnan(float c) { - volatile float d=c; - return d != d; -} - -} // namespace - -#endif - - |