Changeset 33

Timestamp:

08/09/07 23:56:10 (5 years ago)

Author:

mike

Message:

Fixed brokeness. Now the world is dynamically sized

Location:

trunk

Files:

• block.c (modified) (1 diff)
• fakesse.h (modified) (2 diffs)
• glutmain.c (modified) (2 diffs)

trunk/block.c

@@ -183 +183 @@
     //Allocate both of the buffers in 1 chunk.  It will make life easier
     
-    lb->allocated = (data_block*)calloc( 1, sizeof( life_block ) * 2 + 0x7F );// calloc( 2, sizeof( __m128i ) * 128 );
+    lb->allocated = (data_block*)calloc( 1, sizeof( data_block ) * 2 + 0x7F );// calloc( 2, sizeof( __m128i ) * 128 );
     if( !lb->allocated ) {
         free( lb );

trunk/fakesse.h

@@ -17 +17 @@
 #include <inttypes.h>
 #endif
-
+/*
 typedef struct {
     union {
@@ -24 +24 @@
     } u;
 } __m128i;
-
+*/
 //Shifts this to the left all the way
 static inline __m128i _mm_srli_epi32( __m128i A, int count ) {

trunk/glutmain.c

@@ -94 +94 @@
     for( i = 0; i < my_world->width; i++ ) {
         for( j = 0; j < my_world->height; j++ ) {
-    printf( "%x\n", *my_world->blocks );
+    //printf( "%x\n", *my_world->blocks );
             renderBlock( get_life_block( my_world, j, i ) , i*128, j*BLOCK_HEIGHT );
         }
@@ -115 +115 @@
 
 
-    my_world = allocate_world( 1, 1 );
+    my_world = allocate_world( 10, 10 );
     *(my_world->blocks) = allocate_block();
     printf( "%x\n", *my_world->blocks );
 
-//  set_bit_in_world( my_world, 50, 50 );
-//  set_bit_in_world( my_world, 51, 50 );
-//  set_bit_in_world( my_world, 52, 50 );
-//  set_bit_in_world( my_world, 54, 50 );
-//
-//  set_bit_in_world( my_world, 50, 51 );
-//
-//  set_bit_in_world( my_world, 53, 52 );
-//  set_bit_in_world( my_world, 54, 52 );
-//
-//  set_bit_in_world( my_world, 51, 53 );
-//  set_bit_in_world( my_world, 52, 53 );
-//  set_bit_in_world( my_world, 54, 53 );
-//
-//  set_bit_in_world( my_world, 50, 54 );
-//  set_bit_in_world( my_world, 52, 54 );
-//  set_bit_in_world( my_world, 54, 54 );
+    set_bit_in_world( my_world, 50, 50 );
+    set_bit_in_world( my_world, 51, 50 );
+    set_bit_in_world( my_world, 52, 50 );
+    set_bit_in_world( my_world, 54, 50 );
+
+    set_bit_in_world( my_world, 50, 51 );
+
+    set_bit_in_world( my_world, 53, 52 );
+    set_bit_in_world( my_world, 54, 52 );
+
+    set_bit_in_world( my_world, 51, 53 );
+    set_bit_in_world( my_world, 52, 53 );
+    set_bit_in_world( my_world, 54, 53 );
+
+    set_bit_in_world( my_world, 50, 54 );
+    set_bit_in_world( my_world, 52, 54 );
+    set_bit_in_world( my_world, 54, 54 );
 
     glutInit( &argc, argv );