Skip to content

Commit

Permalink
Merge pull request #40 from scurest/master
Browse files Browse the repository at this point in the history 
Other PRs + material property animation, CUBICSPLINE interpolation
  • Loading branch information
@ksons
ksons authored Oct 19, 2018
2 parents 5ca94a2 + f1977b2 commit 6edfbfb
Show file tree
Hide file tree
Showing 28 changed files with 2,504 additions and 1,568 deletions.
10 changes: 8 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,16 @@ After installing you have to find the add-on and activate it.

After this procedure, the exporter is available from ``File->Import->glTF JSON (.gltf/.glb)``.



See [INSTALL.md](INSTALL.md) for further installation instructions.

## Supported glTF Extensions
* EXT_property_animation (tentative until stabilized, material properties only)
* KHR_lights_punctual (untested, tentative until stabilized)
* KHR_materials_pbrSpecularGlossiness
* KHR_materials_unlit
* KHR_texture_transform
* MSFT_texture_dds

## Samples Renderings
![BoomBox](https://github.com/ksons/gltf-blender-importer/blob/master/doc/boom-box.png)
![Corset](https://github.com/ksons/gltf-blender-importer/blob/master/doc/corset.png)
Expand Down
244 changes: 73 additions & 171 deletions addons/io_scene_gltf/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import json, os, struct
import json
import os
import struct

import bpy
from bpy.props import StringProperty, BoolProperty, FloatProperty
from bpy.props import StringProperty, BoolProperty, FloatProperty, EnumProperty
from bpy_extras.io_utils import ImportHelper
from mathutils import Euler

from io_scene_gltf import animation, buffer, camera, material, mesh, scene, node_groups

bl_info = {
'name': 'glTF 2.0 Importer',
'author': 'Kristian Sons (ksons), scurest',
Expand All @@ -20,18 +20,21 @@
'category': 'Import-Export'
}


# Supported glTF version
GLTF_VERSION = (2, 0)

# Supported extensions
EXTENSIONS = set((
'EXT_property_animation', # tentative, only material properties supported
'KHR_lights_punctual', # tentative until stabilized
'KHR_materials_pbrSpecularGlossiness',
'KHR_materials_unlit',
'KHR_texture_transform',
'MSFT_texture_dds',
))

from . import animation, buffer, camera, material, mesh, scene, light, load


class ImportGLTF(bpy.types.Operator, ImportHelper):
bl_idname = 'import_scene.gltf'
Expand All @@ -45,66 +48,70 @@ class ImportGLTF(bpy.types.Operator, ImportHelper):

import_under_current_scene = BoolProperty(
name='Import contents under current scene',
description=
'When enabled, all the objects will be placed in the current '
'scene and no scenes will be created.\n'
'When disabled, scenes will be created to match the ones in the '
'glTF file. Any object not in a scene will not be visible.',
description='When enabled, all the objects will be placed in the current '
'scene and no scenes will be created.\n'
'When disabled, scenes will be created to match the ones in the '
'glTF file. Any object not in a scene will not be visible.',
default=True,
)
smooth_polys = BoolProperty(
name='Enable polygon smoothing',
description=
'Enable smoothing for all polygons in imported meshes. Suggest '
'disabling for low-res models.',
description='Enable smoothing for all polygons in imported meshes. Suggest '
'disabling for low-res models.',
default=True,
)
bone_rotation_x = FloatProperty(
name='Bone Rotation X',
description='',
default=0.0,
step=100,
subtype='ANGLE',
unit='ROTATION',
bone_rotation_mode = EnumProperty(
items=[
('NONE', "Don't change", ''),
('AUTO', 'Choose for me', ''),
('MANUAL', 'Choose manually', ''),
],
name='Axis',
description='Adjusts which local axis bones should point along. The axis they '
'points along is always +Y. This option lets you rotate them so another '
'axis becomes +Y.',
default='AUTO',
)
bone_rotation_y = FloatProperty(
name='Bone Rotation Y',
description='',
default=0.0,
step=100,
subtype='ANGLE',
unit='ROTATION',
)
bone_rotation_z = FloatProperty(
name='Bone Rotation Z',
description='',
default=0.0,
step=100,
subtype='ANGLE',
unit='ROTATION',
bone_rotation_axis = EnumProperty(
items=[
('+X', '+X', '+X'),
('-X', '-X', '-X'),
('-Y', '-Y', '-Y'),
('+Z', '+Z', '+Z'),
('-Z', '-Z', '-Z'),
],
name='+Y to',
description='If bones point the wrong way with the default value, enable '
'"Display > Axes" for the Armature and look in Edit mode. '
'You\'ll see that bones point along the local +Y axis. Decide '
'which local axis they should point along and put it here.',
default='+Z',
)
import_animations = BoolProperty(
name='Import Animations (EXPERIMENTAL)',
name='Import Animations',
description='',
default=False,
)
framerate = FloatProperty(
name='Frames/second',
description=
'Used for animation. The Blender frame corresponding to the glTF '
'time t is computed as framerate * t.',
description='Used for animation. The Blender frame corresponding to the glTF '
'time t is computed as framerate * t.',
default=60.0,
)

def execute(self, context):
self.caches = {}
self.material_texture_has_animated_transform = {}

self.load_config()
self.load()
self.check_version()
self.check_required_extensions()

load.load(self)

# Precomputations
if self.import_animations:
animation.gather_animation_info(self)
material.compute_materials_using_color0(self)

scene.create_scenes(self)
if self.import_animations:
animation.add_animations(self)
Expand All @@ -123,154 +130,49 @@ def draw(self, context):
col = layout.box().column()
col.label('Bones:', icon='BONE_DATA')
col.label('(Tweak if bones point wrong)')
col.prop(self, 'bone_rotation_x')
col.prop(self, 'bone_rotation_y')
col.prop(self, 'bone_rotation_z')
col.prop(self, 'bone_rotation_mode')
if self.as_keywords()['bone_rotation_mode'] == 'MANUAL':
col.prop(self, 'bone_rotation_axis')

col = layout.box().column()
col.label('Animation:', icon='OUTLINER_DATA_POSE')
col.prop(self, 'import_animations')
col.prop(self, 'framerate')


def get(self, kind, id):
cache = self.caches.setdefault(kind, {})
if id in cache:
return cache[id]
else:
CREATE_FNS = {
'buffer': buffer.create_buffer,
'buffer_view': buffer.create_buffer_view,
'accessor': buffer.create_accessor,
'image': material.create_image,
'material': material.create_material,
'node_group': material.create_group,
'mesh': mesh.create_mesh,
'camera': camera.create_camera,
'light': light.create_light,
}
result = CREATE_FNS[kind](self, id)
if type(result) == dict and result.get('do_not_cache_me', False):
# Callee is requesting we not cache it
return result['result']
result = result['result']
else:
cache[id] = result
return result

def load(self):
filename = self.filepath

# Remember this for resolving relative paths
self.base_path = os.path.dirname(filename)

with open(filename, 'rb') as f:
contents = f.read()

# Use magic number to detect GLB files.
is_glb = contents[:4] == b'glTF'
if is_glb:
self.parse_glb(contents)
else:
self.gltf = json.loads(contents.decode('utf-8'))
self.glb_buffer = None

def parse_glb(self, contents):
contents = memoryview(contents)

# Parse the header
header = struct.unpack_from('<4sII', contents)
glb_version = header[1]
if glb_version != 2:
raise Exception('GLB: version not supported: %d' % glb_version)

def parse_chunk(offset):
header = struct.unpack_from('<I4s', contents, offset=offset)
data_len = header[0]
ty = header[1]
data = contents[offset + 8: offset + 8 + data_len]
next_offset = offset + 8 + data_len
return {
'type': ty,
'data': data,
'next_offset': next_offset,
}

offset = 12 # end of header

# The first chunk must be JSON
json_chunk = parse_chunk(offset)
if json_chunk['type'] != b'JSON':
raise Exception('GLB: JSON chunk must be first')
self.gltf = json.loads(
json_chunk['data'].tobytes().decode('utf-8'), # Need to decode for < 2.79.4 which comes with Python 3.5
encoding='utf-8'
)

self.glb_buffer = None

offset = json_chunk['next_offset']
while offset < len(contents):
chunk = parse_chunk(offset)

# Ignore unknown chunks
if chunk['type'] != b'BIN\0':
offset = chunk['next_offset']
continue

if chunk['type'] == b'JSON':
raise Exception('GLB: Too many JSON chunks, should be 1')

if self.glb_buffer != None:
raise Exception('GLB: Too many BIN chunks, should be 0 or 1')

self.glb_buffer = chunk['data']

offset = chunk['next_offset']

def check_version(self):
def parse_version(s):
"""Parse a string like '1.1' to a tuple (1,1)."""
try:
version = tuple(int(x) for x in s.split('.'))
if len(version) >= 2: return version
except Exception:
pass
raise Exception('unknown version format: %s' % s)

asset = self.gltf['asset']

if 'minVersion' in asset:
min_version = parse_version(asset['minVersion'])
supported = GLTF_VERSION >= min_version
if not supported:
raise Exception('unsupported minimum version: %s' % min_version)
else:
version = parse_version(asset['version'])
# Check only major version; we should be backwards- and forwards-compatible
supported = version[0] == GLTF_VERSION[0]
if not supported:
raise Exception('unsupported version: %s' % version)

def check_required_extensions(self):
for ext in self.gltf.get('extensionsRequired', []):
if ext not in EXTENSIONS:
raise Exception('unsupported extension was required: %s' % ext)

return result

def load_config(self):
"""Load user-supplied options into instance vars."""
"""Load user-supplied options."""
keywords = self.as_keywords()
self.import_under_current_scene = keywords['import_under_current_scene']
self.smooth_polys = keywords['smooth_polys']
self.import_animations = keywords['import_animations']
self.framerate = keywords['framerate']
self.bone_rotation = Euler([
keywords['bone_rotation_x'],
keywords['bone_rotation_y'],
keywords['bone_rotation_z'],
])



CREATE_FNS = {
'buffer': buffer.create_buffer,
'buffer_view': buffer.create_buffer_view,
'accessor': buffer.create_accessor,
'image': material.create_image,
'material': material.create_material,
'node_group': node_groups.create_group,
'mesh': mesh.create_mesh,
'camera': camera.create_camera,
}
for opt in [
'import_under_current_scene', 'smooth_polys',
'import_animations', 'framerate', 'bone_rotation_mode',
'bone_rotation_axis',
]:
setattr(self, opt, keywords[opt])


# Add to a menu
def menu_func_import(self, context):
Expand Down
Loading

0 comments on commit 6edfbfb

Please sign in to comment.