← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xscreensaver/quantal

« back to all changes in this revision

Viewing changes to hacks/glx/morph3d.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2008-08-28 16:15:25 UTC
  • mfrom: (1.1.6 upstream) (2.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20080828161525-mxga521aoezxjq8h
Tags: 5.07-0ubuntu1
* Upgrade upstream version
* debian/control: Remove suggest xdaliclock as it is no longer
  included
* Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
  upstream.
* Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped
  from the build files.  There is nothing in the Changelog about it
  so I believe it was accidental.
* Updating the .desktop files from the XML files using gnome-screensaver's
  utility to do so.  Lots of text updates.  Also:
    * Added: abstractile.desktop
    * Added: cwaves.desktop
    * Added: m6502.desktop
    * Added: skytentacles.desktop
    * Removed: xteevee.desktop
* xscreensaver-gl-extra.files: Added skytentacles
* xscreensaver-data-extra.files: Added abstractile, cwaves and m6502
* xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves

Show diffs side-by-side

added added

removed removed

Lines of Context:
hacks/glx/morph3d.c
175
175
      NeiBX=Factor2*Xf-VertX; NeiBY=Factor2*Yb-VertY; NeiBZ=Factor2*Zf-VertZ;                                    \
176
176
      glNormal3f(VectMul(NeiAX, NeiAY, NeiAZ, NeiBX, NeiBY, NeiBZ));                                             \
177
177
      glVertex3f(VertX, VertY, VertZ);                                                                           \
 
178
      mi->polygon_count++;                                                                                       \
178
179
                                                                                                                 \
179
180
      Xf-=Ax; Yf-=Ay; Xa-=Ax; Yb-=Ay;                                                                            \
180
181
                                                                                                                 \
186
187
      NeiBX=Factor2*Xf-VertX; NeiBY=Factor2*Yb-VertY; NeiBZ=Factor2*Zf-VertZ;                                    \
187
188
      glNormal3f(VectMul(NeiAX, NeiAY, NeiAZ, NeiBX, NeiBY, NeiBZ));                                             \
188
189
      glVertex3f(VertX, VertY, VertZ);                                                                           \
 
190
      mi->polygon_count++;                                                                                       \
189
191
                                                                                                                 \
190
192
      Xf-=Ax; Yf+=Ay; Xa-=Ax; Yb+=Ay;                                                                            \
191
193
    }                                                                                                            \
241
243
      NeiBX=Factor2*Xf-VertX; NeiBY=Factor2*Yb-VertY; NeiBZ=Factor2*Zf-VertZ;                                    \
242
244
      glNormal3f(VectMul(NeiAX, NeiAY, NeiAZ, NeiBX, NeiBY, NeiBZ));                                             \
243
245
      glVertex3f(VertX, VertY, VertZ);                                                                           \
 
246
      mi->polygon_count++;                                                                                       \
244
247
    }                                                                                                            \
245
248
    glEnd();                                                                                                     \
246
249
  }                                                                                                              \
277
280
        NeiAX=Factor1*Xa-VertX; NeiAY=Factor1*Yf-VertY; NeiAZ=Factor1*Zf-VertZ;                                  \
278
281
        NeiBX=Factor2*Xf-VertX; NeiBY=Factor2*Yb-VertY; NeiBZ=Factor2*Zf-VertZ;                                  \
279
282
        glNormal3f(VectMul(NeiAX, NeiAY, NeiAZ, NeiBX, NeiBY, NeiBZ));                                           \
280
 
        glVertex3f(VertX, VertY, VertZ);                                                                         \
 
283
                glVertex3f(VertX, VertY, VertZ);                                                                         \
 
284
            mi->polygon_count++;                                                                                     \
281
285
                                                                                                                 \
282
286
        Xf-=x[Fi]; Yf-=y[Fi]; Xa-=x[Fi]; Yb-=y[Fi];                                                              \
283
287
                                                                                                                 \
284
 
        Factor=1-(((Xf2=sqr(Xf))+(Yf2=sqr(Yf)))*AmpVr2);                                                         \
285
 
        Factor1=1-((sqr(Xa)+Yf2)*AmpVr2);                                                                        \
286
 
        Factor2=1-((Xf2+sqr(Yb))*AmpVr2);                                                                        \
 
288
                Factor=1-(((Xf2=sqr(Xf))+(Yf2=sqr(Yf)))*AmpVr2);                                                         \
 
289
                Factor1=1-((sqr(Xa)+Yf2)*AmpVr2);                                                                        \
 
290
                Factor2=1-((Xf2+sqr(Yb))*AmpVr2);                                                                        \
287
291
        VertX=Factor*Xf;        VertY=Factor*Yf;        VertZ=Factor*Zf;                                         \
288
292
        NeiAX=Factor1*Xa-VertX; NeiAY=Factor1*Yf-VertY; NeiAZ=Factor1*Zf-VertZ;                                  \
289
293
        NeiBX=Factor2*Xf-VertX; NeiBY=Factor2*Yb-VertY; NeiBZ=Factor2*Zf-VertZ;                                  \
290
294
        glNormal3f(VectMul(NeiAX, NeiAY, NeiAZ, NeiBX, NeiBY, NeiBZ));                                           \
291
 
        glVertex3f(VertX, VertY, VertZ);                                                                         \
 
295
                glVertex3f(VertX, VertY, VertZ);                                                                         \
 
296
            mi->polygon_count++;                                                                                     \
292
297
                                                                                                                 \
293
298
      }                                                                                                          \
294
299
      Xf=(float)Ri*x[Fi+1];                                                                                      \
305
310
      glEnd();                                                                                                   \
306
311
    }                                                                                                            \
307
312
  }                                                                                                              \
308
 
  VS=(Factor<0);                                                                                             \
 
313
  VS=(Factor<0);                                                                                                     \
309
314
}
310
315
 
311
316
static void
750
755
        if (!mp->glx_context)
751
756
                return;
752
757
 
 
758
    mi->polygon_count = 0;
753
759
        glXMakeCurrent(display, window, *(mp->glx_context));
754
760
 
755
761
        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);