Merge pull request #1 from Ksantos141/changes_from_atp318_fork

Changes from atp318 fork
BRL-CAD · May 3, 2022 · 77d58c1 · 77d58c1
2 parents 288e893 + 09c7f7c
commit 77d58c1
Show file tree

Hide file tree

Showing 8 changed files with 43,966 additions and 75 deletions.
diff --git a/misc/mime_cad.types b/misc/mime_cad.types
@@ -30,7 +30,7 @@ image/spm					spm
 image/sun					sun
 image/yuv					yuv
 model/dxf					dxf
-model/gltf        gltf
+model/gltf                  gltf glb
 model/obj					obj
 model/ply					ply
 model/shp					shp

diff --git a/src/libgcv/plugins/gltf/CMakeLists.txt b/src/libgcv/plugins/gltf/CMakeLists.txt
@@ -1,5 +1,9 @@
 set(GLTF_SRCS
-  gltf_read.c
+  gltf_read.cpp
+  tinygltf_headers/json.hpp
+  tinygltf_headers/stb_image.h
+  tinygltf_headers/stb_image_write.h
+  tinygltf_headers/tiny_gltf.h
   )
 
 gcv_plugin_library(gcv-gltf SHARED ${GLTF_SRCS})

diff --git a/src/libgcv/plugins/gltf/gltf_read.c b/src/libgcv/plugins/gltf/gltf_read.c