← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hacks/galaxy.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/galaxy.c
43
43
# define DEFAULTS       "*delay:  20000  \n"   \
44
44
                                        "*count:  -5     \n"   \
45
45
                                        "*cycles:  250   \n"   \
46
 
                                        "*ncolors:  64   \n"
 
46
                                        "*ncolors:  64   \n" \
 
47
                                        "*fpsSolid:  true   \n" \
 
48
 
47
49
# define UNIFORM_COLORS
48
50
# define reshape_galaxy 0
49
51
# define galaxy_handle_event 0
368
370
 
369
371
        d = d0 * d0 + d1 * d1 + d2 * d2;
370
372
        if (d > EPSILON)
371
 
          d = gt->mass / (d * sqrt(d)) * DELTAT * DELTAT * QCONS;
 
373
          d = gtk->mass / (d * sqrt(d)) * DELTAT * DELTAT * QCONS;
372
374
        else
373
 
          d = gt->mass * eps;
 
375
          d = gtk->mass / (eps * sqrt(eps));
374
376
        v0 += d0 * d;
375
377
        v1 += d1 * d;
376
378
        v2 += d2 * d;
400
402
 
401
403
      d = d0 * d0 + d1 * d1 + d2 * d2;
402
404
      if (d > EPSILON)
403
 
        d = gt->mass * gt->mass / (d * sqrt(d)) * DELTAT * QCONS;
 
405
        d = 1 / (d * sqrt(d)) * DELTAT * QCONS;
404
406
      else
405
 
        d = gt->mass * gt->mass / (EPSILON * sqrt_EPSILON) * DELTAT * QCONS;
 
407
        d = 1 / (EPSILON * sqrt_EPSILON) * DELTAT * QCONS;
406
408
 
407
409
      d0 *= d;
408
410
      d1 *= d;
409
411
      d2 *= d;
410
 
      gt->vel[0] += d0 / gt->mass;
411
 
      gt->vel[1] += d1 / gt->mass;
412
 
      gt->vel[2] += d2 / gt->mass;
413
 
      gtk->vel[0] -= d0 / gtk->mass;
414
 
      gtk->vel[1] -= d1 / gtk->mass;
415
 
      gtk->vel[2] -= d2 / gtk->mass;
 
412
      gt->vel[0] += d0 * gtk->mass;
 
413
      gt->vel[1] += d1 * gtk->mass;
 
414
      gt->vel[2] += d2 * gtk->mass;
 
415
      gtk->vel[0] -= d0 * gt->mass;
 
416
      gtk->vel[1] -= d1 * gt->mass;
 
417
      gtk->vel[2] -= d2 * gt->mass;
416
418
    }
417
419
 
418
420
    gt->pos[0] += gt->vel[0] * DELTAT;