glitch3d 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1793293a1331bc23dd4107bd664cb3a58c94e08f
-  data.tar.gz: 75032fca2f9644099ffec1691c9e9e43eff88dd1
+  metadata.gz: 688564a4811119581f00dbdbb11be49fa3806ab7
+  data.tar.gz: f83b133f69d6a5d9819594f29db45e653a378901
 SHA512:
-  metadata.gz: 41b1e28a7a1025348d6d8238b11f5c5e7fc336967690b34cba59c037722dac80adfcab55e58c4290e18de1b9df7db9ab408300e87adab03a97e9ab0d431bed73
-  data.tar.gz: b5020f50d233c5c863b4a6345b2cc9042022e6ac647d23943b6faadaf2996bb343ba106b06e46930c5190e88adc8afc5510ee2cb5b0765b4984bce8ca0681341
+  metadata.gz: 4776bb914bc36b06c585cbdc4b154252929b14b3da310adcd17a3d7625f729fd20a8a60f2660174d6cfd6f5f2462bf5944bc7d59fc7fcadafdf2c8677e0d275b
+  data.tar.gz: 3bcb160eadfb8d633a05c0b2e8f5d60402b62e5c9be5e0a4a3496b42c7493019663bea51ab0118490b666f2e3e00562f6dd5e5e849a629877fc9ff309a95ba66

data/.gitignore

@@ -7,9 +7,9 @@
 /pkg/
 /spec/reports/
 /tmp/
-/fixtures/models/*
 /renders/*
+/fixtures/models/*
 /fixtures/*
+!/fixtures/textures/*
 !/fixtures/skull.obj
-!/fixtures/textures/25.jpg
 .DS_Store

data/lib/glitch3d/bpy/helpers.py

@@ -1,3 +1,21 @@
+import bpy
+import argparse
+import datetime
+import bmesh
+import random
+import code
+import math
+import mathutils
+import random
+import uuid
+import sys
+
+REFLECTOR_SCALE = 5
+REFLECTOR_STRENGTH = 12
+REFLECTOR_LOCATION_PADDING = 10
+PROPS_NUMBER = 100
+SHADERS = ['ShaderNodeBsdfGlossy', 'ShaderNodeBsdfDiffuse', 'ShaderNodeBsdfVelvet', 'ShaderNodeEmission']
+props = []
 YELLOW = (1,0.7,0.1,1)
 
 def debug():
@@ -23,7 +41,7 @@ def shoot(camera, model_object, filepath):
     bpy.ops.render.render(write_still=True)
 
 def output_name(index, model_path):
-    return 'renders/' + os.path.splitext(model_path)[0].split('/')[1] + '_' + str(index) + '_' + str(datetime.date.today()) + '.png'
+    return './' + os.path.splitext(model_path)[0].split('/')[1] + '_' + str(index) + '_' + str(datetime.date.today()) + '.png'
 
 def rotate(model_object, index):
     model_object.rotation_euler[2] = math.radians(index * (360.0 / shots_number))
@@ -47,10 +65,19 @@ def rand_color_vector():
     return (rand_color_value(), rand_color_value(), rand_color_value(), 1)
 
 def rand_scale():
-    return round(random.uniform(0, 0.15), 10)
+    return round(random.uniform(0, 0.2), 10)
 
 def rand_scale_vector():
-    return(rand_scale(), rand_scale(), rand_scale())
+    scale = rand_scale()
+    return(scale, scale, scale)
+
+def unwrap_model(obj):
+    if obj == camera_object:
+        return False
+    context.scene.objects.active = obj
+    bpy.ops.object.mode_set(mode='EDIT')
+    bpy.ops.uv.unwrap()
+    bpy.ops.object.mode_set(mode='OBJECT')
 
 def get_args():
   parser = argparse.ArgumentParser()
@@ -83,41 +110,33 @@ def assign_node_to_output(material, new_node):
 def create_cycles_material():
     material = bpy.data.materials.new('Object Material - ' + str(uuid.uuid1()))
     material.use_nodes = True
-    # nodes = material.node_tree.nodes
-    # new_node = nodes.new(random.choice(SHADERS))
-    # assign_node_to_output(material, new_node)
     return material
 
 def random_texture():
-    texture_path = os.path.expanduser('fixtures/textures/checkered_texture.jpg')
-    # new_texture = bpy.data.textures.new('ColorTex', type = 'IMAGE')
+    texture_folder_path = os.path.dirname(__file__).replace('lib/glitch3d/bpy', 'fixtures/textures/')
+    texture_path = texture_folder_path + random.choice(os.listdir(texture_folder_path))
     return bpy.data.images.load(texture_path)
-    # rand.choice()
 
 def assign_texture_to_material(material, texture):
     assert material.use_nodes == True
     # If its a default material
     bsdf_node = material.node_tree.nodes['Diffuse BSDF']
-    assign_node_to_output(material, bsdf_node)
     texture_node = material.node_tree.nodes.new('ShaderNodeTexImage')
-    uv_node = material.node_tree.nodes.new('ShaderNodeUVMap')
-    # uv_node.uv_map = 'UV'
     texture_node.image = texture
-    material.node_tree.links.new(texture_node.outputs[0], bsdf_node.inputs[0])
-    material.node_tree.links.new(texture_node.inputs['Vector'], uv_node.outputs['UV'])
+    material.node_tree.links.new(texture_node.outputs['Color'], bsdf_node.inputs['Color'])
 
-def make_object_gold(object):
+def make_object_gold(obj):
     material = bpy.data.materials.new('Gold Material - ' + str(uuid.uuid1()))
     material.use_nodes = True
     glossy_node = material.node_tree.nodes.new('ShaderNodeBsdfGlossy')
     glossy_node.inputs[0].default_value = YELLOW
     # roughness
-    glossy_node.inputs[1].default_value = 0.1
+    glossy_node.inputs[1].default_value = 0.2
     assign_node_to_output(material, glossy_node)
-    assign_material(object, material)
+    assign_material(obj, material)
 
-def make_object_reflector(object):
-    object.scale = (REFLECTOR_SCALE, REFLECTOR_SCALE, REFLECTOR_SCALE)
+def make_object_reflector(obj):
+    obj.scale = (REFLECTOR_SCALE, REFLECTOR_SCALE, REFLECTOR_SCALE)
     emissive_material = bpy.data.materials.new('Emissive Material #' + str(index))
     emissive_material.use_nodes = True
     emission_node = emissive_material.node_tree.nodes.new('ShaderNodeEmission')
@@ -126,4 +145,15 @@ def make_object_reflector(object):
     # Set strength
     emission_node.inputs[1].default_value = REFLECTOR_STRENGTH
     assign_node_to_output(emissive_material, emission_node)
-    assign_material(object, emissive_material)
+    assign_material(obj, emissive_material)
+
+def texture_object(obj):
+    new_material = create_cycles_material()
+    assign_texture_to_material(new_material, random_texture())
+    assign_material(obj, new_material)
+
+def duplicate_object(obj):
+    new_object = obj.copy()
+    new_object.data = obj.data.copy()
+    context.scene.objects.link(new_object)
+    return new_object

data/lib/glitch3d/bpy/rendering.py

@@ -9,21 +9,8 @@
 # 4) Rotate model and shoot image at each step
 #
 # Use `debug()` to pry into the script
-
-import bpy
 import os
-import argparse
-import datetime
-import bmesh
-import random
-import code
-import math
-import mathutils
-import random
-import uuid
-import sys
-
-exec(open("lib/glitch3d/bpy/helpers.py").read())
+exec(open(os.path.join(os.path.dirname(__file__), 'helpers.py')).read())
 
 # Arguments parsing
 args = get_args()
@@ -33,12 +20,6 @@ shots_number = int(args.shots_number)
 
 context = bpy.context
 
-REFLECTOR_SCALE = 5
-REFLECTOR_STRENGTH = 12
-REFLECTOR_LOCATION_PADDING = 10
-PROPS_NUMBER = 100
-SHADERS = ['ShaderNodeBsdfGlossy', 'ShaderNodeBsdfDiffuse', 'ShaderNodeBsdfVelvet', 'ShaderNodeEmission']
-
 # Scene
 new_scene = bpy.data.scenes.new("Automated Render Scene")
 bpy.ops.scene.delete() # Delete old scene
@@ -60,16 +41,45 @@ if mode == 'high':
     context.scene.cycles.samples = 100
     context.scene.render.resolution_percentage = 100
 
+# Add background to world
+texture_path = os.path.expanduser('fixtures/textures/checkered_texture.jpg')
+world = bpy.data.worlds[0]
+world.use_nodes = True
+world_node_tree = world.node_tree
+output_node = world_node_tree.nodes['Background']
+texture_node = world_node_tree.nodes.new('ShaderNodeTexImage')
+world_node_tree.links.new(texture_node.outputs['Color'], output_node.inputs['Color'])
+texture_node.image = bpy.data.images.load(texture_path)
 
 # Delete current objects
-for index, object in enumerate(bpy.data.objects):
-    bpy.data.objects.remove(object)
+for index, obj in enumerate(bpy.data.objects):
+    bpy.data.objects.remove(obj)
 
 # Load model
 model_path = os.path.join(file)
 bpy.ops.import_scene.obj(filepath = model_path, use_edges=True)
 model_object = bpy.data.objects[0]
 
+# Load props
+bpy.ops.import_scene.obj(filepath = os.path.join('fixtures/m4a1.obj'), use_edges=True)
+m4a1 = bpy.data.objects['m4a1']
+texture_object(m4a1)
+m4a1.location = rand_location()
+m4a1.scale = rand_scale_vector()
+m4a1.rotation_euler = rand_rotation()
+
+bpy.ops.mesh.primitive_cube_add(location=rand_location(),radius=rand_scale(), rotation=rand_rotation())
+cube = bpy.data.objects['Cube']
+texture_object(cube)
+
+bpy.ops.mesh.primitive_torus_add(location=rand_location(), rotation=rand_rotation(), major_radius=rand_scale(), minor_radius=rand_scale())
+torus = bpy.data.objects['Torus']
+texture_object(torus)
+
+bpy.ops.mesh.primitive_cone_add(location=rand_location(), depth=1.0, rotation=rand_rotation(), radius1=rand_scale(), radius2=rand_scale())
+cone = bpy.data.objects['Cone']
+texture_object(cone)
+
 # Use center of mass to center object
 model_object.select = True
 bpy.ops.object.origin_set(type="ORIGIN_CENTER_OF_MASS")
@@ -84,8 +94,6 @@ camera_object = bpy.data.objects['Render Camera']
 new_scene.objects.link(camera_object)
 camera_object.location = (8, 8, 1)
 
-empty_materials()
-
 # Add reflectors
 bpy.ops.mesh.primitive_plane_add(location=(0,8 + REFLECTOR_LOCATION_PADDING, 0))
 bpy.ops.mesh.primitive_plane_add(location=(8 + REFLECTOR_LOCATION_PADDING,0,0))
@@ -108,110 +116,41 @@ for plane in [plane1, plane2, plane3]:
     make_object_reflector(plane)
 
 # Make floor
-bpy.ops.mesh.primitive_plane_add(location=(0,0,-2))
+bpy.ops.mesh.primitive_plane_add(calc_uvs=True, location=(0,0,-2))
 floor = bpy.data.objects['Plane.003']
-floor.scale = (8,8,8)
-floor_material = create_cycles_material()
-assign_texture_to_material(floor_material, random_texture())
-assign_material(floor, floor_material)
-
-# Add props
-props = []
-
-for index in range(0, int(PROPS_NUMBER)):
-    bpy.ops.mesh.primitive_cube_add(location=rand_location(),radius=rand_scale(), rotation=rand_rotation())
-    if index == 0:
-        object_name = 'Cube'
-    elif index > 9:
-        object_name = 'Cube.0' + str(index)
-    elif index > 99:
-        object_name = 'Cube.' + str(index)
-    else:
-        object_name = 'Cube.00' + str(index)
-    object = bpy.data.objects[object_name]
-    props.append(object)
-    new_material = create_cycles_material()
-    assign_texture_to_material(new_material, random_texture())
-    assign_material(object, new_material)
-
-for index in range(0, int(PROPS_NUMBER)):
-    bpy.ops.mesh.primitive_torus_add(location=rand_location(), rotation=rand_rotation(), major_radius=rand_scale(), minor_radius=rand_scale())
-    if index == 0:
-        object_name = 'Torus'
-    elif index > 9:
-        object_name = 'Torus.0' + str(index)
-    elif index > 99:
-        object_name = 'Torus.' + str(index)
-    else:
-        object_name = 'Torus.00' + str(index)
-    object = bpy.data.objects[object_name]
-    props.append(object)
-    new_material = create_cycles_material()
-    assign_texture_to_material(new_material, random_texture())
-    assign_material(object, new_material)
-
-for index in range(0, int(PROPS_NUMBER)):
-    bpy.ops.mesh.primitive_cone_add(location=rand_location(), depth=1.0, rotation=rand_rotation(), radius1=rand_scale(), radius2=rand_scale())
-    if index == 0:
-        object_name = 'Cone'
-    elif index > 9:
-        object_name = 'Cone.0' + str(index)
-    elif index > 99:
-        object_name = 'Cone.' + str(index)
-    else:
-        object_name = 'Cone.00' + str(index)
-    object = bpy.data.objects[object_name]
-    props.append(object)
-    new_material = create_cycles_material()
-    assign_texture_to_material(new_material, random_texture())
-    assign_material(object, new_material)
+floor.scale = (20,20,20)
+texture_object(floor)
+
+# Add more props
+for index in range(1, int(PROPS_NUMBER)):
+    new_object = duplicate_object(cube)
+    props.append(new_object)
+    new_object.location = rand_location()
+    texture_object(new_object)
+
+for index in range(1, int(PROPS_NUMBER)):
+    new_object = duplicate_object(torus)
+    props.append(new_object)
+    new_object.location = rand_location()
+    texture_object(new_object)
+
+for index in range(1, int(PROPS_NUMBER)):
+    new_object = duplicate_object(cone)
+    props.append(new_object)
+    new_object.location = rand_location()
+    texture_object(new_object)
 
 # Import guns
-for index in range(0, 5):
-    model_path_m4a1 = os.path.join('fixtures/m4a1.obj')
-    bpy.ops.import_scene.obj(filepath = model_path_m4a1, use_edges=True)
-    if index == 0:
-        object_name = 'm4a1'
-    elif index > 9:
-        object_name = 'm4a1.0' + str(index)
-    elif index > 99:
-        object_name = 'm4a1.' + str(index)
-    else:
-        object_name = 'm4a1.00' + str(index)
-    object = bpy.data.objects[object_name]
-    props.append(object)
-    object.location = rand_location()
-    object.scale = rand_scale_vector()
-    object.rotation_euler = rand_rotation()
-    new_material = create_cycles_material()
-    assign_texture_to_material(new_material, random_texture())
-    assign_material(object, new_material)
+for index in range(1, 5):
+    new_object = duplicate_object(m4a1)
+    props.append(new_object)
+    new_object.location = rand_location()
+    new_object.scale = rand_scale_vector()
+    new_object.rotation_euler = rand_rotation()
+    texture_object(new_object)
 
-# Add background to world
-world = bpy.data.worlds[0]
-world.use_nodes = True
-world_node_tree = world.node_tree
-gradient_node = world_node_tree.nodes.new(type="ShaderNodeTexGradient")
-texture_node = world_node_tree.nodes.new(type="ShaderNodeTexGradient")
-
-output_node = world_node_tree.nodes['Background']
-texture_node = world_node_tree.nodes.new('ShaderNodeTexture')
-world_node_tree.links.new(texture_node.outputs[0], output_node.inputs[0])
-texture_path = os.path.expanduser('fixtures/textures/25.jpg')
-new_texture = bpy.data.textures.new('ColorTex', type = 'IMAGE')
-new_texture.image = bpy.data.images.load(texture_path)
-texture_node.texture = new_texture
-
-background_node = world_node_tree.nodes['Background']
-world_node_tree.links.new(gradient_node.outputs['Color'], background_node.inputs['Color'])
-gradient_node.gradient_type = 'EASING'
-
-bpy.ops.object.mode_set(mode='EDIT')
-# UV unwrap objects
 for model in bpy.data.objects:
-    context.scene.objects.active = model
-    bpy.ops.uv.unwrap()
-bpy.ops.object.mode_set(mode = 'OBJECT')
+    unwrap_model(model)
 
 # ------
 # Shoot

data/lib/glitch3d/version.rb

@@ -1,3 +1,3 @@
 module Glitch3d
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/glitch3d.rb

@@ -13,7 +13,7 @@ module Glitch3d
   BOUNDARY_LIMIT = 4 # Contain model within 2x2x2 cube
 
   BLENDER_EXECUTABLE_PATH = ENV['BLENDER_EXECUTABLE_PATH'].freeze
-  RENDERING_SCRIPT_PATH = "lib/glitch3d/bpy/rendering.py".freeze
+  RENDERING_SCRIPT_PATH = File.dirname(__FILE__) + '/glitch3d/bpy/rendering.py'
 
   def clean_model(source_file)
     self.class.include Glitch3d::None

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitch3d
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - pskl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,36 +91,11 @@ files:
 - fixtures/m4a1.obj
 - fixtures/male_head.obj
 - fixtures/skull.obj
-- fixtures/textures/00.jpg
-- fixtures/textures/01.jpg
-- fixtures/textures/02.jpg
-- fixtures/textures/03.jpg
-- fixtures/textures/04.jpg
-- fixtures/textures/05.jpg
-- fixtures/textures/06.jpg
-- fixtures/textures/07.jpg
-- fixtures/textures/08.jpg
-- fixtures/textures/09.jpg
-- fixtures/textures/10.jpg
-- fixtures/textures/11.jpg
-- fixtures/textures/12.jpg
-- fixtures/textures/13.jpg
-- fixtures/textures/14.jpg
-- fixtures/textures/15.jpg
-- fixtures/textures/16.jpg
-- fixtures/textures/17.jpg
-- fixtures/textures/18.jpg
-- fixtures/textures/19.jpg
-- fixtures/textures/20.jpg
-- fixtures/textures/21.jpg
-- fixtures/textures/22.jpg
-- fixtures/textures/23.jpg
-- fixtures/textures/24.jpg
-- fixtures/textures/25.jpg
-- fixtures/textures/27.jpg
-- fixtures/textures/28.jpg
-- fixtures/textures/29.jpg
-- fixtures/textures/30.jpg
+- fixtures/textures/checkered_texture.jpg
+- fixtures/textures/clouds.jpg
+- fixtures/textures/flowers.jpg
+- fixtures/textures/flowers1.jpg
+- fixtures/textures/granite.jpg
 - glitch3d.gemspec
 - lib/glitch3d.rb
 - lib/glitch3d/bpy/helpers.py