diff options
author | Kalle-Samuli Riihikoski <haikalle@gmail.com> | 2019-03-01 14:51:11 +0300 |
---|---|---|
committer | Kalle-Samuli Riihikoski <haikalle@gmail.com> | 2019-03-01 14:51:11 +0300 |
commit | 3206bcc4c84b109a8c8fb2ad21e6fe828e964c33 (patch) | |
tree | f8c63dfb20a303812cb87f3972e97f41030fd13d /io_coat3D | |
parent | 7f0648db4df1b973089ccfee7815c36d9ab19d7c (diff) |
remove extra displacement code
Diffstat (limited to 'io_coat3D')
-rw-r--r-- | io_coat3D/__init__.py | 15 | ||||
-rw-r--r-- | io_coat3D/data.json | 4 | ||||
-rw-r--r-- | io_coat3D/tex.py | 57 |
3 files changed, 28 insertions, 48 deletions
diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py index 360c77e7..48d33a09 100644 --- a/io_coat3D/__init__.py +++ b/io_coat3D/__init__.py @@ -229,6 +229,9 @@ def updatemesh(objekti, proxy): #Mesh Copy + print('SAAAMULI-RIIHI') + print('objekti', len(objekti.data.vertices)) + print('objekti', len(proxy.data.vertices)) for ind, v in enumerate(objekti.data.vertices): v.co = proxy.data.vertices[ind].co @@ -298,7 +301,7 @@ class SCENE_OT_opencoat(bpy.types.Operator): active_3dcoat = exe_path if running() == False: - + print('tulele tanne') os.popen('"' + active_3dcoat + '" ' + coat3D) else: importfile = bpy.context.scene.coat3D.exchangedir @@ -572,7 +575,7 @@ class SCENE_OT_export(bpy.types.Operator): coat3D.bring_retopo = False bpy.ops.export_scene.fbx(filepath=coa.applink_address,global_scale = 0.01, use_selection=True, use_mesh_modifiers=coat3D.exportmod, axis_forward='-Z', axis_up='Y') - + print('testi: ', importfile) file = open(importfile, "w") file.write("%s"%(checkname)) file.write("\n%s"%(checkname)) @@ -664,6 +667,7 @@ class SCENE_OT_import(bpy.types.Operator): Blender_export += ('%sexport.txt'%(os.sep)) new_applink_address = 'False' new_object = False + print('mitas: ', Blender_export) if(os.path.isfile(Blender_export)): obj_pathh = open(Blender_export) new_object = True @@ -714,6 +718,7 @@ class SCENE_OT_import(bpy.types.Operator): import_type.append(coat3D.type) if(import_list or coat3D.importmesh): + print('import_list:', import_list) for idx, list in enumerate(import_list): bpy.ops.import_scene.fbx(filepath=list, global_scale = 0.01,axis_forward='X',use_custom_normals=False) cache_objects = bpy.data.objects.keys() @@ -842,6 +847,8 @@ class SCENE_OT_import(bpy.types.Operator): for index, material in enumerate(objekti.material_slots): obj_proxy.material_slots[index-1].material = material.material + print('Montako1: ', len(objekti.material_slots)) + print('Montako2: ', len(obj_proxy.material_slots)) updatemesh(objekti,obj_proxy) bpy.context.view_layer.objects.active = objekti @@ -867,13 +874,13 @@ class SCENE_OT_import(bpy.types.Operator): coat3D.importmesh = False objekti.select_set(True) - + print('Montako: ', len(objekti.material_slots)) if(coat3D.importtextures): is_new = False tex.matlab(objekti,mat_list,texturelist,is_new) objekti.select_set(False) else: - + print('JAAKO TAHAN KOHTAAN 2') mat_list = [] if (objekti.material_slots): for obj_mat in objekti.material_slots: diff --git a/io_coat3D/data.json b/io_coat3D/data.json index 2a3020e1..29d34356 100644 --- a/io_coat3D/data.json +++ b/io_coat3D/data.json @@ -51,7 +51,7 @@ "normal": "no", "displacement": "yes", "rampnode": "yes", - "input": 4 + "input": 5 }, "emissive": { @@ -61,7 +61,7 @@ "displacement": "no", "find_input": [ "Emissive" ], "rampnode": "no", - "input": 5 + "input": 4 }, "emissive_power": { diff --git a/io_coat3D/tex.py b/io_coat3D/tex.py index 6975bec6..99fdc599 100644 --- a/io_coat3D/tex.py +++ b/io_coat3D/tex.py @@ -60,7 +60,7 @@ def UVTiling(objekti, texturelist): uvtiles_index.append([poly.material_index, objekti.data.uv_layers.active.data[loop_index].uv[0]]) if (len(final_material_indexs) == len(objekti.material_slots)): break - + print(final_material_indexs) for texture_info in texturelist: name = texture_info[0] @@ -71,7 +71,7 @@ def UVTiling(objekti, texturelist): texture_info[0] = objekti.material_slots[list_tiles[0]].material.name - + print('uvtiles_index', uvtiles_index) return texturelist @@ -218,8 +218,8 @@ def createnodes(active_mat,texcoat, create_group_node): # Cretes new nodes and l group_tree.outputs.new("NodeSocketColor", "Metallic") group_tree.outputs.new("NodeSocketColor", "Roughness") group_tree.outputs.new("NodeSocketVector", "Normal map") - group_tree.outputs.new("NodeSocketColor", "Displacement") group_tree.outputs.new("NodeSocketColor", "Emissive") + group_tree.outputs.new("NodeSocketColor", "Displacement") group_tree.outputs.new("NodeSocketColor", "Emissive Power") group_tree.outputs.new("NodeSocketColor", "AO") applink_tree = act_material.nodes.new('ShaderNodeGroup') @@ -288,40 +288,6 @@ def createnodes(active_mat,texcoat, create_group_node): # Cretes new nodes and l applink_tree, out_mat, coatMat) - ''' DISPLACEMENT ''' - - if (bring_displacement == True and texcoat['displacement'] != []): - node = act_material.nodes.new('ShaderNodeTexImage') - node.name = '3DC_displacement' - node.label = 'Displacement' - # input_color = main_mat.inputs.find('Roughness') Blender 2.8 Does not support Displacement yet. - if (texcoat['displacement']): - node.image = bpy.data.images.load(texcoat['displacement'][0]) - node.color_space = 'NONE' - - if (coat3D.createnodes): - ''' - curvenode = act_material.nodes.new('ShaderNodeRGBCurve') - curvenode.name = '3DC_RGBCurve' - huenode = act_material.nodes.new('ShaderNodeHueSaturation') - huenode.name = '3DC_HueSaturation' - rampnode = act_material.nodes.new('ShaderNodeValToRGB') - rampnode.name = '3DC_ColorRamp' - - act_material.links.new(node.outputs[0], curvenode.inputs[1]) - act_material.links.new(curvenode.outputs[0], rampnode.inputs[0]) - act_material.links.new(rampnode.outputs[0], huenode.inputs[4]) - ''' - act_material.links.new(node.outputs[0], notegroup.inputs[4]) - - #if (main_mat.type == 'BSDF_PRINCIPLED'): - #main_material.links.new(applink_tree.outputs[2], main_mat.inputs[input_color]) - node.location = -276, -579 - - else: - node.location = -550, 0 - act_material.links.new(node.outputs[0], notegroup.inputs[4]) - def CreateTextureLine(type, act_material, main_mat, texcoat, coat3D, notegroup, main_material, applink_tree, out_mat, coatMat): node = act_material.nodes.new('ShaderNodeTexImage') @@ -334,8 +300,8 @@ def CreateTextureLine(type, act_material, main_mat, texcoat, coat3D, notegroup, elif type['name'] == 'displacement': disp_node = main_material.nodes.new('ShaderNodeDisplacement') - node.location = -276, -579 - disp_node.location = 70, -460 + node.location = -630, -1160 + disp_node.location = 90, -460 disp_node.name = '3DC_dispnode' node.name = '3DC_' + type['name'] @@ -363,9 +329,15 @@ def CreateTextureLine(type, act_material, main_mat, texcoat, coat3D, notegroup, main_material.links.new(applink_tree.outputs[type['input']], main_mat.inputs[input_color]) elif (type['name'] == 'displacement'): - act_material.links.new(node.outputs[0], notegroup.inputs[4]) - main_material.links.new(applink_tree.outputs[4], disp_node.inputs[0]) + rampnode = act_material.nodes.new('ShaderNodeValToRGB') + rampnode.name = '3DC_ColorRamp' + rampnode.location = -270, -956 + + act_material.links.new(node.outputs[0], rampnode.inputs[0]) + act_material.links.new(rampnode.outputs[0], notegroup.inputs[5]) + + main_material.links.new(applink_tree.outputs[5], disp_node.inputs[0]) main_material.links.new(disp_node.outputs[0], out_mat.inputs[2]) coatMat.cycles.displacement_method = 'BOTH' @@ -400,7 +372,8 @@ def createExtraNodes(act_material, node, type): curvenode.name = '3DC_RGBCurve' huenode = act_material.nodes.new('ShaderNodeHueSaturation') huenode.name = '3DC_HueSaturation' - + print('tieto:', type) + print('ttoto: ', type['rampnode']) if(type['rampnode'] == 'yes'): rampnode = act_material.nodes.new('ShaderNodeValToRGB') rampnode.name = '3DC_ColorRamp' |