# define HACK_INIT init_superquadrics
# define HACK_DRAW draw_superquadrics
# define superquadrics_opts xlockmore_opts
-# define DEFAULTS "*delay: 100 \n" \
+# define DEFAULTS "*delay: 40000 \n" \
"*count: 25 \n" \
"*cycles: 40 \n" \
"*wireframe: False \n"
};
ModeSpecOpt superquadrics_opts =
-{1, opts, 1, vars, desc};
+{sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc};
#ifdef USE_MODULES
ModStruct superquadrics_description =
{"superquadrics", "init_superquadrics", "draw_superquadrics", "release_superquadrics",
"refresh_superquadrics", "init_superquadrics", NULL, &superquadrics_opts,
- 1000, 25, 40, 1, 1.0, "",
+ 1000, 25, 40, 1, 4, 1.0, "",
"Shows 3D mathematical shapes", 0, NULL};
#endif
return;
}
sp = &superquadrics[screen];
- sp->mono = (MI_WIN_IS_MONO(mi) ? 1 : 0);
+ sp->mono = (MI_IS_MONO(mi) ? 1 : 0);
if ((sp->glx_context = init_GL(mi)) != NULL) {
- InitSuperquadrics(MI_WIN_IS_WIREFRAME(mi), 0,
- MI_BATCHCOUNT(mi), MI_CYCLES(mi), spinspeed, sp);
- ReshapeSuperquadrics(MI_WIN_WIDTH(mi), MI_WIN_HEIGHT(mi));
+ InitSuperquadrics(MI_IS_WIREFRAME(mi), 0,
+ MI_COUNT(mi), MI_CYCLES(mi), spinspeed, sp);
+ ReshapeSuperquadrics(MI_WIDTH(mi), MI_HEIGHT(mi));
DisplaySuperquadrics(sp);
glFinish();