Dummy Xbox port

.gitignore

@@ -18,3 +18,10 @@
 /mapc.exe
 /contrib/curve.exe
 /*.dll
+
+*.obj
+/bin
+/main.exe
+/main.lib
+/*.iso
+/default.xbe

Makefile.nxdk

@@ -0,0 +1,118 @@
+XBE_TITLE = Neverball
+OUTPUT_DIR = bin
+GEN_XISO = $(XBE_TITLE).iso
+
+CFLAGS =
+
+CFLAGS += -ferror-limit=0
+
+CFLAGS += -DENABLE_OPENGLES=1
+#CFLAGS += -DCONFIG_USER=\"E:\\\\UDATA\\\\Neverball\"
+CFLAGS += -DCONFIG_USER=\"D:\\\\Neverball\"
+CFLAGS += -DCONFIG_DATA=\"D:\\\\Neverball\"
+CFLAGS += -DCONFIG_LOCALE=\"D:\\\\Neverball\\\\locale\"
+CFLAGS += -I$(CURDIR)/share/ -I$(CURDIR)/xbox/ -D_CRTIMP=
+
+BALL_SRCS := \
+	$(CURDIR)/share/lang.c        \
+	$(CURDIR)/share/st_common.c   \
+	$(CURDIR)/share/vec3.c        \
+	$(CURDIR)/share/base_image.c  \
+	$(CURDIR)/share/image.c       \
+	$(CURDIR)/share/solid_base.c  \
+	$(CURDIR)/share/solid_vary.c  \
+	$(CURDIR)/share/solid_draw.c  \
+	$(CURDIR)/share/solid_all.c   \
+	$(CURDIR)/share/mtrl.c        \
+	$(CURDIR)/share/part.c        \
+	$(CURDIR)/share/geom.c        \
+	$(CURDIR)/share/ball.c        \
+	$(CURDIR)/share/gui.c         \
+	$(CURDIR)/share/font.c        \
+	$(CURDIR)/share/theme.c       \
+	$(CURDIR)/share/base_config.c \
+	$(CURDIR)/share/config.c      \
+	$(CURDIR)/share/video.c       \
+	$(CURDIR)/share/glext.c       \
+	$(CURDIR)/share/binary.c      \
+	$(CURDIR)/share/state.c       \
+	$(CURDIR)/share/audio.c       \
+	$(CURDIR)/share/text.c        \
+	$(CURDIR)/share/common.c      \
+	$(CURDIR)/share/list.c        \
+	$(CURDIR)/share/queue.c       \
+	$(CURDIR)/share/cmd.c         \
+	$(CURDIR)/share/array.c       \
+	$(CURDIR)/share/dir.c         \
+	$(CURDIR)/share/fbo.c         \
+	$(CURDIR)/share/glsl.c        \
+	$(CURDIR)/share/fs_common.c   \
+	$(CURDIR)/share/fs_png.c      \
+	$(CURDIR)/share/fs_jpg.c      \
+	$(CURDIR)/share/fs_ov.c       \
+	$(CURDIR)/share/log.c         \
+	$(CURDIR)/share/joy.c         \
+	$(CURDIR)/ball/hud.c          \
+	$(CURDIR)/ball/game_common.c  \
+	$(CURDIR)/ball/game_client.c  \
+	$(CURDIR)/ball/game_server.c  \
+	$(CURDIR)/ball/game_proxy.c   \
+	$(CURDIR)/ball/game_draw.c    \
+	$(CURDIR)/ball/score.c        \
+	$(CURDIR)/ball/level.c        \
+	$(CURDIR)/ball/progress.c     \
+	$(CURDIR)/ball/set.c          \
+	$(CURDIR)/ball/demo.c         \
+	$(CURDIR)/ball/demo_dir.c     \
+	$(CURDIR)/ball/util.c         \
+	$(CURDIR)/ball/st_conf.c      \
+	$(CURDIR)/ball/st_demo.c      \
+	$(CURDIR)/ball/st_save.c      \
+	$(CURDIR)/ball/st_goal.c      \
+	$(CURDIR)/ball/st_fail.c      \
+	$(CURDIR)/ball/st_done.c      \
+	$(CURDIR)/ball/st_level.c     \
+	$(CURDIR)/ball/st_over.c      \
+	$(CURDIR)/ball/st_play.c      \
+	$(CURDIR)/ball/st_set.c       \
+	$(CURDIR)/ball/st_start.c     \
+	$(CURDIR)/ball/st_title.c     \
+	$(CURDIR)/ball/st_help.c      \
+	$(CURDIR)/ball/st_name.c      \
+	$(CURDIR)/ball/st_shared.c    \
+	$(CURDIR)/ball/st_pause.c     \
+	$(CURDIR)/ball/st_ball.c      \
+	$(CURDIR)/ball/main.c
+
+BALL_SRCS += share/solid_sim_sol.c
+BALL_SRCS += share/fs_stdio.c
+BALL_SRCS += share/tilt_null.c
+BALL_SRCS += share/hmd_null.c
+
+SRCS = $(BALL_SRCS) xbox/xbox.c xbox/swizzle.c
+#SHADER_OBJS = ps.inl vs.inl
+
+# Add SDL
+NXDK_SDL = y
+
+# Add vorbis and ogg
+include $(CURDIR)/xbox/Makefile-vorbis.xbox
+include $(CURDIR)/xbox/Makefile-ogg.xbox
+
+all: $(OUTPUT_DIR)/default.xbe data $(GEN_XISO)
+
+# Add data to XISO
+#FIXME: Copy files to $(OUTPUT_DIR)
+data: force
+	@echo "Updating data"
+	@cp -r $(CURDIR)/data/. $(OUTPUT_DIR)/Neverball
+	@echo "Updating config"
+	@cp -r $(CURDIR)/xbox/neverballrc $(OUTPUT_DIR)/Neverball #FIXME: Buggy
+
+force:
+
+include $(NXDK_DIR)/Makefile
+
+# nxdk workarounds
+NXDK_CFLAGS := $(CFLAGS) $(NXDK_CFLAGS)
+CFLAGS := -Wno-deprecated-declarations

ball/main.c

@@ -43,6 +43,12 @@
 #include "st_level.h"
 #include "st_pause.h"
 
+#ifdef NXDK
+#include <hal/debug.h>
+#else
+#define debugPrint(...)
+#endif
+
 const char TITLE[] = "Neverball " VERSION;
 const char ICON[] = "icon/neverball.png";
 
@@ -523,65 +529,70 @@ static void make_dirs_and_migrate(void)
 
     fs_mkdir("Screenshots");
 }
-
+#include <assert.h>
 /*---------------------------------------------------------------------------*/
 
 int main(int argc, char *argv[])
 {
     int t1, t0;
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     if (!fs_init(argc > 0 ? argv[0] : NULL))
     {
         fprintf(stderr, "Failure to initialize virtual file system (%s)\n",
                 fs_error());
         return 1;
     }
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     opt_parse(argc, argv);
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     config_paths(opt_data);
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     log_init("Neverball", "neverball.log");
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     make_dirs_and_migrate();
 
     /* Initialize SDL. */
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK) == -1)
     {
         log_printf("Failure to initialize SDL (%s)\n", SDL_GetError());
         return 1;
     }
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     /* Enable joystick events. */
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     joy_init();
 
     /* Intitialize configuration. */
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     config_init();
     config_load();
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     /* Initialize localization. */
 
     lang_init();
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     /* Initialize audio. */
-
+//assert(0);
     audio_init();
     tilt_init();
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     /* Initialize video. */
 
-    if (!video_init())
+    if (!video_init()) {
+assert(0);
         return 1;
+}
+debugPrint("%s:%d\n", __FILE__, __LINE__);
 
     /* Material system. */
 
     mtrl_init();
-
+debugPrint("%s:%d\n", __FILE__, __LINE__);
     /* Screen states. */
 
     init_state(&st_null);
-
+//assert(0);
     /* Initialize demo playback or load the level. */
 
     if (opt_replay &&
@@ -623,11 +634,14 @@ int main(int argc, char *argv[])
     /* Run the main game loop. */
 
     t0 = SDL_GetTicks();
-
+//assert(0);
     while (loop())
     {
+//debugPrint("%d > %d?\n", t1, t0);
+//assert(0);
         if ((t1 = SDL_GetTicks()) > t0)
         {
+//assert(0);
             /* Step the game state. */
 
             st_timer(0.001f * (t1 - t0));
@@ -637,7 +651,9 @@ int main(int argc, char *argv[])
             /* Render. */
 
             hmd_step();
+//assert(0);
             st_paint(0.001f * t0);
+//assert(0);
             video_swap();
 
             if (config_get_d(CONFIG_NICE))
@@ -653,7 +669,7 @@ int main(int argc, char *argv[])
     hmd_free();
     joy_quit();
     SDL_Quit();
-
+assert(0);
     return 0;
 }
 

ball/st_conf.c

@@ -218,7 +218,7 @@ static int null_enter(struct state *st, struct state *prev)
 
     return 0;
 }
-
+#include <assert.h>
 static void null_leave(struct state *st, struct state *next, int id)
 {
     mtrl_load_objects();
@@ -228,6 +228,7 @@ static void null_leave(struct state *st, struct state *next, int id)
     geom_init();
     gui_init();
     hud_init();
+//assert(0);
 }
 
 /*---------------------------------------------------------------------------*/

ball/st_title.c

@@ -200,9 +200,10 @@ static int filter_cmd(const union cmd *cmd)
 {
     return (cmd ? cmd->type != CMD_SOUND : 1);
 }
-
+#include <assert.h>
 static int title_enter(struct state *st, struct state *prev)
 {
+//assert(0);
     game_proxy_filter(filter_cmd);
 
     /* Start the title screen music. */