yes

Author: knot126

assets/main.script

@@ -0,0 +1 @@
+test script

source/assets.c

@@ -28,6 +28,28 @@ void AssetManagerFree(AssetManager *this) {
 	DgTableFree(&this->types, true);
 	DgTableFree(&this->loaders, true);
 	DgTableFree(&this->assets, true);
+	DgMemoryFree(this->dir);
+}
+
+DgError AssetManagerSetSource(AssetManager *this, int source_type, const char *path) {
+	/**
+	 * Set where to load assets from
+	 */
+	
+	if (source_type == ASSET_SOURCE_FOLDER) {
+		this->dir = DgStringDuplicate(path);
+		
+		if (!this->dir) {
+			return DG_ERROR_FAILED;
+		}
+		else {
+			DgLog(DG_LOG_INFO, "Asset directory is now: %s", this->dir);
+		}
+		
+		return DG_ERROR_SUCCESS;
+	}
+	
+	return DG_ERROR_FAILED;
 }
 
 DgError AssetManagerAddType(AssetManager *this, AssetType *type) {
@@ -83,14 +105,19 @@ static Asset AssetManager_LoadNewAsset(AssetManager *this, AssetTypeName type, c
 	size_t size;
 	void *data;
 
+	char *path = DgStringConcatinateL(DgStringConcatinate(this->dir, "/"), name);
+	
 	// Load data
-	DgError status = DgStorageLoad(NULL, name, &size, &data);
+	DgError status = DgStorageLoad(NULL, path, &size, &data);
 
 	if (status) {
-		DgLog(DG_LOG_ERROR, "Failed to load asset: %s", name);
+		DgLog(DG_LOG_ERROR, "Failed to load asset: %s [%s]", path, DgErrorString(status));
+		DgMemoryFree(path);
 		return NULL;
 	}
 
+	DgMemoryFree(path);
+	
 	// Determine best loader
 	AssetLoader *loader = NULL;
 	DgValue *key, *value;

source/assets.h

@@ -71,10 +71,16 @@ typedef struct AssetManager {
 	DgTable types;
 	DgTable loaders;
 	DgTable assets;
+	const char *dir;
 } AssetManager;
 
+enum {
+	ASSET_SOURCE_FOLDER = 1,
+};
+
 DgError AssetManagerInit(AssetManager *this);
 void AssetManagerFree(AssetManager *this);
+DgError AssetManagerSetSource(AssetManager *this, int source_type, const char *path);
 DgError AssetManagerAddType(AssetManager *this, AssetType *type);
 DgError AssetManagerAddLoader(AssetManager *this, const char *ext, AssetLoader *loader);
 Asset AssetManagerLoad(AssetManager *this, AssetTypeName type, const char *name);

source/engine.c

@@ -9,18 +9,25 @@
 Engine *gEngine;
 
 DgError EngineInit(Engine *this, DgArgs *args) {
-	DgInitTime();
+	DgError err;
 
-	DgStorageAddPool(NULL, DgFilesystemCreatePool(NULL, ""));
-	DgStorageAddPool(NULL, DgFilesystemCreatePool("assets", DgArgGetValue(args, "assets")));
+	DgInitTime();
 
-	DgError err;
+	if (( err = DgStorageAddPool(NULL, DgFilesystemCreatePool(NULL, "")) )) {
+		DgLog(DG_LOG_ERROR, "Failed to setup fs pool.");
+		return err;
+	}
 
 	if ((err = AssetManagerInit(&this->assman))) {
 		DgLog(DG_LOG_ERROR, "Failed to init asset manager!");
 		return err;
 	}
 
+	if ((err = AssetManagerSetSource(&this->assman, ASSET_SOURCE_FOLDER, "assets"))) {
+		DgLog(DG_LOG_ERROR, "Failed to set assets source!");
+		return err;
+	}
+	
 	RegisterTextAssetTypeAndLoader(&this->assman);
 
 	if ((err = DgTableInit(&this->properties))) {
@@ -43,17 +50,17 @@ DgError EngineInit(Engine *this, DgArgs *args) {
 	return DG_ERROR_SUCCESS;
 }
 
-const char *gMainScript = "main.script";
+const char *gMainScriptPath = "main.script";
 
 DgError EngineLoadMainScene(Engine *this) {
-	Text mainScriptText = LoadText(&this->assman, gMainScript);
+	Text mainScriptText = LoadText(&this->assman, gMainScriptPath);
 
 	if (!mainScriptText) {
 		DgLog(DG_LOG_ERROR, "Could not load main script");
 		return DG_ERROR_FAILED;
 	}
 
-	DgLog(DG_LOG_INFO, "Loaded main text asset: %s (size = %d)", gMainScript, mainScriptText->size);
+	DgLog(DG_LOG_INFO, "Loaded main text asset: %s (size = %d)", gMainScriptPath, mainScriptText->size);
 }
 
 DgError EngineRun(Engine *this) {