now we're doing a bunch of them

[carveJwlIkooP6JGAAIwe30JlM.git] / scene.h

diff --git a/scene.h b/scene.h
index 7a9460b4dbfe1a7f463b401f61718dc0c3eea5b0..fa1ce4dbc8bc782a23953c22889aa20d7c27d384 100644 (file)
--- a/scene.h
+++ b/scene.h
@@ -10,14 +10,14 @@ typedef struct scene_vert scene_vert;
 
 #pragma pack(push,1)
 
-/* 28 byte vertexs, we don't care about the normals too much,
+/* 32 byte vertexs, we don't care about the normals too much,
  *    maybe possible to bring down uv to i16s too */
 struct scene_vert
 {
    v3f co;        /* 3*32 */
    v2f uv;        /* 2*32 */
    i8  norm[4];   /* 4*8 */
-   u8  lights[4]; /* 4*8 */
+   u16 lights[4]; /* 4*16 */
 };
 
 #pragma pack(pop)
@@ -182,7 +182,6 @@ __attribute__((warn_unused_result))
 VG_STATIC scene *scene_fix( void *lin_alloc, scene *pscene )
 {
    /* FIXME: Why is this disabled? */
-   return pscene;
 
    u32 vertex_count  = pscene->vertex_count,
        indice_count  = pscene->indice_count,
@@ -191,7 +190,7 @@ VG_STATIC scene *scene_fix( void *lin_alloc, scene *pscene )
        tot_size      = sizeof(scene) + vertex_length + index_length;
 
    /* copy down index data */
-   void *dst_indices = pscene->arrvertices + vertex_length;
+   void *dst_indices = pscene->arrvertices + vertex_count;
    memmove( dst_indices, pscene->arrindices, index_length );
 
    /* realloc */
@@ -261,7 +260,7 @@ VG_STATIC void scene_upload( scene *pscene, glmesh *mesh )
    glEnableVertexAttribArray( 2 );
 
    /* 3: light cluster */
-   glVertexAttribIPointer( 3, 4, GL_UNSIGNED_BYTE,
+   glVertexAttribIPointer( 3, 4, GL_UNSIGNED_SHORT,
          stride, (void *)offsetof(scene_vert, lights) );
    glEnableVertexAttribArray( 3 );
 
@@ -298,7 +297,20 @@ VG_STATIC float scene_bh_centroid( void *user, u32 item_index, int axis )
               *pb = &s->arrvertices[ s->arrindices[item_index*3+1] ],
               *pc = &s->arrvertices[ s->arrindices[item_index*3+2] ];
 
+   #if 0
+
+   float min, max;
+
+   min = vg_minf( pa->co[axis], pb->co[axis] );
+   max = vg_maxf( pa->co[axis], pb->co[axis] );
+   min = vg_minf( min, pc->co[axis] );
+   max = vg_maxf( max, pc->co[axis] );
+
+   return (min+max) * 0.5f;
+
+   #else
    return (pa->co[axis] + pb->co[axis] + pc->co[axis]) * (1.0f/3.0f);
+   #endif
 }
 
 VG_STATIC void scene_bh_swap( void *user, u32 ia, u32 ib )