Commit 8c3b3bd7 authored by Oliver Sander's avatar Oliver Sander

Merge branch 'master' into 'master'

Use parentheses to squelch a warning

clang emits the warning

  operator '<<' has lower precedence than '+'; '+' will be evaluated first

See merge request !10
parents 6e6acb58 5f06ebe2
Pipeline #301 failed with stage
......@@ -534,7 +534,7 @@ static REFRULE TetrahedronRules[MAX_TET_RULES] =
/* TET_RED equals TET_RED_2_4 */
{TETRAHEDRON,2,RED_CLASS|SWITCH_CLASS,8,
{1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0},1<<6-1,
{1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0},(1<<6)-1,
/* sonandnode */
{{0,1},{1,1},{0,2},{0,3},{1,2},{2,2},
......@@ -565,7 +565,7 @@ static REFRULE TetrahedronRules[MAX_TET_RULES] =
/* TET_RED_0_5 */
{TETRAHEDRON,3,RED_CLASS|SWITCH_CLASS,8,
{1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0},1<<6-1,
{1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0},(1<<6)-1,
/* sonandnode */
{{1,0},{0,0},{0,1},{2,0},{1,2},{0,2},
......@@ -596,7 +596,7 @@ static REFRULE TetrahedronRules[MAX_TET_RULES] =
/* TET_RED_1_3 */
{TETRAHEDRON,4,RED_CLASS|SWITCH_CLASS,8,
{1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0},1<<6-1,
{1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0},(1<<6)-1,
/* sonandnode */
{{1,1},{1,1},{2,2},{0,0},{0,1},{0,2},
......@@ -627,7 +627,7 @@ static REFRULE TetrahedronRules[MAX_TET_RULES] =
/* TET_RED_HEX */
{TETRAHEDRON,5,RED_CLASS|SWITCH_CLASS,4,
{1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0},1<<11-1,
{1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0},(1<<11)-1,
/* sonandnode */
{{0,2},{1,3},{0,0},{0,5},{3,6},{3,4},
......@@ -696,7 +696,7 @@ static REFRULE PyramidRules[MAX_PYR_RULES] =
/* PYR_RED */
{PYRAMID,2,RED_CLASS|SWITCH_CLASS,10,
{1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0},1<<9-1,
{1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0},(1<<9)-1,
/* sonandnode */
{{0,1},{1,2},{2,3},{0,3},{0,4},{1,4},
......@@ -824,7 +824,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_RED */
{PRISM,2,RED_CLASS|SWITCH_CLASS,8,
{1,1,1,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0},
1<<9-1+1<<10+1<<11+1<<12,
(1<<9)-1+(1<<10)+(1<<11)+(1<<12),
/* sonandnode */
{{0,1},{1,1},{0,2},{0,3},{1,4},{2,5},
......@@ -856,7 +856,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_QUADSECT */
{PRISM,3,RED_CLASS|SWITCH_CLASS,4,
{1,1,1,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0},
1<<3-1+1<<6+1<<7+1<<8,
(1<<3)-1+(1<<6)+(1<<7)+(1<<8),
/* sonandnode */
{{0,0},{0,0},{0,0},{-1,-1},{-1,-1},{-1,-1},
......@@ -884,7 +884,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_BISECT_0_1 */
{PRISM,4,RED_CLASS|SWITCH_CLASS,2,
{1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0},
1 + 1<<6,
1 + (1<<6),
/* sonandnode */
{{0,1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},
......@@ -910,7 +910,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_BISECT_0_2 */
{PRISM,5,RED_CLASS|SWITCH_CLASS,2,
{0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0},
1<<1 + 1<<7,
(1<<1) + (1<<7),
/* sonandnode */
{{-1,-1},{0,1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},
......@@ -936,7 +936,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_BISECT_0_3 */
{PRISM,6,RED_CLASS|SWITCH_CLASS,2,
{0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0},
1<<2 + 1<<8,
(1<<2) + (1<<8),
/* sonandnode */
{{-1,-1},{-1,-1},{0,2},{-1,-1},{-1,-1},{-1,-1},
......@@ -962,7 +962,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_BISECT_1_2 */
{PRISM,7,RED_CLASS|SWITCH_CLASS,2,
{0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0},
1<<3 + 1<<4 + 1<<5,
(1<<3) + (1<<4) + (1<<5),
/* sonandnode */
{{-1,-1},{-1,-1},{-1,-1},{0,0},{0,0},{0,0},
......@@ -988,7 +988,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_BISECT_HEX0 */
{PRISM,8,RED_CLASS|SWITCH_CLASS,2,
{1,0,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0},
1+1<<2+1<<6+1<<8,
1+(1<<2)+(1<<6)+(1<<8),
/* sonandnode */
{{0,1},{-1,-1},{0,2},{-1,-1},{-1,-1},{-1,-1},
......@@ -1014,7 +1014,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_BISECT_HEX1 */
{PRISM,9,RED_CLASS|SWITCH_CLASS,2,
{0,1,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0},
1<<1+1<<2+1<<7+1<<8,
(1<<1)+(1<<2)+(1<<7)+(1<<8),
/* sonandnode */
{{-1,-1},{0,2},{0,3},{-1,-1},{-1,-1},{-1,-1},
......@@ -1040,7 +1040,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_BISECT_HEX2 */
{PRISM,10,RED_CLASS|SWITCH_CLASS,2,
{1,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0},
1+1<<1+1<<6+1<<7,
1+(1<<1)+(1<<6)+(1<<7),
/* sonandnode */
{{0,1},{0,2},{-1,-1},{-1,-1},{-1,-1},{-1,-1},
......@@ -1066,7 +1066,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_trisect_0_4 */
{PRISM,11,RED_CLASS|SWITCH_CLASS,3,
{1,1,1,0,0,0,1,1,1,1,0,0,0,1,0,0,0,0,0},
1<<3-1 + 1<<6 + 1<<7 + 1<<8 + 1<<9 + 1<<13,
(1<<3)-1 + (1<<6) + (1<<7) + (1<<8) + (1<<9) + (1<<13),
/* sonandnode */
{{0,1},{1,1},{0,2},{0,3},{1,4},{2,5},
......@@ -1133,7 +1133,7 @@ static REFRULE PrismRules[MAX_PRI_RULES] =
/* PRI_QUADSECT_HEXPRI0 */
{PRISM,14,RED_CLASS,4,
{1,1,0,1,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0},
3 + 1<<3 + 1<<4 + 1<<5 + 1<<6 + 1<<7 + 1<<10 + 1<<11,
3 + (1<<3) + (1<<4) + (1<<5) + (1<<6) + (1<<7) + (1<<10) + (1<<11),
{{0,1},{0,2},{-1,-1},{0,4},{1,5},{0,7},
{3,5},{3,6},{-1,-1},{-1,-1},{0,5},{0,6},
......@@ -1232,7 +1232,7 @@ static REFRULE HexahedronRules[MAX_HEX_RULES] =
/* HEX_bisect_0_1 */
{HEXAHEDRON,3,RED_CLASS|SWITCH_CLASS,2,
{1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0},
1 + 1<<2 + 1<<8 + 1<<10,
1 + (1<<2) + (1<<8) + (1<<10),
/* sonandnode */
{{0,0},{-1,-1},{0,0},{-1,-1},{-1,-1},{-1,-1},
......@@ -1258,7 +1258,7 @@ static REFRULE HexahedronRules[MAX_HEX_RULES] =
/* HEX_bisect_0_2 */
{HEXAHEDRON,4,RED_CLASS|SWITCH_CLASS,2,
{0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0},
1<<1 + 1<<3 + 1<<9 + 1<<11,
(1<<1) + (1<<3) + (1<<9) + (1<<11),
/* sonandnode */
{{-1,-1},{0,0},{-1,-1},{0,0},{-1,-1},{-1,-1},
......@@ -1284,7 +1284,7 @@ static REFRULE HexahedronRules[MAX_HEX_RULES] =
/* HEX_bisect_0_3 */
{HEXAHEDRON,5,RED_CLASS|SWITCH_CLASS,2,
{0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0},
1<<4 + 1<<5 + 1<<6 + 1<<7,
(1<<4) + (1<<5) + (1<<6) + (1<<7),
/* sonandnode */
{{-1,-1},{-1,-1},{-1,-1},{-1,-1},{0,0},{0,0},
......@@ -1310,7 +1310,7 @@ static REFRULE HexahedronRules[MAX_HEX_RULES] =
/* HEX_quadsect_0 */
{HEXAHEDRON,6,RED_CLASS|SWITCH_CLASS,4,
{1,1,1,1,0,0,0,0,1,1,1,1,1,0,0,0,0,1,0},
(1<<4)-1 + 1<<8 + 1<<9 + 1<<10 + 1<<11 + 1<<12 + 1<<17,
(1<<4)-1 + (1<<8) + (1<<9) + (1<<10) + (1<<11) + (1<<12) + (1<<17),
/* sonandnode */
{{0,1},{1,2},{2,3},{0,3},
......@@ -1338,7 +1338,7 @@ static REFRULE HexahedronRules[MAX_HEX_RULES] =
/* HEX_quadsect_1 */
{HEXAHEDRON,7,RED_CLASS|SWITCH_CLASS,4,
{1,0,1,0,1,1,1,1,1,0,1,0,0,1,0,1,0,0,0},
1 + 1<<2 + 1<<4 + 1<<5 + 1<<6 + 1<<7 + 1<<8 + 1<<10 + 1<<13 + 1<<15,
1 + (1<<2) + (1<<4) + (1<<5) + (1<<6) + (1<<7) + (1<<8) + (1<<10) + (1<<13) + (1<<15),
/* sonandnode */
{{0,1},{-1,-1},{0,2},{-1,-1},
......@@ -1366,7 +1366,7 @@ static REFRULE HexahedronRules[MAX_HEX_RULES] =
/* HEX_quadsect_2 */
{HEXAHEDRON,8,RED_CLASS|SWITCH_CLASS,4,
{0,1,0,1,1,1,1,1,0,1,0,1,0,0,1,0,1,0,0},
1<<1 + 1<<3 + 1<<4 + 1<<5 + 1<<6 + 1<<7 + 1<<9 + 1<<11 + 1<<14 + 1<<16,
(1<<1) + (1<<3) + (1<<4) + (1<<5) + (1<<6) + (1<<7) + (1<<9) + (1<<11) + (1<<14) + (1<<16),
/* sonandnode */
{{-1,-1},{0,2},{-1,-1},{0,3},
......@@ -1420,7 +1420,7 @@ static REFRULE HexahedronRules[MAX_HEX_RULES] =
/* HEX_trisect_5 */
{HEXAHEDRON,9,RED_CLASS|SWITCH_CLASS,3,
{0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0},
1<<8 + 1<<10,
(1<<8) + (1<<10),
/* sonandnode */
{{-1,-1},{-1,-1},{-1,-1},{-1,-1},
......@@ -1447,7 +1447,7 @@ static REFRULE HexahedronRules[MAX_HEX_RULES] =
/* HEX_bisect_hexpri0 */
{HEXAHEDRON,10,RED_CLASS|SWITCH_CLASS,2,
{0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0},
1<<3 + 1<<11,
(1<<3) + (1<<11),
/* sonandnode */
{{-1,-1},{-1,-1},{-1,-1},{0,3},
......@@ -1474,7 +1474,7 @@ static REFRULE HexahedronRules[MAX_HEX_RULES] =
/* HEX_bisect_hexpri1 */
{HEXAHEDRON,11,RED_CLASS|SWITCH_CLASS,2,
{1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0},
1 + 1<<8,
1 + (1<<8),
/* sonandnode */
{{0,0},{-1,-1},{-1,-1},{-1,-1},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment