--Bug fixes

-Fix OpenCL compilation bugs in a few variations.

--Code changes
 -Pre/post variations are now checked for precalcs when creating the OpenCL kernel code.
 -Change some enumeration t
This commit is contained in:
Person
2019-12-31 23:01:30 -08:00
parent 96d72004fc
commit 9577d580cc
7 changed files with 66 additions and 68 deletions

View File

@ -19,7 +19,7 @@ template <typename T> class Interpolater;
/// Bit position specifying the presence of each type of 3D parameter.
/// One, none, some or all of these can be present.
/// </summary>
enum class eProjBits : et
enum class eProjBits : unsigned char
{
PROJBITS_ZPOS = 1,
PROJBITS_PERSP = 2,

View File

@ -80,7 +80,7 @@ namespace EmberNs
#define CURVES_LENGTH_M1 65535.0f
#define ONE_OVER_CURVES_LENGTH_M1 1.525902189669e-5f
#define EMPTYFIELD -9999
typedef uint et;
typedef unsigned char et;
typedef std::lock_guard <std::recursive_mutex> rlg;
/// <summary>

View File

@ -14,7 +14,7 @@ namespace EmberNs
/// <summary>
/// Mutation mode enum.
/// </summary>
enum class eMutateMode : int
enum class eMutateMode : char
{
MUTATE_NOT_SPECIFIED = -1,
MUTATE_ALL_VARIATIONS = 0,
@ -29,7 +29,7 @@ enum class eMutateMode : int
/// <summary>
/// Cross mode enum.
/// </summary>
enum class eCrossMode : int
enum class eCrossMode : char
{
CROSS_NOT_SPECIFIED = -1,
CROSS_UNION = 0,

View File

@ -19,7 +19,7 @@ namespace EmberNs
/// <summary>
/// Enum to encapsulate and add type safety to the thread priority defines.
/// </summary>
enum class eThreadPriority : int
enum class eThreadPriority : char
{
LOWEST = THREAD_PRIORITY_LOWEST,//-2
BELOW_NORMAL = THREAD_PRIORITY_BELOW_NORMAL,//-1

View File

@ -44,7 +44,7 @@ enum class eVariationAssignType : et
/// <summary>
/// Complete list of every variation class ID.
/// </summary>
enum class eVariationId : et
enum class eVariationId : glm::uint
{
VAR_ARCH,
VAR_ARCSECH,
@ -52,8 +52,6 @@ enum class eVariationId : et
VAR_ARCSINH,
VAR_ARCTANH,
VAR_ASTERIA,
//VAR_ARCSINH,
//VAR_ARCTANH,
VAR_AUGER ,
VAR_BARYCENTROID,
VAR_BCIRCLE ,
@ -471,8 +469,6 @@ enum class eVariationId : et
VAR_PRE_ARCSINH,
VAR_PRE_ARCTANH,
VAR_PRE_ASTERIA,
//VAR_PRE_ARCSINH,
//VAR_PRE_ARCTANH,
VAR_PRE_AUGER,
VAR_PRE_BARYCENTROID,
VAR_PRE_BCIRCLE,
@ -889,8 +885,6 @@ enum class eVariationId : et
VAR_POST_ARCSINH,
VAR_POST_ARCTANH,
VAR_POST_ASTERIA,
//VAR_POST_ARCSINH,
//VAR_POST_ARCTANH,
VAR_POST_AUGER,
VAR_POST_BARYCENTROID,
VAR_POST_BCIRCLE,