diff --git a/objects/examples/GLTF/pre-load-image.jpg b/objects/examples/GLTF/pre-load-image.jpg new file mode 100644 index 0000000..f36ee6e Binary files /dev/null and b/objects/examples/GLTF/pre-load-image.jpg differ diff --git a/objects/examples/GLTF/sky-box.png b/objects/examples/GLTF/sky-box-image.png similarity index 100% rename from objects/examples/GLTF/sky-box.png rename to objects/examples/GLTF/sky-box-image.png diff --git a/static/assets/ic_get_app_white_24dp.svg b/static/assets/ic_get_app_white_24dp.svg new file mode 100644 index 0000000..defd2e1 --- /dev/null +++ b/static/assets/ic_get_app_white_24dp.svg @@ -0,0 +1,4 @@ + + + + diff --git a/utils/utils.py b/utils/utils.py index e4738f5..aec9d84 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -47,12 +47,16 @@ def get_directory_content(dir_path): def find_skybox_image(dir): - print("find_skybox_image(dir): ", dir) for p in Path(dir).iterdir(): extension = Path(p).suffix - print(f"sky-box{extension}") - if str(Path(p)).endswith(f"sky-box{extension}"): - print("return str(p): ", str(p)) + if str(Path(p)).endswith(f"sky-box-image{extension}"): + return str(p) + return None + +def find_pre_loader_image(dir): + for p in Path(dir).iterdir(): + extension = Path(p).suffix + if str(Path(p)).endswith(f"pre-load-image{extension}"): return str(p) return None @@ -92,6 +96,10 @@ def get_object(file_path, result={}): if skybox_path: skybox_path = str(skybox_path).replace(OBJECT_DIR, '') result['skybox'] = f"/objects{skybox_path}" + preloader_path = find_pre_loader_image(file_dir) + if preloader_path: + preloader_path = str(preloader_path).replace(OBJECT_DIR, '') + result['preloader'] = f"/objects{preloader_path}" return result if extension == "obj": result['type']="obj" diff --git a/views/google.tpl b/views/google.tpl index e8ff1a9..6cb5110 100644 --- a/views/google.tpl +++ b/views/google.tpl @@ -9,6 +9,44 @@ model-viewer { } +%if 'preloader' in object: + +%end + + + +

objects/{{current_dir}} @@ -21,16 +59,22 @@ model-viewer {

-
- + + %if 'preloader' in object: +
+
Load 3D Model
+ %end