projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved the drawFps call to the backends so it works automatically for
[dosdemo]
/
src
/
bump.c
diff --git
a/src/bump.c
b/src/bump.c
index
dc53337
..
a6f7aad
100644
(file)
--- a/
src/bump.c
+++ b/
src/bump.c
@@
-7,12
+7,10
@@
#include "demo.h"
#include "screen.h"
#include "demo.h"
#include "screen.h"
-#include "tinyfps.h"
static int init(void);
static void destroy(void);
static void start(long trans_time);
static int init(void);
static void destroy(void);
static void start(long trans_time);
-static void stop(long trans_time);
static void draw(void);
static struct screen scr = {
static void draw(void);
static struct screen scr = {
@@
-20,11
+18,11
@@
static struct screen scr = {
init,
destroy,
start,
init,
destroy,
start,
- stop,
+ 0,
draw
};
draw
};
-static struct point {
+struct point {
int x, y;
};
int x, y;
};
@@
-61,7
+59,6
@@
static int init(void)
const float rgbMul[9] = { 1.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 1.0f};
const float rgbMul[9] = { 1.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 1.0f};
- initFpsFonts();
heightmap = malloc(sizeof(*heightmap) * fb_size);
lightmap = malloc(sizeof(*lightmap) * fb_size);
heightmap = malloc(sizeof(*heightmap) * fb_size);
lightmap = malloc(sizeof(*lightmap) * fb_size);
@@
-143,10
+140,6
@@
static void start(long trans_time)
startingTime = time_msec;
}
startingTime = time_msec;
}
-static void stop(long trans_time)
-{
-}
-
static void eraseArea(struct point *p, int width, int height)
{
int x, y, dx;
static void eraseArea(struct point *p, int width, int height)
{
int x, y, dx;
@@
-270,7
+263,5
@@
static void draw(void)
renderLights();
renderBump((unsigned short*)vmem_back);
renderLights();
renderBump((unsigned short*)vmem_back);
- drawFps((unsigned short*)vmem_back);
-
swap_buffers(0);
}
swap_buffers(0);
}