mirror of
				https://bitbucket.org/mfeemster/fractorium.git
				synced 2025-10-31 01:10:24 -04:00 
			
		
		
		
	--User changes
-Add a palette editor. -Add support for reading .ugr/.gradient/.gradients palette files. -Allow toggling on spinners whose minimum value is not zero. -Allow toggling display of image, affines and grid. -Add new variations: cylinder2, circlesplit, tile_log, truchet_fill, waves2_radial. --Bug fixes -cpow2 was wrong. -Palettes with rapid changes in color would produce slightly different outputs from Apo/Chaotica. This was due to a long standing bug from flam3. -Use exec() on Apple and show() on all other OSes for dialog boxes. -Trying to render a sequence with no frames would crash. -Selecting multiple xforms and rotating them would produce the wrong rotation. -Better handling when parsing flames using different encoding, such as unicode and UTF-8. -Switching between SP/DP didn't reselect the selected flame in the Library tab. --Code changes -Make all types concerning palettes be floats, including PaletteTableWidgetItem. -PaletteTableWidgetItem is no longer templated because all palettes are float. -Include the source colors for user created gradients. -Change parallel_for() calls to work with very old versions of TBB which are lingering on some systems. -Split conditional out of accumulation loop on the CPU for better performance. -Vectorize summing when doing density filter for better performance. -Make all usage of palettes be of type float, double is pointless. -Allow palettes to reside in multiple folders, while ensuring only one of each name is added. -Refactor some palette path searching code. -Make ReadFile() throw and catch an exception if the file operation fails. -A little extra safety in foci and foci3D with a call to Zeps(). -Cast to (real_t) in the OpenCL string for the w variation, which was having trouble compiling on Mac. -Fixing missing comma between paths in InitPaletteList(). -Move Xml and PaletteList classes into cpp to shorten build times when working on them. -Remove default param values for IterOpenCLKernelCreator<T>::SharedDataIndexDefines in cpp file. -Change more NULL to nullptr.
This commit is contained in:
		| @ -1951,7 +1951,6 @@ class DeltaAVariation : public Variation<T> | ||||
| { | ||||
| public: | ||||
| 	DeltaAVariation(T weight = 1.0) : Variation<T>("deltaa", eVariationId::VAR_DELTA_A, weight) { } | ||||
|  | ||||
| 	VARCOPY(DeltaAVariation) | ||||
|  | ||||
| 	virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override | ||||
| @ -4551,7 +4550,7 @@ protected: | ||||
| 		m_Params.push_back(ParamWithName<T>(true, &m_S,    prefix + "ripple_s")); | ||||
| 		m_Params.push_back(ParamWithName<T>(true, &m_Is,   prefix + "ripple_is")); | ||||
| 		m_Params.push_back(ParamWithName<T>(true, &m_Vxp,  prefix + "ripple_vxp")); | ||||
| 		m_Params.push_back(ParamWithName<T>(true, &m_Pxa , prefix + "ripple_pxa")); | ||||
| 		m_Params.push_back(ParamWithName<T>(true, &m_Pxa, prefix + "ripple_pxa")); | ||||
| 		m_Params.push_back(ParamWithName<T>(true, &m_Pixa, prefix + "ripple_pixa")); | ||||
| 	} | ||||
|  | ||||
| @ -5420,14 +5419,14 @@ public: | ||||
| 	virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override | ||||
| 	{ | ||||
| 		T a = helper.m_PrecalcAtanyx; | ||||
| 		int n = rand.Rand(uint(m_Spread)); | ||||
| 		int n = rand.Rand(m_SpreadUint); | ||||
|  | ||||
| 		if (a < 0) | ||||
| 			n++; | ||||
|  | ||||
| 		a += M_2PI * n; | ||||
|  | ||||
| 		if (std::cos(a * m_InvSpread) < rand.Rand() * 2 / 0xFFFFFFFF - 1)//Rand max. | ||||
| 		if (std::cos(a * m_InvSpread) < rand.Rand() * T(2) / 0xFFFFFFFF - T(1))//Rand max. | ||||
| 			a -= m_FullSpread; | ||||
|  | ||||
| 		T lnr2 = std::log(helper.m_PrecalcSumSquares); | ||||
| @ -5464,7 +5463,7 @@ public: | ||||
| 		   << "\n" | ||||
| 		   << "\t\ta += M_2PI * n;\n" | ||||
| 		   << "\n" | ||||
| 		   << "\t\tif (cos(a * " << invSpread << ") < MwcNext(mwc) * 2 / 0xFFFFFFFF - 1)\n" | ||||
| 		   << "\t\tif (cos(a * " << invSpread << ") < MwcNext(mwc) * (real_t)2.0 / 0xFFFFFFFF - (real_t)1.0)\n" | ||||
| 		   << "\t\t	a -= " << fullSpread << ";\n" | ||||
| 		   << "\n" | ||||
| 		   << "\t\treal_t lnr2 = log(precalcSumSquares);\n" | ||||
| @ -5487,6 +5486,7 @@ public: | ||||
| 		m_HalfD = m_D / 2; | ||||
| 		m_InvSpread = T(0.5) / m_Spread; | ||||
| 		m_FullSpread = M_2PI * m_Spread; | ||||
| 		m_SpreadUint = uint(m_Spread); | ||||
| 	} | ||||
|  | ||||
| protected: | ||||
| @ -5512,7 +5512,8 @@ private: | ||||
| 	T m_A; | ||||
| 	T m_Divisor; | ||||
| 	T m_Spread; | ||||
| 	T m_C;//Precalc. | ||||
| 	uint m_SpreadUint;//Precalc. | ||||
| 	T m_C; | ||||
| 	T m_HalfC; | ||||
| 	T m_D; | ||||
| 	T m_HalfD; | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Person
					Person