Compare commits

..

No commits in common. "081063647d2e1902bc063c8afe2e4b0775954630" and "7f4460b88a119f8306dad6edda888c9b158890ef" have entirely different histories.

10 changed files with 2 additions and 5034 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 119 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -26,7 +26,7 @@ BASE_DIR = os.path.abspath(
'../') '../')
) )
OBJECT_DIR = os.path.join(BASE_DIR, 'objects') OBJECT_DIR = os.path.join(BASE_DIR, 'objects')
OBJECT_TYPES = ['gltf', 'glb', 'obj', 'fbx', 'stl', 'dae', 'json', 'ply'] OBJECT_TYPES = ['gltf', 'glb', 'obj', 'fbx', 'stl', 'dae']
def get_directory_content(dir_path): def get_directory_content(dir_path):
content = [] content = []
@ -107,16 +107,6 @@ def get_object(file_path, result={}):
object_path = str(file_path).replace(OBJECT_DIR, "") object_path = str(file_path).replace(OBJECT_DIR, "")
result['urls'].append(f"/objects{object_path}") result['urls'].append(f"/objects{object_path}")
return result return result
if extension == 'json':
result['type'] = "json"
object_path = str(file_path).replace(OBJECT_DIR, "")
result['urls'].append(f"/objects{object_path}")
return result
if extension == 'ply':
result['type'] = "ply"
object_path = str(file_path).replace(OBJECT_DIR, "")
result['urls'].append(f"/objects{object_path}")
return result
return None return None

View File

@ -57,24 +57,7 @@
> >
</model-collada> </model-collada>
%end %end
%if object['type'] == "json":
<model-three
:backgroundAlpha="0"
@on-load="onLoad"
:rotation="rotation"
src="{{ object['urls'][0] }}"
>
</model-three>
%end
%if object['type'] == "ply":
<model-ply
:backgroundAlpha="0"
@on-load="onLoad"
:rotation="rotation"
src="{{ object['urls'][0] }}"
>
</model-ply>
%end
</div> </div>
</div> </div>