projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build mikmod and the music code on windows
[dosdemo]
/
src
/
demo.c
diff --git
a/src/demo.c
b/src/demo.c
index
7d22dc4
..
3a99314
100644
(file)
--- a/
src/demo.c
+++ b/
src/demo.c
@@
-6,11
+6,13
@@
#include <limits.h>
#include "demo.h"
#include "screen.h"
#include <limits.h>
#include "demo.h"
#include "screen.h"
+#include "3dgfx.h"
+#include "music.h"
int fb_width = 320;
int fb_height = 240;
int fb_bpp = 16;
int fb_width = 320;
int fb_height = 240;
int fb_bpp = 16;
-void *fb_pixels;
+uint16_t *fb_pixels, *vmem_back, *vmem_front;
unsigned long time_msec;
int mouse_x, mouse_y;
unsigned int mouse_bmask;
unsigned long time_msec;
int mouse_x, mouse_y;
unsigned int mouse_bmask;
@@
-22,10
+24,20
@@
int demo_init(int argc, char **argv)
{
struct screen *scr;
{
struct screen *scr;
+ start_scr_name = getenv("START_SCR");
if(argv[1]) {
start_scr_name = argv[1];
}
if(argv[1]) {
start_scr_name = argv[1];
}
+ if(g3d_init() == -1) {
+ return -1;
+ }
+ g3d_framebuffer(fb_width, fb_height, fb_pixels);
+
+ if(music_open("data/test.mod") == -1) {
+ return -1;
+ }
+
if(scr_init() == -1) {
return -1;
}
if(scr_init() == -1) {
return -1;
}
@@
-42,12
+54,16
@@
int demo_init(int argc, char **argv)
/* clear the framebuffer at least once */
memset(fb_pixels, 0, fb_width * fb_height * fb_bpp / CHAR_BIT);
/* clear the framebuffer at least once */
memset(fb_pixels, 0, fb_width * fb_height * fb_bpp / CHAR_BIT);
+
+ music_play();
return 0;
}
void demo_cleanup(void)
{
return 0;
}
void demo_cleanup(void)
{
+ music_close();
scr_shutdown();
scr_shutdown();
+ g3d_destroy();
if(time_msec) {
float fps = (float)nframes / ((float)time_msec / 1000.0f);
if(time_msec) {
float fps = (float)nframes / ((float)time_msec / 1000.0f);
@@
-57,6
+73,7
@@
void demo_cleanup(void)
void demo_draw(void)
{
void demo_draw(void)
{
+ music_update();
scr_update();
scr_draw();
scr_update();
scr_draw();