Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-07-25 23:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
282 Commits 65 Branches 39 Tags
0da2b350851c1cdc2139d9fca625751feff060fa
Commit Graph

114 Commits

Author SHA1 Message Date
Arthur Brainville (Ybalrid)
0da2b35085 Fixes problem when mesh in glTF file doesn't have a name 
a "unnamed_X" name will be genrated.

This fixes the loading of Trinagle.gltf from khronos

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-23 15:15:33 +01:00
Arthur Brainville (Ybalrid)
55bff342c2 Merge branch 'pr_raytrace_example' of github.com:Ybalrid/tinygltf into pr_raytrace_example 2018-02-23 14:26:55 +01:00
Arthur Brainville (Ybalrid)
37ba0ae481 Log the types of data used by the currently loaded GLTF file 
This will help test and improve compatibilitiy.

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-23 14:23:30 +01:00
Arthur Brainville (Ybalrid)
27ae4ba9c1 load texture coordinates 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:24 +01:00
Arthur Brainville
07e6c5c109 Small code cleanup 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:23 +01:00
Arthur Brainville
0b4f54162b Switch to unsigned int for the int arrays. Fix compatibility issue 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:23 +01:00
Arthur Brainville
db1e8b3e8b added loading of doubles for position 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:23 +01:00
Arthur Brainville
2b211221c8 Add double type vector. Remove by default byte_stride value 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:22 +01:00
Arthur Brainville (Ybalrid)
72f535e198 Move defined types (array adapter templates) to the header 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:22 +01:00
Arthur Brainville (Ybalrid)
02fce26c6c Use default material as the 1st material on the array 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:22 +01:00
Arthur Brainville (Ybalrid)
7218e40bfd Fix pivot. Hack material to prevent crash 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:22 +01:00
Arthur Brainville (Ybalrid)
2b10d88e42 Load inside the scene graph the gltf mesh (like the obj) 
pivot is still invalid

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:21 +01:00
Arthur Brainville
aad6f06208 Fix linux build in C++11 strict 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:21 +01:00
Arthur Brainville
b62e95f414 Load the normal vectors of the primitive 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:21 +01:00
Arthur Brainville
ffc79a719b Also access the position attribute of the primitive 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:20 +01:00
Arthur Brainville (Ybalrid)
ce75870894 Now load index buffer 
Added some template infrastructure to read arrays where type is defined by a value.

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:20 +01:00
Arthur Brainville (Ybalrid)
49721f0fd4 Add the entry point for loading gltf files. 
Also switch on the primitive mode of each mesh. Will only attempt to
load lists of triangles for now...

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:20 +01:00
Arthur Brainville (Ybalrid)
62da4688af Only attempt to load the obj file if the obj_filename is defined in json 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:20 +01:00
Arthur Brainville (Ybalrid)
365e56b779 Small adjustment to the NanoSG readme 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:19 +01:00
Arthur Brainville (Ybalrid)
1baa211450 Add files to .gitignore 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:19 +01:00
Arthur Brainville
01bf27443e Fix where stb image is actually implemented 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:18 +01:00
Arthur Brainville (Ybalrid)
7e91e9bb9f Setup CI for raytrace example 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:18 +01:00
Arthur Brainville (Ybalrid)
67f5fbd79e Add a gltf_filename feild to the renderconfig struct 
This is to get the filename that will be given to the gltf-loader

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:18 +01:00
Arthur Brainville (Ybalrid)
a6cbf3d35b Applyind clang-format on main.cc. Included gltf-loader 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:17 +01:00
Arthur Brainville (Ybalrid)
3903446bfc Move the implementation of stbi to it's own .cc file 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:17 +01:00
Arthur Brainville (Ybalrid)
8066a54415 Build the tinygltf loader code 
Also remove the implementation of STB-Image from obj-loader.cc

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:17 +01:00
Arthur Brainville (Ybalrid)
3d63a08ce2 Make this code buildable as is 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:16 +01:00
Arthur Brainville (Ybalrid)
d868aff1d1 Add the current code of nanort + nanosg 
This implementation will be based on commit
b31dc0bd92eb7ac896079849a2205fac4abbd087 from the nanort project

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:16 +01:00
Arthur Brainville (Ybalrid)
6233b2e6bb Remove old nanort/nanosg code. Keep the gltf-loader class on hand 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:15 +01:00
Syoyo Fujita
b09d660c38 Update premake script for glview example. Fixes #39. 2018-02-23 01:14:13 +09:00
Arthur Brainville (Ybalrid)
0dca478817 load texture coordinates 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-21 10:02:04 +01:00
Arthur Brainville
b7bf01c679 Switch to unsigned int for the int arrays. Fix compatibility issue 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 21:47:22 +01:00
Arthur Brainville
dc07a50ab7 added loading of doubles for position 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 21:43:07 +01:00
Arthur Brainville
6edd3a7f60 Add double type vector. Remove by default byte_stride value 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 21:40:55 +01:00
Arthur Brainville (Ybalrid)
fac0ad9243 Move defined types (array adapter templates) to the header 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 15:55:23 +01:00
Arthur Brainville (Ybalrid)
58baa51463 Use default material as the 1st material on the array 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:57 +01:00
Arthur Brainville (Ybalrid)
d095ef53c4 Fix pivot. Hack material to prevent crash 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:57 +01:00
Arthur Brainville (Ybalrid)
9993a71410 Load inside the scene graph the gltf mesh (like the obj) 
pivot is still invalid

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:57 +01:00
Arthur Brainville
e64e6d2d2a Fix linux build in C++11 strict 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:56 +01:00
Arthur Brainville
db5b272a1b Load the normal vectors of the primitive 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:56 +01:00
Arthur Brainville
5682cb4542 Also access the position attribute of the primitive 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:56 +01:00
Arthur Brainville (Ybalrid)
7c54677acd Now load index buffer 
Added some template infrastructure to read arrays where type is defined by a value.

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:56 +01:00
Arthur Brainville (Ybalrid)
b8040e2a19 Add the entry point for loading gltf files. 
Also switch on the primitive mode of each mesh. Will only attempt to
load lists of triangles for now...

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:56 +01:00
Arthur Brainville (Ybalrid)
e42ba4e404 Only attempt to load the obj file if the obj_filename is defined in json 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:56 +01:00
Arthur Brainville (Ybalrid)
cc4fd4be8e Small adjustment to the NanoSG readme 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:37 +01:00
Arthur Brainville (Ybalrid)
f4fbee1cdf Add files to .gitignore 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:42:11 +01:00
Arthur Brainville
088aa0210f Fix where stb image is actually implemented 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:40:50 +01:00
Arthur Brainville (Ybalrid)
1340e62848 Setup CI for raytrace example 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-20 14:40:33 +01:00
Arthur Brainville (Ybalrid)
c9ec1ea7b6 Add a gltf_filename feild to the renderconfig struct 
This is to get the filename that will be given to the gltf-loader

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-18 21:01:59 +01:00
Arthur Brainville (Ybalrid)
adfe936dd3 Applyind clang-format on main.cc. Included gltf-loader 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-18 20:24:57 +01:00