#include "demo.h"
#include "screen.h"
+/* APPROX. 170 FPS Minimum */
+
#define BG_FILENAME "data/grise.png"
#define MIN_SCROLL 32
static unsigned int lastFrameTime = 0;
static float lastFrameDuration = 0.0f;
-static float scrollSpeedTable[REFLECTION_HEIGHT];
+static short *displacementMap;
+
+static float scrollScaleTable[REFLECTION_HEIGHT];
static float scrollTable[REFLECTION_HEIGHT];
static int scrollTableRounded[REFLECTION_HEIGHT];
static int scrollModTable[REFLECTION_HEIGHT];
+static float nearScrollAmount = 0.0f;
static struct screen scr = {
"mike",
/* Convert to 16bpp */
convert32To16((unsigned int*)background, background, backgroundW * NORMALMAP_SCANLINE); /* Normalmap will keep its 32 bit color */
- processNormal();
-
initScrollTables();
+ processNormal();
+
return 0;
}
unsigned short *src = background + scroll;
int scanline = 0;
int i = 0;
+ short *disp;
+ int d;
lastFrameDuration = (time_msec - lastFrameTime) / 1000.0f;
lastFrameTime = time_msec;
updateScrollTables(lastFrameDuration);
- dst = fb_pixels;
- dst += 100 * fb_width;
- src = background + NORMALMAP_SCANLINE * backgroundW * 2;
+ dst = (unsigned short*) fb_pixels + HORIZON_HEIGHT * fb_width;
+ src = background + HORIZON_HEIGHT * backgroundW;
+ disp = displacementMap;
for (scanline = 0; scanline < REFLECTION_HEIGHT; scanline++) {
for (i = 0; i < fb_width; i++) {
- *dst++ = src[(i + scrollTableRounded[scanline]) % scrollModTable[scanline]];
+ d = disp[(i + scrollTableRounded[scanline]) % scrollModTable[scanline]];
+ *dst++ = src[i + scroll + d];
}
src += backgroundW;
+ disp += backgroundW;
}
}
/* Scale normal with depth and unpack R component (horizontal component) */
static void processNormal() {
int scanline;
- unsigned int *normalmap = (unsigned int*)background;
- normalmap += NORMALMAP_SCANLINE * backgroundW;
- unsigned short *dst = normalmap;
- float scale;
int i;
int x;
+ short maxDisplacement = 0;
+ short minDisplacement = 256;
+ unsigned short *dst;
+ short *dst2;
+ unsigned int *normalmap = (unsigned int*)background;
+ normalmap += NORMALMAP_SCANLINE * backgroundW;
+ dst = (unsigned short*)normalmap;
+ displacementMap = (short*)dst;
+ dst2 = displacementMap;
for (scanline = 0; scanline < REFLECTION_HEIGHT; scanline++) {
- scale = 2.0f - (float)scanline / ((float)REFLECTION_HEIGHT - 1);
- scrollModTable[scanline] = (int) (backgroundW / scale + 0.5f);
+ scrollModTable[scanline] = (int) (backgroundW / scrollScaleTable[scanline] + 0.5f);
for (i = 0; i < backgroundW; i++) {
- x = (int)(i * scale + 0.5f);
- *dst++ = x < backgroundW ? normalmap[x] & 0xFF : 0;
+ x = (int)(i * scrollScaleTable[scanline] + 0.5f);
+ if (x < backgroundW) {
+ *dst = (unsigned short)(normalmap[x] >> 8) & 0xFF;
+ if ((short)*dst > maxDisplacement) maxDisplacement = (short)(*dst);
+ if ((short)*dst < minDisplacement) minDisplacement = (short)(*dst);
+ } else {
+ *dst = 0;
+ }
+ dst++;
}
normalmap += backgroundW;
}
+
+ if (maxDisplacement == minDisplacement) {
+ printf("Warning: grise normalmap fucked up\n");
+ return;
+ }
+
+ /* Second pass - subtract half maximum displacement to displace in both directions */
+ for (scanline = 0; scanline < REFLECTION_HEIGHT; scanline++) {
+ for (i = 0; i < backgroundW; i++) {
+ /* Remember that MIN_SCROLL is the padding around the screen, so ti's the maximum displacement we can get (positive & negative) */
+ *dst2 = 2 * MIN_SCROLL * (*dst2 - minDisplacement) / (maxDisplacement - minDisplacement) - MIN_SCROLL;
+ *dst2 = (short)((float)*dst2 / scrollScaleTable[scanline] + 0.5f); /* Displacements must also scale with distance*/
+ dst2++;
+ }
+ }
+}
+
+static float distanceScale(int scanline) {
+ float farScale, t;
+ farScale = (float)NEAR_SCROLL_SPEED / (float)FAR_SCROLL_SPEED;
+ t = (float)scanline / ((float)REFLECTION_HEIGHT - 1);
+ return 1.0f / (1.0f / farScale + (1.0f - 1.0f / farScale) * t);
}
static void initScrollTables() {
int i = 0;
- float scrollSpeed = FAR_SCROLL_SPEED;
- float speedIncrement = (NEAR_SCROLL_SPEED - FAR_SCROLL_SPEED) / ((float) (REFLECTION_HEIGHT - 1));
for (i = 0; i < REFLECTION_HEIGHT; i++) {
- scrollSpeedTable[i] = scrollSpeed;
- scrollSpeed += speedIncrement;
+ scrollScaleTable[i] = distanceScale(i);
scrollTable[i] = 0.0f;
scrollTableRounded[i] = 0;
}
static void updateScrollTables(float dt) {
int i = 0;
+
+ nearScrollAmount += dt * NEAR_SCROLL_SPEED;
+ nearScrollAmount = (float) fmod(nearScrollAmount, 512.0f);
+
for (i = 0; i < REFLECTION_HEIGHT; i++) {
- scrollTable[i] += scrollSpeedTable[i] * dt;
+ scrollTable[i] = nearScrollAmount / scrollScaleTable[i];
scrollTableRounded[i] = (int)(scrollTable[i] + 0.5f) % scrollModTable[i];
}
-}
\ No newline at end of file
+}