mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
330074cfb2
-Add new variations: bubbleT3D, crob, hexaplay3D, hexcrop, hexes, hexnix3D, loonie2, loonie3, nBlur, octapol and synth. -Allow for pre/post versions of dc_bubble, dc_cylinder and dc_linear whereas before they were omitted. -When saving a file with multiple embers in it, detect if time values are all the same and if so, start them at zero and increment by 1 for each ember. -Allow for numerous quality increases to be coalesced into one. It will pick up at the end of the current render. -Show selection highlight on variations tree in response to mouse hover. This makes it easier to see for which variation or param the current mouse wheel action will apply. -Make default temporal samples be 100, whereas before it was 1000 which was overkill. -Require the shift key to be held with delete for deleting an ember to prevent it from triggering when the user enters delete in the edit box. -This wasn't otherwise fixable without writing a lot more code. --Bug fixes -EmberGenome was crashing when generating a sequence from a source file with more than 2 embers in it. -EmberGenome was improperly handling the first frame of a merge after the last frame of the loop. -These bugs were due to a previous commit. Revert parts of that commit. -Prevent a zoom value of less than 0 when reading from xml. -Slight optimization of the crescents, and mask variations, if the compiler wasn't doing it already. -Unique file naming was broken because it was looking for _# and the default names ended with -#. -Disallow renaming of an ember in the library tree to an empty string. -Severe bug that prevented some variations from being read correctly from params generated outside this program. -Severe OpenCL randomization bug. The first x coordinates of the first points in the first kernel call of the first ember of a render since the OpenCL renderer object was created were not random and were mostly -1. -Severe bug when populating xform selection distributions that could sometimes cause a crash due to roundoff error. Fix by using double. -Limit the max number of variations in a random ember to MAX_CL_VARS, which is 8. This ensures they'll look the same on CPU and GPU. -Prevent user from saving stylesheet to default.qss, it's a special reserved filename. --Code changes -Generalize using the running sum output point inside of a variation for all cases: pre, reg and post. -Allow for array variables in variations where the address of each element is stored in m_Params. -Qualify all math functions with std:: -No longer use our own Clamp() in OpenCL, instead use the standard clamp(). -Redesign how functions are used in the variations OpenCL code. -Add tests to EmberTester to verify some of the new functionality. -Place more const and override qualifiers on functions where appropriate. -Add a global rand with a lock to be used very sparingly. -Use a map instead of a vector for bad param names in Xml parsing. -Prefix affine interpolation mode defines with "AFFINE_" to make their purpose more clear. -Allow for variations that change state during iteration by sending a separate copy of the ember to each rendering thread. -Implement this same functionality with a local struct in OpenCL. It's members are the total of all variables that need to change state within an ember. -Add Contains() function to Utils.h. -EmberRender: print names of kernels being printed with --dump_kernel option. -Clean up EmberTester to handle some of the recent changes. -Fix various casts. -Replace % 2 with & 1, even though the compiler was likely doing this already. -Add new file Variations06.h to accommodate new variations. -General cleanup.
154 lines
5.2 KiB
C++
154 lines
5.2 KiB
C++
#pragma once
|
|
|
|
#include "EmberPch.h"
|
|
|
|
/// <summary>
|
|
/// Basic #defines used throughout the library.
|
|
/// </summary>
|
|
|
|
#ifdef _WIN32
|
|
#if defined(BUILDING_EMBER)
|
|
#define EMBER_API __declspec(dllexport)
|
|
#else
|
|
#define EMBER_API __declspec(dllimport)
|
|
#endif
|
|
#else
|
|
#define EMBER_API
|
|
#define fopen_s(pFile,filename,mode) ((*(pFile)=fopen((filename),(mode)))==nullptr)
|
|
#define _stat stat
|
|
#define _fstat fstat
|
|
#define _stricmp strcmp
|
|
#define sscanf_s sscanf
|
|
#define sprintf_s snprintf
|
|
#define snprintf_s snprintf
|
|
typedef int errno_t;
|
|
#endif
|
|
|
|
#define RESTRICT __restrict//This might make things faster, unsure if it really does though.
|
|
//#define RESTRICT
|
|
|
|
//Wrap the sincos function for Macs and PC.
|
|
#if defined(__APPLE__) || defined(_MSC_VER)
|
|
#define sincos(x, s, c) *(s)=std::sin(x); *(c)=std::cos(x);
|
|
#else
|
|
/*static void sincos(float x, float* s, float* c)
|
|
{
|
|
*s = std::sin(x);
|
|
*c = std::cos(x);
|
|
}*/
|
|
#endif
|
|
|
|
namespace EmberNs
|
|
{
|
|
#define EMBER_VERSION "0.9.9.2"
|
|
#define EPS6 T(1e-6)
|
|
#define EPS std::numeric_limits<T>::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way.
|
|
#define ISAAC_SIZE 4
|
|
#define MEMALIGN 32
|
|
#define DE_THRESH 100
|
|
#define MAX_VARS_PER_XFORM 8
|
|
#define DEG_2_RAD (M_PI / 180)
|
|
#define RAD_2_DEG (180 / M_PI)
|
|
#define DEG_2_RAD_T (T(M_PI) / T(180))
|
|
#define RAD_2_DEG_T (T(180) / T(M_PI))
|
|
#define M_2PI (T(M_PI * 2))
|
|
#define M_3PI (T(M_PI * 3))
|
|
#define SQRT5 T(2.2360679774997896964091736687313)
|
|
#define M_PHI T(1.61803398874989484820458683436563)
|
|
#define COLORMAP_LENGTH 256//These will need to change if 2D palette support is ever added, or variable sized palettes.
|
|
#define COLORMAP_LENGTH_MINUS_1 255
|
|
#define WHITE 255
|
|
#define DEFAULT_SBS (1024 * 10)
|
|
//#define XC(c) ((const xmlChar*)(c))
|
|
#define XC(c) (reinterpret_cast<const xmlChar*>(c))
|
|
#define CX(c) (reinterpret_cast<char*>(c))
|
|
#define CCX(c) (reinterpret_cast<const char*>(c))
|
|
#define BadVal(x) (((x) != (x)) || ((x) > 1e10) || ((x) < -1e10))
|
|
#define Rint(A) floor((A) + (((A) < 0) ? T(-0.5) : T(0.5)))
|
|
#define Vlen(x) (sizeof(x) / sizeof(*x))
|
|
#define SQR(x) ((x) * (x))
|
|
#define CUBE(x) ((x) * (x) * (x))
|
|
#define TLOW std::numeric_limits<T>::lowest()
|
|
#define TMAX std::numeric_limits<T>::max()
|
|
#define FLOAT_MAX_TAN 8388607.0f
|
|
#define FLOAT_MIN_TAN -FLOAT_MAX_TAN
|
|
#define EMPTYFIELD -9999
|
|
typedef std::chrono::high_resolution_clock Clock;
|
|
|
|
/// <summary>
|
|
/// Thin wrapper around getting the current time in milliseconds.
|
|
/// </summary>
|
|
static inline size_t NowMs()
|
|
{
|
|
return duration_cast<milliseconds>(Clock::now().time_since_epoch()).count();
|
|
}
|
|
|
|
#ifndef byte
|
|
typedef unsigned char byte;
|
|
#endif
|
|
|
|
#define DO_DOUBLE 1//Comment this out for shorter build times during development. Always uncomment for release.
|
|
//#define ISAAC_FLAM3_DEBUG 1//This is almost never needed, but is very useful when troubleshooting difficult bugs. Enable it to do a side by side comparison with flam3.
|
|
|
|
//These two must always match.
|
|
#ifdef WIN32
|
|
#define ALIGN __declspec(align(16))
|
|
#else
|
|
#define ALIGN __attribute__ ((aligned (16)))
|
|
#endif
|
|
|
|
#define ALIGN_CL "((aligned (16)))"//The extra parens are necessary.
|
|
|
|
#if GLM_VERSION >= 96
|
|
#define v2T glm::tvec2<T, glm::defaultp>
|
|
#define v3T glm::tvec3<T, glm::defaultp>
|
|
#define v4T glm::tvec4<T, glm::defaultp>
|
|
#define v4bT glm::tvec4<bucketT, glm::defaultp>
|
|
#define m2T glm::tmat2x2<T, glm::defaultp>
|
|
#define m3T glm::tmat3x3<T, glm::defaultp>
|
|
#define m4T glm::tmat4x4<T, glm::defaultp>
|
|
#define m23T glm::tmat2x3<T, glm::defaultp>
|
|
#else
|
|
#define v2T glm::detail::tvec2<T, glm::defaultp>
|
|
#define v3T glm::detail::tvec3<T, glm::defaultp>
|
|
#define v4T glm::detail::tvec4<T, glm::defaultp>
|
|
#define v4bT glm::detail::tvec4<bucketT, glm::defaultp>
|
|
#define m2T glm::detail::tmat2x2<T, glm::defaultp>
|
|
#define m3T glm::detail::tmat3x3<T, glm::defaultp>
|
|
#define m4T glm::detail::tmat4x4<T, glm::defaultp>
|
|
#define m23T glm::detail::tmat2x3<T, glm::defaultp>
|
|
#endif
|
|
|
|
enum eInterp : uint { EMBER_INTERP_LINEAR = 0, EMBER_INTERP_SMOOTH = 1 };
|
|
enum eAffineInterp : uint { AFFINE_INTERP_LINEAR = 0, AFFINE_INTERP_LOG = 1, AFFINE_INTERP_COMPAT = 2, AFFINE_INTERP_OLDER = 3 };
|
|
enum ePaletteMode : uint { PALETTE_STEP = 0, PALETTE_LINEAR = 1 };
|
|
enum ePaletteInterp : uint { INTERP_HSV = 0, INTERP_SWEEP = 1 };
|
|
enum eMotion : uint { MOTION_SIN = 1, MOTION_TRIANGLE = 2, MOTION_HILL = 3, MOTION_SAW = 4 };
|
|
enum eProcessAction : uint { NOTHING = 0, ACCUM_ONLY = 1, FILTER_AND_ACCUM = 2, KEEP_ITERATING = 3, FULL_RENDER = 4 };
|
|
enum eProcessState : uint { NONE = 0, ITER_STARTED = 1, ITER_DONE = 2, FILTER_DONE = 3, ACCUM_DONE = 4 };
|
|
enum eInteractiveFilter : uint { FILTER_LOG = 0, FILTER_DE = 1 };
|
|
enum eScaleType : uint { SCALE_NONE = 0, SCALE_WIDTH = 1, SCALE_HEIGHT = 2 };
|
|
enum eRenderStatus : uint { RENDER_OK = 0, RENDER_ERROR = 1, RENDER_ABORT = 2 };
|
|
enum eEmberMotionParam : uint
|
|
{
|
|
FLAME_MOTION_NONE = 0,
|
|
FLAME_MOTION_ZOOM = 1,
|
|
FLAME_MOTION_ZPOS = 2,
|
|
FLAME_MOTION_PERSPECTIVE = 3,
|
|
FLAME_MOTION_YAW = 4,
|
|
FLAME_MOTION_PITCH = 5,
|
|
FLAME_MOTION_DEPTH_BLUR = 6,
|
|
FLAME_MOTION_CENTER_X = 7,
|
|
FLAME_MOTION_CENTER_Y = 8,
|
|
FLAME_MOTION_ROTATE = 9,
|
|
FLAME_MOTION_BRIGHTNESS = 10,
|
|
FLAME_MOTION_GAMMA = 11,
|
|
FLAME_MOTION_GAMMA_THRESH = 12,
|
|
FLAME_MOTION_HIGHLIGHT_POWER = 13,
|
|
FLAME_MOTION_BACKGROUND_R = 14,
|
|
FLAME_MOTION_BACKGROUND_G = 15,
|
|
FLAME_MOTION_BACKGROUND_B = 16,
|
|
FLAME_MOTION_VIBRANCY = 17
|
|
};
|
|
}
|