"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "pariso/commun.h" between
mathmod-11.0-source.zip and mathmod-11.1-source.zip

About: MathMod is a mathematical modeling software that visualize and animate implicit and parametric surfaces.

commun.h  (mathmod-11.0-source)	:	commun.h  (mathmod-11.1-source)
skipping to change at line 22		skipping to change at line 22
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *		* GNU General Public License for more details. *
* *		* *
* You should have received a copy of the GNU General Public License *		* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *		* along with this program; if not, write to the *
* Free Software Foundation, Inc., *		* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor,Boston, MA 02110-1301 USA *		* 51 Franklin Street, Fifth Floor,Boston, MA 02110-1301 USA *
***************************************************************************/		***************************************************************************/
#include "../fparser/fparser.hh"		#include "../fparser/fparser.hh"
#include <qthread.h>		#include <qthread.h>
		#include <complex.h>
		#include <tgmath.h>
#define PI (double(314159265) / double(100000000))		#define PI (double(314159265) / double(100000000))
#define MAGIC_SCALE 1.5707963f		#define MAGIC_SCALE 1.5707963f
extern template class FunctionParserBase<double>; // explicit instantiation		extern template class FunctionParserBase<double>; // explicit instantiation
// declaration
struct GlobalParam		struct GlobalParam
{		{
uint TypeDrawin = 10;		uint TypeDrawin = 10;
uint TypeDrawinNormStep = 4;		uint TypeDrawinNormStep = 4;
uint PreviousSizeMinimalTopology = 0;		uint PreviousSizeMinimalTopology = 0;
uint NbPolyMinimalTopology = 0;		uint NbPolyMinimalTopology = 0;
uint NbVertexTmp = 0;		uint NbVertexTmp = 0;
};		};
skipping to change at line 146		skipping to change at line 147
std::vector<uint> ParisoTriangle;		std::vector<uint> ParisoTriangle;
std::vector<uint> ParisoVertex;		std::vector<uint> ParisoVertex;
std::vector<uint> NbComponentsType;		std::vector<uint> NbComponentsType;
std::vector<bool> ThereisCND;		std::vector<bool> ThereisCND;
std::vector<bool> ThereisRGBA;		std::vector<bool> ThereisRGBA;
std::vector<bool> ParisoCondition;		std::vector<bool> ParisoCondition;
std::vector<bool> ShowParIsoCmp;		std::vector<bool> ShowParIsoCmp;
uint ParisoNbComponents = 1;		uint ParisoNbComponents = 1;
uint ParisoCurrentComponentIndex = 0;		uint ParisoCurrentComponentIndex = 0;
		uint NbParametricMeshLines=0;
		uint MinParametricMeshLines=0;
		std::vector<uint> ParametricGrid;
std::vector<uint> NbTrianglesVerifyCND;		std::vector<uint> NbTrianglesVerifyCND;
std::vector<uint> NbTrianglesNoCND;		std::vector<uint> NbTrianglesNoCND;
std::vector<uint> NbTrianglesNotVerifyCND;		std::vector<uint> NbTrianglesNotVerifyCND;
std::vector<uint> NbTrianglesBorderCND;		std::vector<uint> NbTrianglesBorderCND;
NoiseParemeters NoiseParam[2];		NoiseParemeters NoiseParam[2];
bool Interleave = false;		bool Interleave = false;
bool pariso = false;		bool pariso = false;
bool updateviewer = false;		bool updateviewer = false;
		std::vector<bool> hsv;
};		};
struct ObjectProperties		struct ObjectProperties
{		{
float *ArrayNorVer_localPt;		float *ArrayNorVer_localPt;
uint *PolyIndices_localPt;		uint *PolyIndices_localPt;
uint *PolyIndices_localPtMin;		uint *PolyIndices_localPtMin;
int *TypeSurfaceTriangleListeCND;		int *TypeSurfaceTriangleListeCND;
uint NbPolygnNbVertexPtMin = 0;		uint NbPolygnNbVertexPtMin = 0;
uint NbPolygnNbVertexPtMinSize = 0;		uint NbPolygnNbVertexPtMinSize = 0;
uint PolyNumber = 0;		uint PolyNumber = 0;
uint VertxNumber = 0;		uint VertxNumber = 0;
uint NbBorderpoints;		uint NbBorderpoints;
struct ComponentInfos componentsinfos;		struct ComponentInfos componentsinfos;
int IndexCurrentFormula = -1;		int IndexCurrentFormula = -1;
bool ShininessValUpdated=true;		bool ShininessValUpdated=true;
bool AmbientValUpdated=true;		bool AmbientValUpdated=true;
bool DiffuseValUpdated=true;		bool DiffuseValUpdated=true;
		bool FrontSurfValUpdated=false;
int border = 1;		int border = 1;
int anim = -1;		int anim = -1;
int animxyz = 1;		int animxyz = 1;
int animx = -1;		int animx = -1;
int animy = -1;		int animy = -1;
int animz = -1;		int animz = -1;
float animxValue = 0.0;		float animxValue = 0.0;
float animyValue = 0.0;		float animyValue = 0.0;
float animzValue = 0.0;		float animzValue = 0.0;
float animxValueStep = 0.0;		float animxValueStep = 0.0;
float animyValueStep = 0.0;		float animyValueStep = 0.0;
float animzValueStep = 0.0;		float animzValueStep = 0.0;
		int glFrontFacingSupport = 1;
int slider = -1;		int slider = -1;
int morph = -1;		int morph = -1;
int morphstep = -1;		int morphstep = -1;
int typedrawing = 1;		int typedrawing = 1;
int mesh = 1;		int mesh = 1;
int fill = 1;		int fill = 1;
int transparency = -1;		int transparency = -1;
int boundingbox = -1;		int boundingbox = -1;
bool activarecnd = true;		bool activarecnd = true;
bool updategl = true;		bool updategl = true;
End of changes. 6 change blocks.
1 lines changed or deleted		9 lines changed or added

---