projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz
[xscreensaver]
/
hacks
/
glx
/
glplanet.c
diff --git
a/hacks/glx/glplanet.c
b/hacks/glx/glplanet.c
index 0e94270134dd6588d574090d20216a7c18c307da..c30b306ede1f0168f28b4cbb5a9c375e200934cb 100644
(file)
--- a/
hacks/glx/glplanet.c
+++ b/
hacks/glx/glplanet.c
@@
-119,15
+119,10
@@
ModStruct planet_description =
"Animates texture mapped sphere (planet)", 0, NULL};
#endif
"Animates texture mapped sphere (planet)", 0, NULL};
#endif
-# ifdef __GNUC__
- __extension__ /* don't warn about "string length is greater than the length
- ISO C89 compilers are required to support" when including
- the following XPM file... */
-# endif
-#include "../images/earth.xpm"
-#include "../images/earth_night.xpm"
+#include "images/gen/earth_png.h"
+#include "images/gen/earth_night_png.h"
-#include "x
pm-ximage
.h"
+#include "x
image-loader
.h"
#include "rotator.h"
#include "gltrackball.h"
#include "rotator.h"
#include "gltrackball.h"
@@
-165,10
+160,10
@@
static planetstruct *planets = NULL;
/* Set up and enable texturing on our object */
static void
/* Set up and enable texturing on our object */
static void
-setup_xpm_texture (ModeInfo *mi, c
har **xpm_data
)
+setup_xpm_texture (ModeInfo *mi, c
onst unsigned char *data, unsigned long size
)
{
{
- XImage *image =
xpm
_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi),
-
MI_COLORMAP (mi), xpm_data
);
+ XImage *image =
image_data
_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi),
+
data, size
);
char buf[1024];
clear_gl_error();
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
char buf[1024];
clear_gl_error();
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@
-177,10
+172,7
@@
setup_xpm_texture (ModeInfo *mi, char **xpm_data)
*/
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
image->width, image->height, 0,
*/
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
image->width, image->height, 0,
- GL_RGBA,
- /* GL_UNSIGNED_BYTE, */
- GL_UNSIGNED_INT_8_8_8_8_REV,
- image->data);
+ GL_RGBA, GL_UNSIGNED_BYTE, image->data);
sprintf (buf, "builtin texture (%dx%d)", image->width, image->height);
check_gl_error(buf);
}
sprintf (buf, "builtin texture (%dx%d)", image->width, image->height);
check_gl_error(buf);
}
@@
-193,8
+185,7
@@
setup_file_texture (ModeInfo *mi, char *filename)
Visual *visual = mi->xgwa.visual;
char buf[1024];
Visual *visual = mi->xgwa.visual;
char buf[1024];
- Colormap cmap = mi->xgwa.colormap;
- XImage *image = xpm_file_to_ximage (dpy, visual, cmap, filename);
+ XImage *image = file_to_ximage (dpy, visual, filename);
if (!image) return False;
clear_gl_error();
if (!image) return False;
clear_gl_error();
@@
-202,10
+193,7
@@
setup_file_texture (ModeInfo *mi, char *filename)
glPixelStorei(GL_UNPACK_ROW_LENGTH, image->width);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
image->width, image->height, 0,
glPixelStorei(GL_UNPACK_ROW_LENGTH, image->width);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
image->width, image->height, 0,
- GL_RGBA,
- /* GL_UNSIGNED_BYTE, */
- GL_UNSIGNED_INT_8_8_8_8_REV,
- image->data);
+ GL_RGBA, GL_UNSIGNED_BYTE, image->data);
sprintf (buf, "texture: %.100s (%dx%d)",
filename, image->width, image->height);
check_gl_error(buf);
sprintf (buf, "texture: %.100s (%dx%d)",
filename, image->width, image->height);
check_gl_error(buf);
@@
-233,7
+221,7
@@
setup_texture(ModeInfo * mi)
!strcmp(which_image, "BUILTIN"))
{
BUILTIN1:
!strcmp(which_image, "BUILTIN"))
{
BUILTIN1:
- setup_xpm_texture (mi, earth_
xpm
);
+ setup_xpm_texture (mi, earth_
png, sizeof(earth_png)
);
}
else
{
}
else
{
@@
-258,7
+246,7
@@
setup_texture(ModeInfo * mi)
!strcmp(which_image2, "BUILTIN"))
{
BUILTIN2:
!strcmp(which_image2, "BUILTIN"))
{
BUILTIN2:
- setup_xpm_texture (mi, earth_night_
xpm
);
+ setup_xpm_texture (mi, earth_night_
png, sizeof(earth_night_png)
);
}
else
{
}
else
{
@@
-287,12
+275,18
@@
init_stars (ModeInfo *mi)
int max_size = 3;
GLfloat inc = 0.5;
int steps = max_size / inc;
int max_size = 3;
GLfloat inc = 0.5;
int steps = max_size / inc;
+ GLfloat scale = 1;
+
+ if (MI_WIDTH(mi) > 2560) { /* Retina displays */
+ scale *= 2;
+ nstars /= 2;
+ }
gp->starlist = glGenLists(1);
glNewList(gp->starlist, GL_COMPILE);
for (j = 1; j <= steps; j++)
{
gp->starlist = glGenLists(1);
glNewList(gp->starlist, GL_COMPILE);
for (j = 1; j <= steps; j++)
{
- glPointSize(inc * j);
+ glPointSize(inc * j
* scale
);
glBegin (GL_POINTS);
for (i = 0; i < nstars / steps; i++)
{
glBegin (GL_POINTS);
for (i = 0; i < nstars / steps; i++)
{
@@
-333,7
+327,7
@@
reshape_planet (ModeInfo *mi, int width, int height)
glViewport(0, 0, (GLint) width, (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glViewport(0, 0, (GLint) width, (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
- glFrustum(-1.0, 1.0, -h, h, 5.0,
1
00.0);
+ glFrustum(-1.0, 1.0, -h, h, 5.0,
2
00.0);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glTranslatef(0.0, 0.0, -40);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glTranslatef(0.0, 0.0, -40);