[Gzz-commits] gzz/gfx demo/texturelab.py libtexture/TubeConne...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/04 14:05:43

Modified files:
        gfx/demo       : texturelab.py 
        gfx/libtexture : TubeConnector.texture 
        gfx/libutil    : ObjectStorer.hxx 

Log message:
        Remove exit reference

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/texturelab.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libtexture/TubeConnector.texture.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/ObjectStorer.hxx.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/texturelab.py
diff -c gzz/gfx/demo/texturelab.py:1.7 gzz/gfx/demo/texturelab.py:1.8
*** gzz/gfx/demo/texturelab.py:1.7      Mon Sep  2 08:58:10 2002
--- gzz/gfx/demo/texturelab.py  Wed Sep  4 14:05:43 2002
***************
*** 9,19 ****
      return " ".join([str(el) for el in list])
  
  
  
  
  class ShaderScene:
      def __init__(self):
!       self.resolution = [64, 64]
        self.shadername = "filereader"
        self.shaderparams = {
            "bulgemagz": 0.5,
--- 9,21 ----
      return " ".join([str(el) for el in list])
  
  
+ t = [
+  ("tf1", [256, 256, 0, 2], 
  
  
  class ShaderScene:
      def __init__(self):
!       self.resolution = [256, 256]
        self.shadername = "filereader"
        self.shaderparams = {
            "bulgemagz": 0.5,
Index: gzz/gfx/libtexture/TubeConnector.texture
diff -c gzz/gfx/libtexture/TubeConnector.texture:1.1 
gzz/gfx/libtexture/TubeConnector.texture:1.2
*** gzz/gfx/libtexture/TubeConnector.texture:1.1        Wed Aug  7 06:24:00 2002
--- gzz/gfx/libtexture/TubeConnector.texture    Wed Sep  4 14:05:43 2002
***************
*** 10,15 ****
--- 10,16 ----
    float x, y;
    int ind = 0, i, j;
  
+   enum { AMBIENT = 0, DIFFUSE, SPECULAR, SHADOW };
    int type = params->getStringEnum("light",  0, "ambient", "diffuse", 
"specular", "shadow", 0);
    int power = (int)params->getFloat("power", 8);
  
***************
*** 32,38 ****
        float alpha = d > .5 ? 0 : d > -.5 ? .5 - d : 1;
        float dot;
  
!       if (type == 3) {
        float d = fabs(y) - r;
        alpha = .7 * (d < -.5 ? 1 : 1 - (d + .5) * (d + .5) * (d + .5) * (d + 
.5) * 16);
        dot = 0;
--- 33,39 ----
        float alpha = d > .5 ? 0 : d > -.5 ? .5 - d : 1;
        float dot;
  
!       if (type == SHADOW) {
        float d = fabs(y) - r;
        alpha = .7 * (d < -.5 ? 1 : 1 - (d + .5) * (d + .5) * (d + .5) * (d + 
.5) * 16);
        dot = 0;
***************
*** 40,51 ****
  
        alpha *= h;
  
!       if (type == 0) {
        dot = 1;
        }
        else dot = f > 0 ? 1 / sqrt(dx * dx + dy * dy + 1) : 0;
  
!       if (type == 2) {
        for (int p = power; p >>= 1; )
          dot *= dot;
        }
--- 41,52 ----
  
        alpha *= h;
  
!       if (type == AMBIENT) {
        dot = 1;
        }
        else dot = f > 0 ? 1 / sqrt(dx * dx + dy * dy + 1) : 0;
  
!       if (type == SPECULAR) {
        for (int p = power; p >>= 1; )
          dot *= dot;
        }
Index: gzz/gfx/libutil/ObjectStorer.hxx
diff -c gzz/gfx/libutil/ObjectStorer.hxx:1.5 
gzz/gfx/libutil/ObjectStorer.hxx:1.6
*** gzz/gfx/libutil/ObjectStorer.hxx:1.5        Tue Sep  3 17:15:32 2002
--- gzz/gfx/libutil/ObjectStorer.hxx    Wed Sep  4 14:05:43 2002
***************
*** 6,11 ****
--- 6,12 ----
  
      using std::vector;
      using std::cout;
+     using std::cerr;
  
      // XXX NOT ENOUGH SAFETY CHECKS FOR REMOVE!
      // GET MUSTN'T CHECK; MUST CHECK RANGE BEFORE.
***************
*** 60,71 ****
         */
        T *get(int p) {
            if((unsigned)p >= vec.size()) {
!               cout << "Trying to get element past end\n";
!               exit(30);
            }
            if(vec[p] == NULL) {
!               cout << "Trying to get null element!\n";
!               exit(29);
            }
            return vec[p];
        }
--- 61,72 ----
         */
        T *get(int p) {
            if((unsigned)p >= vec.size()) {
!               cerr << "Trying to get element past end\n";
!               return 0;
            }
            if(vec[p] == NULL) {
!               cerr << "Trying to get null element!\n";
!               return 0;
            }
            return vec[p];
        }