Fix various bugs

Author: bitbrain

Diff for: CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.6.35
+
+* fix various bugs
+
 # Version 0.6.34
 
 * rename `SharedAssetManager` into `Asset`

Diff for: core/src/main/java/de/bitbrain/braingdx/assets/Asset.java

@@ -46,7 +46,9 @@ private Asset() {
 
    public static <T> T get(String relativePath, Class<T> assetClass) {
       AssetManager assetManager = getAssetManager();
-      String path = assetFolders.containsKey(assetClass)
+      String path = assetFolders.containsKey(assetClass) && !assetFolders.get(assetClass).trim().isEmpty()
+                  && !assetFolders.get(assetClass).equals(".")
+                  && !assetFolders.get(assetClass).equals("/")
             ? assetFolders.get(assetClass) + "/" + relativePath
             : relativePath;
       return assetManager.get(path, assetClass);

Diff for: core/src/main/java/de/bitbrain/braingdx/assets/SmartAssetLoader.java

@@ -64,8 +64,13 @@ private void putMembers(Class<?> subclass, Map<String, Class<?>> assets, AssetSo
          try {
             Object path = field.get(null);
             if (path instanceof String) {
-               assets.put(source.directory() + "/" + path, source.assetClass());
-               Gdx.app.log("INFO", "Registering asset: path=" + source.directory() + "/" + path + ", class=" + source.assetClass().getName());
+               String relativePath = !source.directory().trim().isEmpty()
+                     && !source.directory().equals(".")
+                     && !source.directory().equals("/")
+                     ? source.directory() + "/" + path
+                     : "" + path;
+               assets.put(relativePath, source.assetClass());
+               Gdx.app.log("INFO", "Registering asset: path=" + relativePath + ", class=" + source.assetClass().getName());
             } else {
                Gdx.app.log("WARN", "Invalid property type in '" + subclass.getName() + "::" + field.getName() + "! Only java.lang.String is allowed.");
             }