From d6dbf3d530e084dac26bb9d24451570759be88e3 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 11 Jun 2005 02:01:39 +0000
Subject: [PATCH] increased size of mesh color carousel from 10 to 20
---
Common/Context.h | 2 +-
Common/DefaultOptions.h | 102 ++++++++++++++++++-----------
Common/Options.cpp | 139 ++++++++--------------------------------
Common/Options.h | 10 +++
Graphics/Mesh.cpp | 44 ++++++-------
5 files changed, 125 insertions(+), 172 deletions(-)
diff --git a/Common/Context.h b/Common/Context.h
index 5e864e9843..ec8365d229 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -239,7 +239,7 @@ public :
struct{
unsigned int vertex, vertex_deg2, line, triangle, quadrangle;
unsigned int tetrahedron, hexahedron, prism, pyramid;
- unsigned int carousel[10];
+ unsigned int carousel[20];
unsigned int tangents, normals;
} mesh;
} color;
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 66d213d2bc..3755016d9b 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -1431,21 +1431,55 @@ StringXColor GeometryOptions_Color[] = {
{ 0, NULL , NULL , 0, 0, 0 , NULL }
} ;
-#define COL1 PACK_COLOR( 232, 210, 23, 255 )
-#define COL2 PACK_COLOR( 226, 167, 29, 255 )
-#define COL3 PACK_COLOR( 217, 113, 38, 255 )
-#define COL4 PACK_COLOR( 201, 54, 54, 255 )
-#define COL5 PACK_COLOR( 169, 12, 86, 255 )
-#define COL6 PACK_COLOR( 114, 2, 141, 255 )
-#define COL7 PACK_COLOR( 67, 30, 188, 255 )
-#define COL8 PACK_COLOR( 44, 86, 211, 255 )
-#define COL9 PACK_COLOR( 32, 145, 223, 255 )
-#define COL10 PACK_COLOR( 25, 193, 230, 255 )
#define COLW PACK_COLOR( 210, 210, 210, 255 )
#define COLT PACK_COLOR( 160, 150, 255, 255 )
#define COLQ PACK_COLOR( 130, 120, 225, 255 )
-#define COLP PACK_COLOR( 232, 210, 23, 255 )
-#define COLY PACK_COLOR( 217, 113, 38, 255 )
+#define COLP PACK_COLOR( 232, 210, 23, 255 )
+#define COLY PACK_COLOR( 217, 113, 38, 255 )
+
+// blue->yellow
+#define COL0 PACK_COLOR( 9, 3, 103, 255 )
+#define COL1 PACK_COLOR( 35, 0, 111, 255 )
+#define COL2 PACK_COLOR( 60, 0, 114, 255 )
+#define COL3 PACK_COLOR( 83, 0, 114, 255 )
+#define COL4 PACK_COLOR( 105, 1, 109, 255 )
+#define COL5 PACK_COLOR( 126, 10, 102, 255 )
+#define COL6 PACK_COLOR( 145, 21, 93, 255 )
+#define COL7 PACK_COLOR( 163, 34, 82, 255 )
+#define COL8 PACK_COLOR( 179, 50, 69, 255 )
+#define COL9 PACK_COLOR( 193, 67, 57, 255 )
+#define COL10 PACK_COLOR( 207, 85, 44, 255 )
+#define COL11 PACK_COLOR( 219, 104, 32, 255 )
+#define COL12 PACK_COLOR( 229, 124, 22, 255 )
+#define COL13 PACK_COLOR( 238, 143, 13, 255 )
+#define COL14 PACK_COLOR( 246, 162, 8, 255 )
+#define COL15 PACK_COLOR( 252, 181, 5, 255 )
+#define COL16 PACK_COLOR( 255, 198, 6, 255 )
+#define COL17 PACK_COLOR( 255, 214, 11, 255 )
+#define COL18 PACK_COLOR( 255, 228, 22, 255 )
+#define COL19 PACK_COLOR( 255, 240, 38, 255 )
+
+// truncated hsv
+// #define COL0 PACK_COLOR( 255, 0, 0, 255)
+// #define COL1 PACK_COLOR( 255, 67, 0, 255)
+// #define COL2 PACK_COLOR( 255, 134, 0, 255)
+// #define COL3 PACK_COLOR( 255, 201, 0, 255)
+// #define COL4 PACK_COLOR( 241, 255, 0, 255)
+// #define COL5 PACK_COLOR( 174, 255, 0, 255)
+// #define COL6 PACK_COLOR( 107, 255, 0, 255)
+// #define COL7 PACK_COLOR( 40, 255, 0, 255)
+// #define COL8 PACK_COLOR( 0, 255, 26, 255)
+// #define COL9 PACK_COLOR( 0, 255, 93, 255)
+// #define COL10 PACK_COLOR( 0, 255, 161, 255)
+// #define COL11 PACK_COLOR( 0, 255, 228, 255)
+// #define COL12 PACK_COLOR( 0, 214, 255, 255)
+// #define COL13 PACK_COLOR( 0, 147, 255, 255)
+// #define COL14 PACK_COLOR( 0, 80, 255, 255)
+// #define COL15 PACK_COLOR( 0, 13, 255, 255)
+// #define COL16 PACK_COLOR( 53, 0, 255, 255)
+// #define COL17 PACK_COLOR( 120, 0, 255, 255)
+// #define COL18 PACK_COLOR( 187, 0, 255, 255)
+// #define COL19 PACK_COLOR( 255, 0, 254, 255)
StringXColor MeshOptions_Color[] = {
{ F|O, "Points" , opt_mesh_color_points ,
@@ -1485,31 +1519,29 @@ StringXColor MeshOptions_Color[] = {
PACK_COLOR(255, 0, 0, 255),
PACK_COLOR(0, 0, 0, 255),
"Normal mesh vector color" },
- { F|O, "One" , opt_mesh_color_1 , COL1, COL1, COLW, "First color in color carousel" },
- { F|O, "Two" , opt_mesh_color_2 , COL2, COL2, COLW, "Second color in color carousel" },
- { F|O, "Three" , opt_mesh_color_3 , COL3, COL3, COLW, "Third color in color carousel" },
- { F|O, "Four" , opt_mesh_color_4 , COL4, COL4, COLW, "Fourth color in color carousel" },
- { F|O, "Five" , opt_mesh_color_5 , COL5, COL5, COLW, "Fifth color in color carousel" },
- { F|O, "Six" , opt_mesh_color_6 , COL6, COL6, COLW, "Sixth color in color carousel" },
- { F|O, "Seven" , opt_mesh_color_7 , COL7, COL7, COLW, "Seventh color in color carousel" },
- { F|O, "Eight" , opt_mesh_color_8 , COL8, COL8, COLW, "Eighth color in color carousel" },
- { F|O, "Nine" , opt_mesh_color_9 , COL9, COL9, COLW, "Ninth color in color carousel" },
- { F|O, "Ten" , opt_mesh_color_10 , COL10, COL10, COLW, "Tenth color in color carousel" },
+ { F|O, "Zero" , opt_mesh_color_0 , COL0, COL0, COLW, "Color 0 in color carousel" },
+ { F|O, "One" , opt_mesh_color_1 , COL1, COL1, COLW, "Color 1 in color carousel" },
+ { F|O, "Two" , opt_mesh_color_2 , COL2, COL2, COLW, "Color 2 in color carousel" },
+ { F|O, "Three" , opt_mesh_color_3 , COL3, COL3, COLW, "Color 3 in color carousel" },
+ { F|O, "Four" , opt_mesh_color_4 , COL4, COL4, COLW, "Color 4 in color carousel" },
+ { F|O, "Five" , opt_mesh_color_5 , COL5, COL5, COLW, "Color 5 in color carousel" },
+ { F|O, "Six" , opt_mesh_color_6 , COL6, COL6, COLW, "Color 6 in color carousel" },
+ { F|O, "Seven" , opt_mesh_color_7 , COL7, COL7, COLW, "Color 7 in color carousel" },
+ { F|O, "Eight" , opt_mesh_color_8 , COL8, COL8, COLW, "Color 8 in color carousel" },
+ { F|O, "Nine" , opt_mesh_color_9 , COL9, COL9, COLW, "Color 9 in color carousel" },
+ { F|O, "Ten" , opt_mesh_color_10, COL10, COL10, COLW, "Color 10 in color carousel" },
+ { F|O, "Eleven" , opt_mesh_color_11, COL11, COL11, COLW, "Color 11 in color carousel" },
+ { F|O, "Twelve" , opt_mesh_color_12, COL12, COL12, COLW, "Color 12 in color carousel" },
+ { F|O, "Thirtheen", opt_mesh_color_13, COL13, COL13, COLW, "Color 13 in color carousel" },
+ { F|O, "Fourteen" , opt_mesh_color_14, COL14, COL14, COLW, "Color 14 in color carousel" },
+ { F|O, "Fifteen" , opt_mesh_color_15, COL15, COL15, COLW, "Color 15 in color carousel" },
+ { F|O, "Sixteen" , opt_mesh_color_16, COL16, COL16, COLW, "Color 16 in color carousel" },
+ { F|O, "Seventeen", opt_mesh_color_17, COL17, COL17, COLW, "Color 17 in color carousel" },
+ { F|O, "Eighteen" , opt_mesh_color_18, COL18, COL18, COLW, "Color 18 in color carousel" },
+ { F|O, "Nineteen" , opt_mesh_color_19, COL19, COL19, COLW, "Color 19 in color carousel" },
{ 0, NULL , NULL , 0, 0, 0 , NULL }
} ;
-#undef COL1
-#undef COL2
-#undef COL3
-#undef COL4
-#undef COL5
-#undef COL6
-#undef COL7
-#undef COL8
-#undef COL9
-#undef COL10
-#undef COLW
-
StringXColor SolverOptions_Color[] = {
{ 0, NULL , NULL , 0, 0, 0 , NULL }
} ;
@@ -1545,8 +1577,6 @@ StringXColor ViewOptions_Color[] = {
{ 0, NULL , NULL , 0, 0, 0 , NULL }
} ;
-#undef ELECOL
-
StringXColor PrintOptions_Color[] = {
{ 0, NULL , NULL , 0, 0, 0 , NULL }
} ;
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 21b74512b2..7a82a69d98 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.246 2005-06-09 17:22:04 geuzaine Exp $
+// $Id: Options.cpp,v 1.247 2005-06-11 02:01:38 geuzaine Exp $
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
@@ -6884,125 +6884,38 @@ unsigned int opt_mesh_color_normals(OPT_ARGS_COL)
return CTX.color.mesh.normals;
}
-unsigned int opt_mesh_color_1(OPT_ARGS_COL)
+unsigned int opt_mesh_color_(int i, OPT_ARGS_COL)
{
if(action & GMSH_SET) {
- if(CTX.color.mesh.carousel[0] != val) CTX.mesh.changed = 1;
- CTX.color.mesh.carousel[0] = val;
+ if(CTX.color.mesh.carousel[i] != val) CTX.mesh.changed = 1;
+ CTX.color.mesh.carousel[i] = val;
}
#if defined(HAVE_FLTK)
- CCC(CTX.color.mesh.carousel[0], WID->mesh_col[11]);
+ CCC(CTX.color.mesh.carousel[i], WID->mesh_col[11+i]);
#endif
- return CTX.color.mesh.carousel[0];
+ return CTX.color.mesh.carousel[i];
}
-unsigned int opt_mesh_color_2(OPT_ARGS_COL)
-{
- if(action & GMSH_SET) {
- if(CTX.color.mesh.carousel[1] != val) CTX.mesh.changed = 1;
- CTX.color.mesh.carousel[1] = val;
- }
-#if defined(HAVE_FLTK)
- CCC(CTX.color.mesh.carousel[1], WID->mesh_col[12]);
-#endif
- return CTX.color.mesh.carousel[1];
-}
-
-unsigned int opt_mesh_color_3(OPT_ARGS_COL)
-{
- if(action & GMSH_SET) {
- if(CTX.color.mesh.carousel[2] != val) CTX.mesh.changed = 1;
- CTX.color.mesh.carousel[2] = val;
- }
-#if defined(HAVE_FLTK)
- CCC(CTX.color.mesh.carousel[2], WID->mesh_col[13]);
-#endif
- return CTX.color.mesh.carousel[2];
-}
-
-unsigned int opt_mesh_color_4(OPT_ARGS_COL)
-{
- if(action & GMSH_SET) {
- if(CTX.color.mesh.carousel[3] != val) CTX.mesh.changed = 1;
- CTX.color.mesh.carousel[3] = val;
- }
-#if defined(HAVE_FLTK)
- CCC(CTX.color.mesh.carousel[3], WID->mesh_col[14]);
-#endif
- return CTX.color.mesh.carousel[3];
-}
-
-unsigned int opt_mesh_color_5(OPT_ARGS_COL)
-{
- if(action & GMSH_SET) {
- if(CTX.color.mesh.carousel[4] != val) CTX.mesh.changed = 1;
- CTX.color.mesh.carousel[4] = val;
- }
-#if defined(HAVE_FLTK)
- CCC(CTX.color.mesh.carousel[4], WID->mesh_col[15]);
-#endif
- return CTX.color.mesh.carousel[4];
-}
-
-unsigned int opt_mesh_color_6(OPT_ARGS_COL)
-{
- if(action & GMSH_SET) {
- if(CTX.color.mesh.carousel[5] != val) CTX.mesh.changed = 1;
- CTX.color.mesh.carousel[5] = val;
- }
-#if defined(HAVE_FLTK)
- CCC(CTX.color.mesh.carousel[5], WID->mesh_col[16]);
-#endif
- return CTX.color.mesh.carousel[5];
-}
-
-unsigned int opt_mesh_color_7(OPT_ARGS_COL)
-{
- if(action & GMSH_SET) {
- if(CTX.color.mesh.carousel[6] != val) CTX.mesh.changed = 1;
- CTX.color.mesh.carousel[6] = val;
- }
-#if defined(HAVE_FLTK)
- CCC(CTX.color.mesh.carousel[6], WID->mesh_col[17]);
-#endif
- return CTX.color.mesh.carousel[6];
-}
-
-unsigned int opt_mesh_color_8(OPT_ARGS_COL)
-{
- if(action & GMSH_SET) {
- if(CTX.color.mesh.carousel[7] != val) CTX.mesh.changed = 1;
- CTX.color.mesh.carousel[7] = val;
- }
-#if defined(HAVE_FLTK)
- CCC(CTX.color.mesh.carousel[7], WID->mesh_col[18]);
-#endif
- return CTX.color.mesh.carousel[7];
-}
-
-unsigned int opt_mesh_color_9(OPT_ARGS_COL)
-{
- if(action & GMSH_SET) {
- if(CTX.color.mesh.carousel[8] != val) CTX.mesh.changed = 1;
- CTX.color.mesh.carousel[8] = val;
- }
-#if defined(HAVE_FLTK)
- CCC(CTX.color.mesh.carousel[8], WID->mesh_col[19]);
-#endif
- return CTX.color.mesh.carousel[8];
-}
-
-unsigned int opt_mesh_color_10(OPT_ARGS_COL)
-{
- if(action & GMSH_SET) {
- if(CTX.color.mesh.carousel[9] != val) CTX.mesh.changed = 1;
- CTX.color.mesh.carousel[9] = val;
- }
-#if defined(HAVE_FLTK)
- CCC(CTX.color.mesh.carousel[9], WID->mesh_col[20]);
-#endif
- return CTX.color.mesh.carousel[9];
-}
+unsigned int opt_mesh_color_0(OPT_ARGS_COL){ return opt_mesh_color_(0, num, action, val); }
+unsigned int opt_mesh_color_1(OPT_ARGS_COL){ return opt_mesh_color_(1, num, action, val); }
+unsigned int opt_mesh_color_2(OPT_ARGS_COL){ return opt_mesh_color_(2, num, action, val); }
+unsigned int opt_mesh_color_3(OPT_ARGS_COL){ return opt_mesh_color_(3, num, action, val); }
+unsigned int opt_mesh_color_4(OPT_ARGS_COL){ return opt_mesh_color_(4, num, action, val); }
+unsigned int opt_mesh_color_5(OPT_ARGS_COL){ return opt_mesh_color_(5, num, action, val); }
+unsigned int opt_mesh_color_6(OPT_ARGS_COL){ return opt_mesh_color_(6, num, action, val); }
+unsigned int opt_mesh_color_7(OPT_ARGS_COL){ return opt_mesh_color_(7, num, action, val); }
+unsigned int opt_mesh_color_8(OPT_ARGS_COL){ return opt_mesh_color_(8, num, action, val); }
+unsigned int opt_mesh_color_9(OPT_ARGS_COL){ return opt_mesh_color_(9, num, action, val); }
+unsigned int opt_mesh_color_10(OPT_ARGS_COL){ return opt_mesh_color_(10, num, action, val); }
+unsigned int opt_mesh_color_11(OPT_ARGS_COL){ return opt_mesh_color_(11, num, action, val); }
+unsigned int opt_mesh_color_12(OPT_ARGS_COL){ return opt_mesh_color_(12, num, action, val); }
+unsigned int opt_mesh_color_13(OPT_ARGS_COL){ return opt_mesh_color_(13, num, action, val); }
+unsigned int opt_mesh_color_14(OPT_ARGS_COL){ return opt_mesh_color_(14, num, action, val); }
+unsigned int opt_mesh_color_15(OPT_ARGS_COL){ return opt_mesh_color_(15, num, action, val); }
+unsigned int opt_mesh_color_16(OPT_ARGS_COL){ return opt_mesh_color_(16, num, action, val); }
+unsigned int opt_mesh_color_17(OPT_ARGS_COL){ return opt_mesh_color_(17, num, action, val); }
+unsigned int opt_mesh_color_18(OPT_ARGS_COL){ return opt_mesh_color_(18, num, action, val); }
+unsigned int opt_mesh_color_19(OPT_ARGS_COL){ return opt_mesh_color_(19, num, action, val); }
unsigned int opt_view_color_points(OPT_ARGS_COL)
{
diff --git a/Common/Options.h b/Common/Options.h
index 6a4ffd4252..1e97b423d9 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -645,6 +645,7 @@ unsigned int opt_mesh_color_prisms(OPT_ARGS_COL);
unsigned int opt_mesh_color_pyramid(OPT_ARGS_COL);
unsigned int opt_mesh_color_tangents(OPT_ARGS_COL);
unsigned int opt_mesh_color_normals(OPT_ARGS_COL);
+unsigned int opt_mesh_color_0(OPT_ARGS_COL);
unsigned int opt_mesh_color_1(OPT_ARGS_COL);
unsigned int opt_mesh_color_2(OPT_ARGS_COL);
unsigned int opt_mesh_color_3(OPT_ARGS_COL);
@@ -655,6 +656,15 @@ unsigned int opt_mesh_color_7(OPT_ARGS_COL);
unsigned int opt_mesh_color_8(OPT_ARGS_COL);
unsigned int opt_mesh_color_9(OPT_ARGS_COL);
unsigned int opt_mesh_color_10(OPT_ARGS_COL);
+unsigned int opt_mesh_color_11(OPT_ARGS_COL);
+unsigned int opt_mesh_color_12(OPT_ARGS_COL);
+unsigned int opt_mesh_color_13(OPT_ARGS_COL);
+unsigned int opt_mesh_color_14(OPT_ARGS_COL);
+unsigned int opt_mesh_color_15(OPT_ARGS_COL);
+unsigned int opt_mesh_color_16(OPT_ARGS_COL);
+unsigned int opt_mesh_color_17(OPT_ARGS_COL);
+unsigned int opt_mesh_color_18(OPT_ARGS_COL);
+unsigned int opt_mesh_color_19(OPT_ARGS_COL);
unsigned int opt_view_color_points(OPT_ARGS_COL);
unsigned int opt_view_color_lines(OPT_ARGS_COL);
unsigned int opt_view_color_triangles(OPT_ARGS_COL);
diff --git a/Graphics/Mesh.cpp b/Graphics/Mesh.cpp
index b237791838..dddbde210a 100644
--- a/Graphics/Mesh.cpp
+++ b/Graphics/Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: Mesh.cpp,v 1.131 2005-06-09 17:22:05 geuzaine Exp $
+// $Id: Mesh.cpp,v 1.132 2005-06-11 02:01:39 geuzaine Exp $
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
@@ -588,11 +588,11 @@ void Draw_Mesh_Line(void *a, void *b)
if(theColor.type)
col = theColor.mesh;
else if(CTX.mesh.color_carousel == 1)
- col = CTX.color.mesh.carousel[abs(s->iEnt % 10)];
+ col = CTX.color.mesh.carousel[abs(s->iEnt % 20)];
else if(CTX.mesh.color_carousel == 2)
- col = CTX.color.mesh.carousel[abs(thePhysical % 10)];
+ col = CTX.color.mesh.carousel[abs(thePhysical % 20)];
else if(CTX.mesh.color_carousel == 3)
- col = CTX.color.mesh.carousel[abs(s->iPart % 10)];
+ col = CTX.color.mesh.carousel[abs(s->iPart % 20)];
else
col = CTX.color.mesh.line;
@@ -858,11 +858,11 @@ void Draw_Mesh_Triangle(void *a, void *b)
if(theColor.type)
col = theColor.mesh;
else if(CTX.mesh.color_carousel == 1)
- col = CTX.color.mesh.carousel[abs(s->iEnt % 10)];
+ col = CTX.color.mesh.carousel[abs(s->iEnt % 20)];
else if(CTX.mesh.color_carousel == 2)
- col = CTX.color.mesh.carousel[abs(thePhysical % 10)];
+ col = CTX.color.mesh.carousel[abs(thePhysical % 20)];
else if(CTX.mesh.color_carousel == 3)
- col = CTX.color.mesh.carousel[abs(s->iPart % 10)];
+ col = CTX.color.mesh.carousel[abs(s->iPart % 20)];
else
col = CTX.color.mesh.triangle;
@@ -1027,11 +1027,11 @@ void Draw_Mesh_Quadrangle(void *a, void *b)
if(theColor.type)
col = theColor.mesh;
else if(CTX.mesh.color_carousel == 1)
- col = CTX.color.mesh.carousel[abs(q->iEnt % 10)];
+ col = CTX.color.mesh.carousel[abs(q->iEnt % 20)];
else if(CTX.mesh.color_carousel == 2)
- col = CTX.color.mesh.carousel[abs(thePhysical % 10)];
+ col = CTX.color.mesh.carousel[abs(thePhysical % 20)];
else if(CTX.mesh.color_carousel == 3)
- col = CTX.color.mesh.carousel[abs(q->iPart % 10)];
+ col = CTX.color.mesh.carousel[abs(q->iPart % 20)];
else
col = CTX.color.mesh.quadrangle;
@@ -1203,11 +1203,11 @@ void Draw_Mesh_Tetrahedron(void *a, void *b)
if(theColor.type)
col = theColor.mesh;
else if(CTX.mesh.color_carousel == 1)
- col = CTX.color.mesh.carousel[abs(s->iEnt % 10)];
+ col = CTX.color.mesh.carousel[abs(s->iEnt % 20)];
else if(CTX.mesh.color_carousel == 2)
- col = CTX.color.mesh.carousel[abs(thePhysical % 10)];
+ col = CTX.color.mesh.carousel[abs(thePhysical % 20)];
else if(CTX.mesh.color_carousel == 3)
- col = CTX.color.mesh.carousel[abs(s->iPart % 10)];
+ col = CTX.color.mesh.carousel[abs(s->iPart % 20)];
else
col = CTX.color.mesh.tetrahedron;
@@ -1380,11 +1380,11 @@ void Draw_Mesh_Hexahedron(void *a, void *b)
if(theColor.type)
col = theColor.mesh;
else if(CTX.mesh.color_carousel == 1)
- col = CTX.color.mesh.carousel[abs(h->iEnt % 10)];
+ col = CTX.color.mesh.carousel[abs(h->iEnt % 20)];
else if(CTX.mesh.color_carousel == 2)
- col = CTX.color.mesh.carousel[abs(thePhysical % 10)];
+ col = CTX.color.mesh.carousel[abs(thePhysical % 20)];
else if(CTX.mesh.color_carousel == 3)
- col = CTX.color.mesh.carousel[abs(h->iPart % 10)];
+ col = CTX.color.mesh.carousel[abs(h->iPart % 20)];
else
col = CTX.color.mesh.hexahedron;
@@ -1571,11 +1571,11 @@ void Draw_Mesh_Prism(void *a, void *b)
if(theColor.type)
col = theColor.mesh;
else if(CTX.mesh.color_carousel == 1)
- col = CTX.color.mesh.carousel[abs(p->iEnt % 10)];
+ col = CTX.color.mesh.carousel[abs(p->iEnt % 20)];
else if(CTX.mesh.color_carousel == 2)
- col = CTX.color.mesh.carousel[abs(thePhysical % 10)];
+ col = CTX.color.mesh.carousel[abs(thePhysical % 20)];
else if(CTX.mesh.color_carousel == 3)
- col = CTX.color.mesh.carousel[abs(p->iPart % 10)];
+ col = CTX.color.mesh.carousel[abs(p->iPart % 20)];
else
col = CTX.color.mesh.prism;
@@ -1777,11 +1777,11 @@ void Draw_Mesh_Pyramid(void *a, void *b)
if(theColor.type)
col = theColor.mesh;
else if(CTX.mesh.color_carousel == 1)
- col = CTX.color.mesh.carousel[abs(p->iEnt % 10)];
+ col = CTX.color.mesh.carousel[abs(p->iEnt % 20)];
else if(CTX.mesh.color_carousel == 2)
- col = CTX.color.mesh.carousel[abs(thePhysical % 10)];
+ col = CTX.color.mesh.carousel[abs(thePhysical % 20)];
else if(CTX.mesh.color_carousel == 3)
- col = CTX.color.mesh.carousel[abs(p->iPart % 10)];
+ col = CTX.color.mesh.carousel[abs(p->iPart % 20)];
else
col = CTX.color.mesh.pyramid;
--
GitLab