projects
/
dosdemo
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
67ecd56
)
Added a function named rleEncode... don't remember why though
author
Michael Georgoulopoulos
<mgeorgoulopoulos@gmail.com>
Thu, 8 Sep 2016 20:46:41 +0000
(23:46 +0300)
committer
Michael Georgoulopoulos
<mgeorgoulopoulos@gmail.com>
Thu, 8 Sep 2016 20:46:41 +0000
(23:46 +0300)
src/grise.c
patch
|
blob
|
history
diff --git
a/src/grise.c
b/src/grise.c
index
7e57508
..
210b0cf
100644
(file)
--- a/
src/grise.c
+++ b/
src/grise.c
@@
-10,6
+10,7
@@
/* APPROX. 170 FPS Minimum */
#define BG_FILENAME "data/grise.png"
/* APPROX. 170 FPS Minimum */
#define BG_FILENAME "data/grise.png"
+#define GROBJ_01_FILENAME "data/grobj_01.png"
#define BB_SIZE 512 /* Let's use a power of 2. Maybe we'll zoom/rotate the effect */
#define BB_SIZE 512 /* Let's use a power of 2. Maybe we'll zoom/rotate the effect */
@@
-38,6
+39,8
@@
static void processNormal();
static void initScrollTables();
static void updateScrollTables(float dt);
static void initScrollTables();
static void updateScrollTables(float dt);
+static void rleEncode(unsigned char *pixels, unsigned int w, unsigned int h);
+
static unsigned short *background = 0;
static unsigned int backgroundW = 0;
static unsigned int backgroundH = 0;
static unsigned short *background = 0;
static unsigned int backgroundW = 0;
static unsigned int backgroundH = 0;
@@
-72,9
+75,13
@@
struct screen *grise_screen(void)
static int init(void)
{
static int init(void)
{
+ unsigned char *reflectedObject;
+ int reflectedObjectW, reflectedObjectH;
+
/* Allocate back buffer */
backBuffer = (unsigned short*) malloc(BB_SIZE * BB_SIZE * sizeof(unsigned short));
/* Allocate back buffer */
backBuffer = (unsigned short*) malloc(BB_SIZE * BB_SIZE * sizeof(unsigned short));
+ /* grise.png contains the background (horizon), baked reflection and normalmap for displacement */
if (!(background = img_load_pixels(BG_FILENAME, &backgroundW, &backgroundH, IMG_FMT_RGBA32))) {
fprintf(stderr, "failed to load image " BG_FILENAME "\n");
return -1;
if (!(background = img_load_pixels(BG_FILENAME, &backgroundW, &backgroundH, IMG_FMT_RGBA32))) {
fprintf(stderr, "failed to load image " BG_FILENAME "\n");
return -1;
@@
-83,6
+90,16
@@
static int init(void)
/* Convert to 16bpp */
convert32To16((unsigned int*)background, background, backgroundW * NORMALMAP_SCANLINE); /* Normalmap will keep its 32 bit color */
/* Convert to 16bpp */
convert32To16((unsigned int*)background, background, backgroundW * NORMALMAP_SCANLINE); /* Normalmap will keep its 32 bit color */
+ /* Load reflected objects */
+ if (!(reflectedObject = img_load_pixels(GROBJ_01_FILENAME, &reflectedObjectW, &reflectedObjectH, IMG_FMT_GREY8))) {
+ fprintf(stderr, "failed to load image " GROBJ_01_FILENAME "\n");
+ return -1;
+ }
+
+ rleEncode(reflectedObject, reflectedObjectW, reflectedObjectH);
+
+ img_free_pixels(reflectedObject);
+
initScrollTables();
processNormal();
initScrollTables();
processNormal();
@@
-246,3
+263,17
@@
static void updateScrollTables(float dt) {
scrollTableRounded[i] = (int)(scrollTable[i] + 0.5f) % scrollModTable[i];
}
}
scrollTableRounded[i] = (int)(scrollTable[i] + 0.5f) % scrollModTable[i];
}
}
+
+static void rleEncode(unsigned char *pixels, unsigned int w, unsigned int h) {
+ int scanline;
+ int i;
+ int skipping = 1;
+
+ for (scanline = 0; scanline < h; scanline++) {
+ for (i = 0; i < w; i++) {
+ if (*pixels++) {
+
+ }
+ }
+ }
+}
\ No newline at end of file