[Plib-cvs] plib/src/ssgAux ssgaShapes.cxx,1.23,1.24 ssgaSphere.cxx,1.1,1.2 ssgaTeapot.cxx,1.6,1.7

[Steve B. <sj...@us...>]

Update of /cvsroot/plib/plib/src/ssgAux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26585/plib/src/ssgAux

Modified Files:
	ssgaShapes.cxx ssgaSphere.cxx ssgaTeapot.cxx 
Log Message:
Added a demo for ssgaShapes.
Fixed the diameter of ssgaSphere.
Fixed inability to add colour to the ssgaTeapot.


Index: ssgaShapes.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaShapes.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ssgaShapes.cxx	2 Sep 2002 06:05:49 -0000	1.23
+++ ssgaShapes.cxx	2 Feb 2005 15:48:08 -0000	1.24
@@ -437,9 +437,9 @@
       sgNormalizeVec3 ( v2 ) ;
       sgNormalizeVec3 ( v3 ) ;
 
-      sgSetVec3 ( v, center[0]+size[0]*v0[0],
-                     center[1]+size[1]*v0[1],
-                     center[2]+size[2]*v0[2] ) ;
+      sgSetVec3 ( v, center[0]+size[0]*v0[0]/2.0f,
+                     center[1]+size[1]*v0[1]/2.0f,
+                     center[2]+size[2]*v0[2]/2.0f ) ;
       sgSetVec3 ( n, size[0]*v0[0],
                      size[1]*v0[1],
                      size[2]*v0[2] ) ;
@@ -447,9 +447,9 @@
       sgSetVec2 ( t, ATAN2(n[0],n[1])/(SG_PI*2.0f)+0.5f, 0.5f+v0[2]/2.0f ) ;
       vv->add(v) ; nn->add(n) ; cc->add(colour) ; tt->add(t) ;
     
-      sgSetVec3 ( v, center[0]+size[0]*v1[0],
-                     center[1]+size[1]*v1[1],
-                     center[2]+size[2]*v1[2] ) ;
+      sgSetVec3 ( v, center[0]+size[0]*v1[0]/2.0f,
+                     center[1]+size[1]*v1[1]/2.0f,
+                     center[2]+size[2]*v1[2]/2.0f ) ;
       sgSetVec3 ( n, size[0]*v1[0],
                      size[1]*v1[1],
                      size[2]*v1[2] ) ;
@@ -464,9 +464,9 @@
         sgNormalizeVec3 ( va ) ;
         sgNormalizeVec3 ( vb ) ;
  
-	sgSetVec3 ( v, center[0]+size[0]*va[0],
-		       center[1]+size[1]*va[1],
-		       center[2]+size[2]*va[2] ) ;
+	sgSetVec3 ( v, center[0]+size[0]*va[0]/2.0f,
+		       center[1]+size[1]*va[1]/2.0f,
+		       center[2]+size[2]*va[2]/2.0f ) ;
 	sgSetVec3 ( n, size[0]*va[0],
 		       size[1]*va[1],
 		       size[2]*va[2] ) ;
@@ -474,9 +474,9 @@
         sgSetVec2 ( t, ATAN2(n[0],n[1])/(SG_PI*2.0f)+0.5f, 0.5f+va[2]/2.0f ) ;
 	vv->add(v) ; nn->add(n) ; cc->add(colour) ; tt->add(t) ;
 
-	sgSetVec3 ( v, center[0]+size[0]*vb[0],
-		       center[1]+size[1]*vb[1],
-		       center[2]+size[2]*vb[2] ) ;
+	sgSetVec3 ( v, center[0]+size[0]*vb[0]/2.0f,
+		       center[1]+size[1]*vb[1]/2.0f,
+		       center[2]+size[2]*vb[2]/2.0f ) ;
 	sgSetVec3 ( n, size[0]*vb[0],
 		       size[1]*vb[1],
 		       size[2]*vb[2] ) ;
@@ -485,9 +485,9 @@
 	vv->add(v) ; nn->add(n) ; cc->add(colour) ; tt->add(t) ;
       }
  
-      sgSetVec3 ( v, center[0]+size[0]*v2[0],
-                     center[1]+size[1]*v2[1],
-                     center[2]+size[2]*v2[2] ) ;
+      sgSetVec3 ( v, center[0]+size[0]*v2[0]/2.0f,
+                     center[1]+size[1]*v2[1]/2.0f,
+                     center[2]+size[2]*v2[2]/2.0f ) ;
       sgSetVec3 ( n, size[0]*v2[0],
                      size[1]*v2[1],
                      size[2]*v2[2] ) ;
@@ -557,7 +557,6 @@
         sgNormalizeVec3 ( n ) ;
 	sgSetVec2 ( t, (float)j/(float)slices, (float) i /(float)stacks ) ;
 	vv->add(v) ; nn->add(n) ; cc->add(colour) ; tt->add(t) ;
-        
       }
     }
     else

Index: ssgaSphere.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaSphere.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ssgaSphere.cxx	26 Jul 2003 06:16:19 -0000	1.1
+++ ssgaSphere.cxx	2 Feb 2005 15:48:09 -0000	1.2
@@ -122,3 +122,4 @@
 
   return sphere;
 }
+

Index: ssgaTeapot.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaTeapot.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ssgaTeapot.cxx	2 Sep 2002 06:05:49 -0000	1.6
+++ ssgaTeapot.cxx	2 Feb 2005 15:48:09 -0000	1.7
@@ -236,7 +236,6 @@
     for ( j = 0 ; j < 16 ; j++ )
     {
       sgVec3 xyz ;
-      sgVec4 rgba = { 1,1,1,1 } ;
       sgVec2 uv ;
 
       uv [ 0 ] = (float)(j&3)/3.0f ;
@@ -245,7 +244,7 @@
       sgScaleVec3 ( xyz, vertex[patch[i][j+1]], 1.0f/2.5f ) ;
       xyz [ 0 ] *= -1.0f ;
 
-      p -> setControlPoint ( j>>2, j&3, xyz, uv, rgba ) ;
+      p -> setControlPoint ( j>>2, j&3, xyz, uv, colour ) ;
     }
 
     p -> setKidState ( getKidState () ) ;