modify FileBundle for android test

engine/Device.cpp

@@ -118,19 +118,19 @@ bool Device::init(int argc, char** argv)
 
 	create_resource_manager();
 
-	// create_input_manager();
+	create_input_manager();
 
-	// create_window();
+	create_window();
 
-	// create_renderer();
+	create_renderer();
 
-	// create_debug_renderer();
+	create_debug_renderer();
 
-	// create_lua_environment();
+	create_lua_environment();
 
 	// create_console_server();
 
-	// read_engine_settings();
+	read_engine_settings();
 
 	Log::i("Crown Engine initialized.");
 
@@ -356,15 +356,15 @@ void Device::frame()
 
 	m_resource_manager->poll_resource_loader();
 
-	// m_window->frame();
-	// m_input_manager->frame(frame_count());
+	m_window->frame();
+	m_input_manager->frame(frame_count());
 
-	// m_lua_environment->game_frame(last_delta_time());
+	m_lua_environment->game_frame(last_delta_time());
 
 	// m_console_server->execute();
 
-	// m_debug_renderer->draw_all();
-	// m_renderer->frame();
+	m_debug_renderer->draw_all();
+	m_renderer->frame();
 
 	m_frame_count++;
 }
@@ -416,21 +416,17 @@ void Device::create_resource_manager()
 	// Create resource manager
 	m_resource_manager = CE_NEW(m_allocator, ResourceManager)(*m_resource_bundle, seed);
 
-	// ResourceId rid = m_resource_manager->load("wav", "beep");
+	ResourceId rid = m_resource_manager->load("wav", "beep");
 
-	// m_resource_manager->flush();
+	m_resource_manager->flush();
 
-	// SoundResource* res = (SoundResource*)m_resource_manager->data(rid);
+	SoundResource* res = (SoundResource*)m_resource_manager->data(rid);
+
+	if (res)
+	{
+		Log::d("Size: %d", res->size());
+	}
 
-	// if (res)
-	// {
-	// 	Log::d("Size: %d", res->size());
-	// }
-	// else
-	// {
-	// 	Log::d("dio maiale");
-	// }
-	
 	Log::d("Resource manager created.");
 	Log::d("Resource seed: %d", m_resource_manager->seed());
 }

engine/resource/FileBundle.cpp

@@ -57,11 +57,11 @@ DiskFile* FileBundle::open(ResourceId name)
 	Log::i("name: %s", resource_name);
 	
 	// Search the resource in the filesystem
-	bool exists = m_filesystem.exists("disk", resource_name);
+	bool exists = m_filesystem.exists("android", resource_name);
 	CE_ASSERT(exists == true, "Resource does not exist: %s", resource_name);
 
 	// Open the resource and check magic number/version
-	DiskFile* file = (DiskFile*)m_filesystem.open("disk", resource_name, FOM_READ);
+	DiskFile* file = (DiskFile*)m_filesystem.open("android", resource_name, FOM_READ);
 
 	ResourceHeader header;
 	file->read(&header, sizeof(ResourceHeader));