Diff: main.cpp

Revision:

3:0e14def93d4e

Parent:

1:47394b602697

Child:

4:fb7d49e660f2

diff -r 5645cb2d9316 -r 0e14def93d4e main.cpp
--- a/main.cpp	Wed Mar 13 09:48:27 2019 -0400
+++ b/main.cpp	Fri Mar 15 20:46:37 2019 -0400
@@ -1,48 +1,48 @@
 #include "mbed.h"
 #include "uLCD_4DGL.h"
-#include "main_character.h"
-#include "./hash_table/hash_table.h"
+#include "Sprites/main_character/main_character.h"
+#include "hash_table/hash_table.h"
+#include "worlds/worlds.h"
 
 uLCD_4DGL uLCD(p9, p10, p11); //  serial tx, serial rx, reset pin;
 Serial pc(USBTX, USBRX);
 
 
-extern void main_character_constructor(void);
-//extern void* insertItem(HashTable* myHashTable, unsigned int key, void* value);
-extern sprite main_character;
-int *test_val;
-int *returned_val;
 
 //key function
 unsigned int genKey(unsigned int key){
 	return key%97;
 }
 
-DigitalOut myled(LED1);
+DigitalOut myled(LED2);
+
+void initWorlds(void){
+	initialize_sprites();
+	allocate_worlds();
+	populate_worlds();
+}
 
 int main() {
-	*test_val = 22;
     //increase BAUD rate
     uLCD.baudrate(3000000);
     uLCD.background_color(WHITE);
+	initWorlds();
+	sprite* ret_sprite;
 
-	//hash table
-	//create hash table structs
-	HashTable* map[1];
-	//populate create hash table
-	map[0] = createHashTable(genKey,(unsigned int)97);
-	//create and retrieve test key
-	void* val = insertItem(map[0], 33, test_val);
-	returned_val = (int*)getItem(map[0], 33);
+	
+	for(int y = 0; y < 8; y+=1){
+		for(int x = 0; x < 8; x+=1){
+			//uLCD.BLIT(j,i,16,16,main_character.render.activeSkin);
+			ret_sprite = (sprite*)fetchSprite(x,y);
+			if(ret_sprite == NULL)
+			continue;
+			uLCD.BLIT(x*16,y*16,16,16,(*ret_sprite).render.activeSkin);
 
-	//print returned value
-	pc.printf("The reuturned value is %d\n",*returned_val);
+		}
+	}
 
     main_character_constructor();
     //main_character_i();
-    uLCD.BLIT(0,0,16,16,main_character.skins);
-    uLCD.BLIT(15,15,16,16,main_character.skins);
-    uLCD.BLIT(31,31,16,16,main_character.skins);
     while(1) {
         myled = 1;
         wait(0.2);