maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Deprecated cleanup

Browse source
This commit is contained in:
luboslenco 2019-08-24 11:50:27 +02:00
parent 4d5309a07a
commit 24867658f1
5 changed files with 38 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
blender/arm/exporter.py
View file

@ -1266,11 +1266,8 @@ class ArmoryExporter:
armature = bobject.find_armature()
apply_modifiers = not armature
if hasattr(bobject, 'evaluated_get'):
bobject_eval = bobject.evaluated_get(self.depsgraph) if apply_modifiers else bobject
exportMesh = bobject_eval.to_mesh()
else: # TODO: deprecated
exportMesh = bobject.to_mesh(self.depsgraph, apply_modifiers, calc_undeformed=False)
bobject_eval = bobject.evaluated_get(self.depsgraph) if apply_modifiers else bobject
exportMesh = bobject_eval.to_mesh()
if exportMesh is None:
log.warn(oid + ' was not exported')
@ -1795,17 +1792,12 @@ class ArmoryExporter:
self.defaultPartMaterialObjects = []
self.materialToArmObjectDict = dict()
self.objectToArmObjectDict = dict()
# self.active_layers = []
self.bone_tracks = []
# self.active_layers = []
# for i in range(0, len(self.scene.view_layers)):
# if self.scene.view_layers[i] == True:
# self.active_layers.append(i)
if hasattr(context, 'evaluated_depsgraph_get'):
self.depsgraph = context.evaluated_depsgraph_get()
else: # TODO: deprecated
self.depsgraph = context.depsgraph
self.depsgraph = context.evaluated_depsgraph_get()
self.preprocess()
# scene_objects = []

5
blender/arm/handlers.py
View file

@ -15,10 +15,7 @@ def on_depsgraph_update_post(self):
return
# Recache
if hasattr(bpy.context, 'evaluated_depsgraph_get'):
depsgraph = bpy.context.evaluated_depsgraph_get()
else: # TODO: deprecated
depsgraph = bpy.context.depsgraph
depsgraph = bpy.context.evaluated_depsgraph_get()
for update in depsgraph.updates:
uid = update.id

13
blender/arm/make_renderpath.py
View file

@ -166,16 +166,11 @@ def build():
wrd.compo_defs += '_CFog'
compo_depth = True
focus_distance = 0.0 # TODO: deprecated
if len(bpy.data.cameras) > 0:
cam = bpy.data.cameras[0]
if hasattr(cam, 'dof'):
if cam.dof.use_dof:
focus_distance = cam.dof.focus_distance
else:
focus_distance = cam.dof_distance
focus_distance = 0.0
if len(bpy.data.cameras) > 0 and bpy.data.cameras[0].dof.use_dof:
focus_distance = bpy.data.cameras[0].dof.focus_distance
if len(bpy.data.cameras) > 0 and focus_distance > 0.0:
if focus_distance > 0.0:
wrd.compo_defs += '_CDOF'
compo_depth = True
if compo_depth:

58
blender/arm/material/cycles.py
View file

@ -226,36 +226,29 @@ def parse_shader(node, socket):
elif node.type == 'BSDF_PRINCIPLED':
if parse_surface:
if len(node.inputs) < 22: # TODO: deprecated
write_normal(node.inputs[17])
out_basecol = parse_vector_input(node.inputs[0])
out_metallic = parse_value_input(node.inputs[4])
out_specular = parse_value_input(node.inputs[5])
out_roughness = parse_value_input(node.inputs[7])
else:
write_normal(node.inputs[19])
out_basecol = parse_vector_input(node.inputs[0])
# subsurface = parse_vector_input(node.inputs[1])
# subsurface_radius = parse_vector_input(node.inputs[2])
# subsurface_color = parse_vector_input(node.inputs[3])
out_metallic = parse_value_input(node.inputs[4])
out_specular = parse_value_input(node.inputs[5])
# specular_tint = parse_vector_input(node.inputs[6])
out_roughness = parse_value_input(node.inputs[7])
# aniso = parse_vector_input(node.inputs[8])
# aniso_rot = parse_vector_input(node.inputs[9])
# sheen = parse_vector_input(node.inputs[10])
# sheen_tint = parse_vector_input(node.inputs[11])
# clearcoat = parse_vector_input(node.inputs[12])
# clearcoat_rough = parse_vector_input(node.inputs[13])
# ior = parse_vector_input(node.inputs[14])
# transmission = parse_vector_input(node.inputs[15])
# transmission_roughness = parse_vector_input(node.inputs[16])
if node.inputs[17].is_linked or node.inputs[17].default_value[0] != 0.0:
out_emission = '({0}.x)'.format(parse_vector_input(node.inputs[17]))
emission_found = True
# clearcoar_normal = parse_vector_input(node.inputs[20])
# tangent = parse_vector_input(node.inputs[21])
write_normal(node.inputs[19])
out_basecol = parse_vector_input(node.inputs[0])
# subsurface = parse_vector_input(node.inputs[1])
# subsurface_radius = parse_vector_input(node.inputs[2])
# subsurface_color = parse_vector_input(node.inputs[3])
out_metallic = parse_value_input(node.inputs[4])
out_specular = parse_value_input(node.inputs[5])
# specular_tint = parse_vector_input(node.inputs[6])
out_roughness = parse_value_input(node.inputs[7])
# aniso = parse_vector_input(node.inputs[8])
# aniso_rot = parse_vector_input(node.inputs[9])
# sheen = parse_vector_input(node.inputs[10])
# sheen_tint = parse_vector_input(node.inputs[11])
# clearcoat = parse_vector_input(node.inputs[12])
# clearcoat_rough = parse_vector_input(node.inputs[13])
# ior = parse_vector_input(node.inputs[14])
# transmission = parse_vector_input(node.inputs[15])
# transmission_roughness = parse_vector_input(node.inputs[16])
if node.inputs[17].is_linked or node.inputs[17].default_value[0] != 0.0:
out_emission = '({0}.x)'.format(parse_vector_input(node.inputs[17]))
emission_found = True
# clearcoar_normal = parse_vector_input(node.inputs[20])
# tangent = parse_vector_input(node.inputs[21])
if parse_opacity:
if len(node.inputs) > 20:
out_opacity = parse_value_input(node.inputs[18])
@ -483,10 +476,7 @@ def parse_vector(node, socket):
tex_link = node.name if node.arm_material_param else None
if tex != None:
curshader.write_textures += 1
if hasattr(node, 'color_space'): # TODO: node.color_space deprecated
to_linear = node.color_space == 'COLOR'
else:
to_linear = node.image != None and node.image.colorspace_settings.name == 'sRGB'
to_linear = node.image != None and node.image.colorspace_settings.name == 'sRGB'
res = '{0}.rgb'.format(texture_store(node, tex, tex_name, to_linear, tex_link=tex_link))
curshader.write_textures -= 1
return res

16
blender/arm/write_data.py
View file

@ -580,19 +580,13 @@ const int compoChromaticSamples = """ + str(rpdat.arm_chromatic_aberration_sampl
"""const int compoChromaticType = """ + str(0) + """;
""")
focus_distance = 0.0 # TODO: deprecated
focus_distance = 0.0
fstop = 0.0
if len(bpy.data.cameras) > 0:
cam = bpy.data.cameras[0]
if hasattr(cam, 'dof'):
if cam.dof.use_dof:
focus_distance = cam.dof.focus_distance
fstop = cam.dof.aperture_fstop
else:
focus_distance = cam.dof_distance
fstop = cam.gpu_dof.fstop
if len(bpy.data.cameras) > 0 and bpy.data.cameras[0].dof.use_dof:
focus_distance = bpy.data.cameras[0].dof.focus_distance
fstop = bpy.data.cameras[0].dof.aperture_fstop
if len(bpy.data.cameras) > 0 and focus_distance > 0.0:
if focus_distance > 0.0:
f.write(
"""const float compoDOFDistance = """ + str(round(focus_distance * 100) / 100) + """;
const float compoDOFFstop = """ + str(round(fstop * 100) / 100) + """;