From 358e899a0517771475834a534d86787d5ed163f8 Mon Sep 17 00:00:00 2001 From: Michel Mastriani Date: Sun, 16 Jun 2019 00:40:43 -0300 Subject: [PATCH] Updating files --- Source/Ember/EmberDefines.h | 4 ++-- Source/EmberCL/EmberCLStructs.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index 926e324..1d2bbee 100644 --- a/Source/Ember/EmberDefines.h +++ b/Source/Ember/EmberDefines.h @@ -52,14 +52,14 @@ namespace EmberNs #define M_3PI (T(M_PI * 3)) #define M_PI2 (T(M_PI_2)) #define M_PI4 (T(M_PI_4)) -#define M_PI3 T(1.0471975511965977461542144610932) -#define M_PI6 T(0.52359877559829887307710723054658) #define SQRT3 T(1.7320508075688772935274463415059) #define SQRT3_2 T(0.86602540378443864676372317075294) #define SQRT3_3 T(0.57735026918962576450914878050196) #define SQRT5 T(2.2360679774997896964091736687313) #define M_PHI T(1.61803398874989484820458683436563) #define M_1_2PI T(0.15915494309189533576888376337251) +#define M_PI3 T(1.0471975511965977461542144610932) +#define M_PI6 T(0.52359877559829887307710723054658) #define COLORMAP_LENGTH 256//These will need to change if 2D palette support is ever added, or variable sized palettes. #define WHITE 255 #define DEFAULT_SBS (1024 * 10) diff --git a/Source/EmberCL/EmberCLStructs.h b/Source/EmberCL/EmberCLStructs.h index ff0a917..94f97cc 100644 --- a/Source/EmberCL/EmberCLStructs.h +++ b/Source/EmberCL/EmberCLStructs.h @@ -81,9 +81,14 @@ static string ConstantDefinesString(bool doublePrecision) "#define M2PI ((real_t)M_2_PI)\n" "#define M_2PI (MPI * 2)\n" "#define M_3PI (MPI * 3)\n" + "#define SQRT3 ((real_t)(1.7320508075688772935274463415059))\n" + "#define SQRT3_2 ((real_t)(0.86602540378443864676372317075294))\n" + "#define SQRT3_3 ((real_t)(0.57735026918962576450914878050196))\n" "#define SQRT5 2.2360679774997896964091736687313\n" "#define M_PHI 1.61803398874989484820458683436563\n" "#define M_1_2PI 0.15915494309189533576888376337251\n" + "#define M_PI3 ((real_t)(1.0471975511965977461542144610932))\n" + "#define M_PI6 ((real_t)(0.52359877559829887307710723054658))\n" "#define DEG_2_RAD (MPI / 180)\n" "#define CURVES_LENGTH_M1 ((real_bucket_t)" << CURVES_LENGTH_M1 << ")\n" << "#define ONE_OVER_CURVES_LENGTH_M1 ((real_bucket_t)" << ONE_OVER_CURVES_LENGTH_M1 << ")\n" <<