needs a lot of cleaning but lights are OK

[carveJwlIkooP6JGAAIwe30JlM.git] / world.h

diff --git a/world.h b/world.h
index 1b540d0d9d17176197003f04729b4f5ed4595803..3f806cb8714e00dbabf0d8564dede4a7b9acd43b 100644 (file)
--- a/world.h
+++ b/world.h
@@ -88,6 +88,7 @@ struct world_instance
           g_depth_bounds;
 
       float g_water_fog;
+      float g_time;
       int g_light_count;
       int g_light_preview;
       int g_shadow_samples;
@@ -210,8 +211,11 @@ struct world_instance
     */
    struct world_light
    {
-      v3f co;
-      v4f colour;
+      mdl_node *node;
+      struct classtype_world_light *inf;
+
+      /* enabled.. etc? 
+       * TODO: we should order entities in the binary by their type */
    }
    * lights;
    u32 light_count;
@@ -616,6 +620,18 @@ VG_STATIC void world_run_relay( world_instance *world,
 
 VG_STATIC void world_update( world_instance *world, v3f pos )
 {
+   /* TEMP!!!!!! */
+   static double g_time = 0.0;
+   g_time += vg.time_delta * (1.0/(k_day_length*60.0));
+
+   world->ub_lighting.g_time = g_time;
+
+   glBindBuffer( GL_UNIFORM_BUFFER, world->ubo_lighting );
+   glBufferSubData( GL_UNIFORM_BUFFER, 0, 
+                    sizeof(struct ub_world_lighting), &world->ub_lighting );
+   /* TEMP!!!!!! */
+
+
 #if 0
    if( world.switching_to_new_world )
    {
@@ -718,22 +734,23 @@ VG_STATIC void world_update( world_instance *world, v3f pos )
                                                         0xff00ff00 );
    }
 
-   if( 0 )
+   if( k_debug_light_index )
    {
       for( int i=0; i<world->light_count; i++ )
       {
          struct world_light *light = &world->lights[i];
+         struct classtype_world_light *inf = light->inf;
 
          u32 colour = 0xff000000;
-         u8 r = light->colour[0] * 255.0f,
-            g = light->colour[1] * 255.0f,
-            b = light->colour[2] * 255.0f;
+         u8 r = inf->colour[0] * 255.0f,
+            g = inf->colour[1] * 255.0f,
+            b = inf->colour[2] * 255.0f;
 
          colour |= r;
          colour |= g << 8;
          colour |= b << 16;
 
-         vg_line_pt3( light->co, 0.25f, colour );
+         vg_line_pt3( light->node->co, 0.25f, colour );
       }
    }