Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
db04084
adding some extensions
romanarust Jul 28, 2021
f5a6620
Update CHANGELOG.md
romanarust Jul 28, 2021
423a89a
adding new functions to content
romanarust Jul 28, 2021
9aebecf
Update data_classes.py
romanarust Jul 28, 2021
b8b70a2
base on Base class for extras and extensions
romanarust Jul 28, 2021
5652c27
lint
romanarust Jul 28, 2021
d4316a9
base extensions on Base
romanarust Jul 28, 2021
8f16913
Update data_classes.py
romanarust Jul 29, 2021
f6ffa35
Update gltf_content.py
romanarust Jul 29, 2021
ff56f67
added to/from_data support for extensions, added commentary about add…
beverlylytle Jul 29, 2021
30007ac
partial fix for extension export
beverlylytle Sep 17, 2021
a3d89be
Merge main and resolve conflicts
beverlylytle Oct 11, 2021
a5b20d8
Merge branch 'main' into gltf_update
romanarust Dec 15, 2021
195c94b
Merge branch 'main' into gltf_update
romanarust Jul 5, 2022
cfc2875
black formatter
romanarust Jul 13, 2022
325db3e
black_formatter + KHR_materials_specular
romanarust Jul 13, 2022
0c3df60
black formatter + autosave images in save folder
romanarust Jul 13, 2022
072b539
black formatter
romanarust Jul 13, 2022
b5e1e67
remove print
romanarust Jul 13, 2022
4ada162
add extension KHR_materials_ior
romanarust Jul 13, 2022
a466cb9
added check_extensions_texture_recursively and update gltf content ex…
romanarust Jul 13, 2022
f221a72
added _add_extensions_recursively and _add_extensions
romanarust Jul 13, 2022
68f03d2
Update CHANGELOG.md
romanarust Jul 13, 2022
c66f17d
lint
romanarust Jul 13, 2022
440a913
added files for testing
romanarust Jul 13, 2022
34afa43
Update test_gltf.py
romanarust Jul 13, 2022
66400b0
Update CHANGELOG.md
romanarust Jul 13, 2022
35f2c02
Update gltf_content.py
romanarust Jul 14, 2022
12eb237
change local import to pull path for ironpython
romanarust Jul 14, 2022
287fa83
apply "black -l 180"
romanarust Jul 18, 2022
4d84fd2
adding docstring
romanarust Jul 18, 2022
ab9d2b0
suggested change by chen
romanarust Jul 18, 2022
261eda8
running isort
romanarust Jul 18, 2022
4cd3da9
removing private functions from changelog
romanarust Jul 18, 2022
76184cb
_get_next_available_key
romanarust Jul 21, 2022
c730b09
flake8
romanarust Jul 21, 2022
f70a380
items()
romanarust Jul 21, 2022
fea3e9f
Update gltf_content.py
romanarust Jul 25, 2022
c9772d2
added to_data to gltf base
romanarust Aug 5, 2022
8eaebbe
add `KHR_lights_punctual`, `Light`, `LightSpot`
romanarust Aug 5, 2022
76af6d0
change _content.extensions to _content.extensions_used
romanarust Aug 5, 2022
ed6daf4
Update CHANGELOG.md
romanarust Aug 5, 2022
441d38e
saving light extensions for next PR
romanarust Aug 9, 2022
25826da
make test work for ipy
romanarust Aug 9, 2022
4d1067d
lint
romanarust Aug 9, 2022
ec79439
Update gltf_exporter.py
romanarust Aug 9, 2022
4571db1
Merge branch 'main' into gltf_update
romanarust Aug 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased

### Added
* Added gltf extensions: `KHR_materials_transmission`, `KHR_materials_specular`, `KHR_materials_ior`, `KHR_materials_clearcoat`, `KHR_Texture_Transform`, `KHR_materials_pbrSpecularGlossiness`
* Added `GLTFContent.check_extensions_texture_recursively`
* Added `GLTFContent.get_node_by_name`, `GLTFContent.get_material_index_by_name`
* Added `GLTFContent.add_material`, `GLTFContent.add_texture`, `GLTFContent.add_image`

### Changed
* Based all gltf data classes on `BaseGLTFDataClass`

### Removed

Expand Down Expand Up @@ -540,7 +545,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed

* Removed `compas.datastructures.mesh.core.mesh.BaseMesh`.

* Removed `compas.datastructures.BaseNetwork`.

## [1.7.1] 2021-06-14
Expand Down Expand Up @@ -812,7 +816,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

* Added `compas.datastructures.mesh.trimesh_samplepoints_numpy`.
* Added `compas.datastructures.mesh.trimesh_samplepoints_numpy`.

### Changed

Expand Down
12 changes: 6 additions & 6 deletions src/compas/files/gltf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
from .gltf_reader import GLTFReader

__all__ = [
'GLTF',
'GLTFContent',
'GLTFMesh',
'GLTFReader',
'GLTFParser',
'GLTFExporter',
"GLTF",
"GLTFContent",
"GLTFMesh",
"GLTFReader",
"GLTFParser",
"GLTFExporter",
]
26 changes: 13 additions & 13 deletions src/compas/files/gltf/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
COMPONENT_TYPE_UNSIGNED_INT = 5125
COMPONENT_TYPE_FLOAT = 5126

TYPE_SCALAR = 'SCALAR'
TYPE_VEC2 = 'VEC2'
TYPE_VEC3 = 'VEC3'
TYPE_VEC4 = 'VEC4'
TYPE_MAT2 = 'MAT2'
TYPE_MAT3 = 'MAT3'
TYPE_MAT4 = 'MAT4'
TYPE_SCALAR = "SCALAR"
TYPE_VEC2 = "VEC2"
TYPE_VEC3 = "VEC3"
TYPE_VEC4 = "VEC4"
TYPE_MAT2 = "MAT2"
TYPE_MAT3 = "MAT3"
TYPE_MAT4 = "MAT4"

COMPONENT_TYPE_ENUM = {
COMPONENT_TYPE_BYTE: 'b',
COMPONENT_TYPE_UNSIGNED_BYTE: 'B',
COMPONENT_TYPE_SHORT: 'h',
COMPONENT_TYPE_UNSIGNED_SHORT: 'H',
COMPONENT_TYPE_UNSIGNED_INT: 'I',
COMPONENT_TYPE_FLOAT: 'f',
COMPONENT_TYPE_BYTE: "b",
COMPONENT_TYPE_UNSIGNED_BYTE: "B",
COMPONENT_TYPE_SHORT: "h",
COMPONENT_TYPE_UNSIGNED_SHORT: "H",
COMPONENT_TYPE_UNSIGNED_INT: "I",
COMPONENT_TYPE_FLOAT: "f",
}

NUM_COMPONENTS_BY_TYPE_ENUM = {
Expand Down
Loading