compiler/libec: (#205) Corrections to integer promotions

[sdk] / samples / 3D / terrainCameraDemo / dna.ec

diff --git a/samples/3D/terrainCameraDemo/dna.ec b/samples/3D/terrainCameraDemo/dna.ec
index 2c5ca30..eaa5ae9 100644 (file)
--- a/samples/3D/terrainCameraDemo/dna.ec
+++ b/samples/3D/terrainCameraDemo/dna.ec
@@ -228,49 +228,49 @@ public:
             //Define Polygons
             for(p=0; p<num; p++)
             {
-               group.indices[index++] = p*2+1;
-               group.indices[index++] = p*2+3;
-               group.indices[index++] = p*2+2;
-               group.indices[index++] = p*2+2;
-               group.indices[index++] = p*2;
-               group.indices[index++] = p*2+1;
-
-               group.indices[index++] = p*2+startv;
-               group.indices[index++] = p*2+2+startv;
-               group.indices[index++] = p*2+3+startv;
-               group.indices[index++] = p*2+3+startv;
-               group.indices[index++] = p*2+1+startv;
-               group.indices[index++] = p*2+startv;
-
-               group.indices[index++] = p*2+startv+1;
-               group.indices[index++] = p*2+startv+3;
-               group.indices[index++] = p*2+3;
-               group.indices[index++] = p*2+3;
-               group.indices[index++] = p*2+1;
-               group.indices[index++] = p*2+startv+1;
-
-               group.indices[index++] = p*2;
-               group.indices[index++] = p*2+2;
-               group.indices[index++] = p*2+startv+2;
-               group.indices[index++] = p*2+startv+2;
-               group.indices[index++] = p*2+startv;
-               group.indices[index++] = p*2;
+               group.indices[index++] = (uint16)(p*2+1);
+               group.indices[index++] = (uint16)(p*2+3);
+               group.indices[index++] = (uint16)(p*2+2);
+               group.indices[index++] = (uint16)(p*2+2);
+               group.indices[index++] = (uint16)(p*2);
+               group.indices[index++] = (uint16)(p*2+1);
+
+               group.indices[index++] = (uint16)(p*2+startv);
+               group.indices[index++] = (uint16)(p*2+2+startv);
+               group.indices[index++] = (uint16)(p*2+3+startv);
+               group.indices[index++] = (uint16)(p*2+3+startv);
+               group.indices[index++] = (uint16)(p*2+1+startv);
+               group.indices[index++] = (uint16)(p*2+startv);
+
+               group.indices[index++] = (uint16)(p*2+startv+1);
+               group.indices[index++] = (uint16)(p*2+startv+3);
+               group.indices[index++] = (uint16)(p*2+3);
+               group.indices[index++] = (uint16)(p*2+3);
+               group.indices[index++] = (uint16)(p*2+1);
+               group.indices[index++] = (uint16)(p*2+startv+1);
+
+               group.indices[index++] = (uint16)(p*2);
+               group.indices[index++] = (uint16)(p*2+2);
+               group.indices[index++] = (uint16)(p*2+startv+2);
+               group.indices[index++] = (uint16)(p*2+startv+2);
+               group.indices[index++] = (uint16)(p*2+startv);
+               group.indices[index++] = (uint16)(p*2);
             }
 
             // Ends
             group.indices[index++] = startv;
-            group.indices[index++] = startv+1;
+            group.indices[index++] = (uint16)(startv+1);
             group.indices[index++] = 1;
             group.indices[index++] = 1;
             group.indices[index++] = 0;
             group.indices[index++] = startv;
 
-            group.indices[index++] = 2*num;
-            group.indices[index++] = 2*num+1;
-            group.indices[index++] = 2*num+startv+1;
-            group.indices[index++] = 2*num+startv+1;
-            group.indices[index++] = 2*num+startv;
-            group.indices[index++] = 2*num;
+            group.indices[index++] = (uint16)(2*num);
+            group.indices[index++] = (uint16)(2*num+1);
+            group.indices[index++] = (uint16)(2*num+startv+1);
+            group.indices[index++] = (uint16)(2*num+startv+1);
+            group.indices[index++] = (uint16)(2*num+startv);
+            group.indices[index++] = (uint16)(2*num);
 
             ComputeNormals();
             result = true;
@@ -283,7 +283,7 @@ public:
    }
 }
 
-static char * names[7] = { "Adenine", "Cytosine", "Guanine", "Thymine", "Phosphate", "Desoxyribose", "Hydrogene" };
+static const char * names[7] = { "Adenine", "Cytosine", "Guanine", "Thymine", "Phosphate", "Desoxyribose", "Hydrogene" };
 
 public class DNAModel : Object
 {
@@ -297,7 +297,7 @@ public class DNAModel : Object
    int baseHeight;
    int baseDepth;
    int desoxyriboseWidth;
-   char * textureFile;
+   const char * textureFile;
 
 public:
    bool Create(DisplaySystem displaySystem)