polyadvent

commit 5a1933690d2751e653fdc71cb9fe4c09be2c116f
parent 2522f790272739f4933294c7c357db25e5e993f1
Author: William Casarin <jb55@jb55.com>
Date:   Sun,  7 Jul 2019 00:22:35 -0700

cleanups

Diffstat:
M
Makefile
 | 
2
+-
M
src/dae.c
 | 
1
-
M
src/game.c
 | 
1
-
M
src/model.c
 | 
3
---
M
src/poisson.c
 | 
2
--
M
test/test_resource.c
 | 
8
--------
M
tools/compile-model.c
 | 
2
+-

7 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 NAME ?= polyadvent
 BIN ?= $(NAME)
 PREFIX ?= /usr/local
-DEFS= -DGLFW_INCLUDE_NONE -DDEBUG
+DEFS= -DGLFW_INCLUDE_NONE # -DDEBUG
 CFLAGS = $(DEFS) -ggdb -O2 -I src -Wall -Werror -Wextra -std=c99 \
 						-Wno-unused-function \
 						-Wno-unused-parameter \
diff --git a/src/dae.c b/src/dae.c
@@ -138,7 +138,6 @@ static void parse_joint_matrix(struct dae_data *data, const char *d,
     assert(&joint->node_id == &pose->joints[pose->njoints].node_id);
 
     parse_joint(d, pose->njoints, joint);
-    print_id(&joint->node_id, 1);
     node_set_label(node, data->current_name);
     joint->children_ids[0] = data->node_level;
     pose->njoints++;
diff --git a/src/game.c b/src/game.c
@@ -184,7 +184,6 @@ void game_init(struct game *game, int width, int height) {
 
     struct model *pmodel;
     player->model_id = get_static_model(model_pirate_officer, &pmodel);
-    print_id(&player->model_id, true);
 
     pmodel->shading = SHADING_VERT_COLOR;
 
diff --git a/src/model.c b/src/model.c
@@ -94,12 +94,9 @@ static struct model *load_static_model(enum static_model m)
     // Load mesh
     debug("loading %s model with geom_id ", static_model_defs[m].file);
 
-    print_id(&model->geom_id, true);
     assert(m < NUM_STATIC_MODELS);
     snprintf(path, 128, "data/models/%s.ply", static_model_defs[m].file);
     ok = parse_ply(path, geom);
-    if (m == model_pirate_officer)
-        printf("num_verts: %d\n", geom->num_verts);
     if (!ok)
         return 0;
 
diff --git a/src/poisson.c b/src/poisson.c
@@ -89,10 +89,8 @@ load_samples(int *seed, int *n_samples) {
   int localseed;
   seed = seed ? seed : &localseed;
   res = fread(seed, sizeof(*seed), 1, fp);
-  printf("loaded seed %d\n", *seed);
   assert(res);
   res = fread(n_samples, sizeof(*n_samples), 1, fp);
-  printf ("loaded n_samples %d\n", *n_samples);
   assert(res);
   struct point *samples = malloc(*n_samples * sizeof(*samples));
   res = fread(samples, sizeof(*samples), *n_samples, fp);
diff --git a/test/test_resource.c b/test/test_resource.c
@@ -54,20 +54,12 @@ static void test_compact()
     p = new_resource(&r, &ids[i++]);
     *p = 3;
 
-
-    print_int_resources(&r);
-    print_ids(&r);
-
     assert(r.resource_count == 4);
     destroy_resource(&r, &ids[1]);
     assert(r.resource_count == 3);
-    print_int_resources(&r);
-    print_ids(&r);
 
     assert(*(int*)get_resource(&r, &ids[0]) == 0);
     assert(       get_resource(&r, &ids[1]) == NULL);
-    print_id(&ids[1], 1);
-    debug("%d\n",*(int*)get_resource(&r, &ids[2]) );
     assert(*(int*)get_resource(&r, &ids[2]) == 2);
 
     new_resource(&r, &ids[i++]);
diff --git a/tools/compile-model.c b/tools/compile-model.c
@@ -5,9 +5,9 @@
 
 #include "dae.h"
 
+
 static void save_mdl(struct model *model, struct make_geometry *geom)
 {
-
 }