Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: improved gltf loading sequence #170

Merged
29 commits merged into from
Jan 21, 2019
Merged

Feature: improved gltf loading sequence #170

29 commits merged into from
Jan 21, 2019

Conversation

ghost
Copy link

@ghost ghost commented Jan 21, 2019

No description provided.

UX3D-becher and others added 25 commits January 18, 2019 12:02
@UX3D-becher
added empty initGl methods to all gltf classes
168e0c0
@UX3D-becher
seperated gl code from json parsing in texture handling of material
e4521a8
@UX3D-becher
seperated other gl code from json parsing in material
b8b8d85
@UX3D-becher
set correct defaults for material
a3b6e72
@UX3D-becher
added gltf parameter to initGl
d51fc58
cleanup gltf classes
0969cfb
base class for gltf objects
c12a835
cleanup gltf fromJson
feec958
fix path to utils
1309f49
default material is static so it doesn't need to be passed down (the …
f12667e 
…getter is static anyway)
separated gl logic from json parsing in primitive
0921168
applied generic json parsing to meshes
db951ea
fix default material usage
b7c8bdf
reordered gltf.fromJson
544e474
separated post json logic from json logic in texture
6ad0968
remove default material because it's no longer needed
8338438
remove default sampler from main gltf
e490536
applied new parsing style to "asset"
b19bb9c
applied new parsing style to textures
87f6235
primitive extends GltfObject
2b98a14
cleanup of gltf
4eebd64
separated image path resolving from json parsing to apply parsing pat…
4678f9c 
…tern
material extends base class
2f2aa96
refactor loader
50613aa
moved more gltf loading functionality into the gltfLoader
f207d35
@ghost ghost requested review from UX3D-wahlster and UX3D-becher January 21, 2019 16:08
ghost
ghost commented Jan 21, 2019
View reviewed changes
src/gltf.js Outdated Show resolved Hide resolved
src/gltf_object.js Show resolved Hide resolved
src/mesh.js Outdated Show resolved Hide resolved
src/node.js Outdated Show resolved Hide resolved
src/node.js Outdated Show resolved Hide resolved
src/gltf.js Show resolved Hide resolved
src/texture.js Show resolved Hide resolved
Benjamin Schmithüsen added 2 commits January 21, 2019 17:34
@ghost ghost force-pushed the feature/gltf-loading-sequence branch from c49c057 to faa8ab4 Compare January 21, 2019 17:53
@ghost ghost merged commit 7c2059a into reference-viewer Jan 21, 2019
@ghost ghost deleted the feature/gltf-loading-sequence branch January 21, 2019 18:06
UX3D-becher added a commit that referenced this pull request Apr 12, 2021
@UX3D-becher
Merge pull request #170 from ux3d/fix/ktxCrash
8ebfc02 
Fix/ktx crash
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UX3D-wahlster UX3D-wahlster Awaiting requested review from UX3D-wahlster

@UX3D-becher UX3D-becher Awaiting requested review from UX3D-becher

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@UX3D-becher