X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fgalaxy.c;h=3a6e1f78582c08671210d80cb6de507696cfdfb1;hb=39809ded547bdbb08207d3e514950425215b4410;hp=06aa1c4d4da252d6dac8173dea7d2ebbd8ef8ffd;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/galaxy.c b/hacks/galaxy.c
index 06aa1c4d..3a6e1f78 100644
--- a/hacks/galaxy.c
+++ b/hacks/galaxy.c
@@ -43,8 +43,13 @@ static const char sccsid[] = "@(#)galaxy.c 4.04 97/07/28 xlockmore";
 # define DEFAULTS	"*delay:  20000  \n"   \
 					"*count:  -5     \n"   \
 					"*cycles:  250   \n"   \
-					"*ncolors:  64   \n"
+					"*ncolors:  64   \n" \
+					"*fpsSolid:  true   \n" \
+					"*ignoreRotation: True \n" \
+				    "*lowrez: True \n" \
+
 # define UNIFORM_COLORS
+# define release_galaxy 0
 # define reshape_galaxy 0
 # define galaxy_handle_event 0
 # include "xlockmore.h"    /* from the xscreensaver distribution */
@@ -156,9 +161,10 @@ x-axis */
 
 static unistruct *universes = NULL;
 
-static void
-free_galaxies(unistruct * gp)
+ENTRYPOINT void
+free_galaxy(ModeInfo * mi)
 {
+ unistruct  *gp = &universes[MI_SCREEN(mi)];
  if (gp->galaxies != NULL) {
   int         i;
 
@@ -190,7 +196,7 @@ startover(ModeInfo * mi)
  gp->rot_x = 0;
 
  if (MI_BATCHCOUNT(mi) < -MINGALAXIES)
-  free_galaxies(gp);
+  free_galaxy(mi);
  gp->ngalaxies = MI_BATCHCOUNT(mi);
  if (gp->ngalaxies < -MINGALAXIES)
   gp->ngalaxies = NRAND(-gp->ngalaxies - MINGALAXIES + 1) + MINGALAXIES;
@@ -305,14 +311,10 @@ init_galaxy(ModeInfo * mi)
 {
  unistruct  *gp;
 
- if (universes == NULL) {
-  if ((universes = (unistruct *) calloc(MI_NUM_SCREENS(mi),
-      sizeof (unistruct))) == NULL)
-   return;
- }
+ MI_INIT (mi, universes);
  gp = &universes[MI_SCREEN(mi)];
 
-# ifdef HAVE_COCOA	/* Don't second-guess Quartz's double-buffering */
+# ifdef HAVE_JWXYZ	/* Don't second-guess Quartz's double-buffering */
   dbufp = False;
 # endif
 
@@ -368,9 +370,9 @@ draw_galaxy(ModeInfo * mi)
 
         d = d0 * d0 + d1 * d1 + d2 * d2;
         if (d > EPSILON)
-          d = gt->mass / (d * sqrt(d)) * DELTAT * DELTAT * QCONS;
+          d = gtk->mass / (d * sqrt(d)) * DELTAT * DELTAT * QCONS;
         else
-          d = gt->mass * eps;
+          d = gtk->mass / (eps * sqrt(eps));
         v0 += d0 * d;
         v1 += d1 * d;
         v2 += d2 * d;
@@ -400,19 +402,19 @@ draw_galaxy(ModeInfo * mi)
 
       d = d0 * d0 + d1 * d1 + d2 * d2;
       if (d > EPSILON)
-        d = gt->mass * gt->mass / (d * sqrt(d)) * DELTAT * QCONS;
+        d = 1 / (d * sqrt(d)) * DELTAT * QCONS;
       else
-        d = gt->mass * gt->mass / (EPSILON * sqrt_EPSILON) * DELTAT * QCONS;
+        d = 1 / (EPSILON * sqrt_EPSILON) * DELTAT * QCONS;
 
       d0 *= d;
       d1 *= d;
       d2 *= d;
-      gt->vel[0] += d0 / gt->mass;
-      gt->vel[1] += d1 / gt->mass;
-      gt->vel[2] += d2 / gt->mass;
-      gtk->vel[0] -= d0 / gtk->mass;
-      gtk->vel[1] -= d1 / gtk->mass;
-      gtk->vel[2] -= d2 / gtk->mass;
+      gt->vel[0] += d0 * gtk->mass;
+      gt->vel[1] += d1 * gtk->mass;
+      gt->vel[2] += d2 * gtk->mass;
+      gtk->vel[0] -= d0 * gt->mass;
+      gtk->vel[1] -= d1 * gt->mass;
+      gtk->vel[2] -= d2 * gt->mass;
     }
 
     gt->pos[0] += gt->vel[0] * DELTAT;
@@ -438,23 +440,12 @@ draw_galaxy(ModeInfo * mi)
     startover(mi);
 }
 
-ENTRYPOINT void
-release_galaxy(ModeInfo * mi)
-{
- if (universes != NULL) {
-  int         screen;
-
-  for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-   free_galaxies(&universes[screen]);
-  (void) free((void *) universes);
-  universes = NULL;
- }
-}
-
+#ifndef STANDALONE
 ENTRYPOINT void
 refresh_galaxy(ModeInfo * mi)
 {
  /* Do nothing, it will refresh by itself */
 }
+#endif
 
 XSCREENSAVER_MODULE ("Galaxy", galaxy)