TempleOSCD_150216.ISO

Apps/GrModels/BallGen.CPP

@@ -58,17 +58,17 @@ I64 AddTri(BallDefineStruct *,I64 c,I64 n0,I64 n1,I64 n2)
 U8 *Ball2CSprite()
 {
 //See $LK,"::/Adam/Gr/GrSpritePlot.CPP",A="FL:::/Adam/Gr/GrSpritePlot.CPP,1"$ for how CSprite are stored.
-  U8 *result=MAlloc(sizeof(U8)+2*sizeof(I32)+
+  U8 *result=MAlloc(sizeof(CSpriteMeshU8s)+
     b->vertex_cnt*sizeof(CD3I32)+b->tri_cnt*sizeof(CMeshTri)+sprite_elem_base_sizes[SPT_END]),
     *dst=result;
-  *dst(U8 *)++ =SPT_MESH;
+  *dst++ =SPT_MESH;
   *dst(I32 *)++ =b->vertex_cnt;
   *dst(I32 *)++ =b->tri_cnt;
   MemCpy(dst,&b->v,b->vertex_cnt*sizeof(CD3I32));
   dst+=b->vertex_cnt*sizeof(CD3I32);
   MemCpy(dst,&b->t,b->tri_cnt*sizeof(CMeshTri));
   dst+=b->tri_cnt*sizeof(CMeshTri);
-  *dst(U8 *)++ =SPT_END;
+  *dst++ =SPT_END;
   return result;
 }
 

Apps/GrModels/Load.CPP

@@ -1,7 +1,8 @@
 #help_index "Misc"
 
-#include "/Apps/GrModels/ManGen"
-#include "/Apps/GrModels/BallGen"
-#include "/Apps/GrModels/Models"
+Cd(__DIR__);;
+#include "ManGen"
+#include "BallGen"
+#include "Models"
 
 #help_index ""

Apps/GrModels/ManGen.CPP

@@ -7,7 +7,7 @@ class Man
 {
   I32 vertex_cnt;
   I32 tri_cnt;
-  CD3I32	    v[MAX_VERTICES];
+  CD3I32   v[MAX_VERTICES];
   CMeshTri t[MAX_TRIS];
 } *m;
 
@@ -182,17 +182,17 @@ U0 AddBox(ManDefineStruct *md,I64 c,I64 x1,I64 y1,I64 z1,F64 w,F64 h,F64 d,F64 h
 U8 *Man2CSprite()
 {
 //See $LK,"::/Adam/Gr/GrSpritePlot.CPP",A="FL:::/Adam/Gr/GrSpritePlot.CPP,1"$ for how CSprite are stored.
-  U8 *result=MAlloc(sizeof(U8)+2*sizeof(I32)+
+  U8 *result=MAlloc(sizeof(CSpriteMeshU8s)+
       m->vertex_cnt*sizeof(CD3I32)+m->tri_cnt*sizeof(CMeshTri)+sprite_elem_base_sizes[SPT_END]),
       *dst=result;
-  *dst(U8 *)++ =SPT_MESH;
+  *dst++ =SPT_MESH;
   *dst(I32 *)++ =m->vertex_cnt;
   *dst(I32 *)++ =m->tri_cnt;
   MemCpy(dst,&m->v,m->vertex_cnt*sizeof(CD3I32));
   dst+=m->vertex_cnt*sizeof(CD3I32);
   MemCpy(dst,&m->t,m->tri_cnt*sizeof(CMeshTri));
   dst+=m->tri_cnt*sizeof(CMeshTri);
-  *dst(U8 *)++ =SPT_END;
+  *dst++ =SPT_END;
   return result;
 }
 

Apps/GrModels/Run.CPP

@@ -1,2 +1,3 @@
-#include "/Apps/GrModels/Load"
+Cd(__DIR__);;
+#include "Load"
 Models;