glitch3d 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ab2d06c3a8af4e43f252d1aa2342209c4e8b921
-  data.tar.gz: 25ee7f24892d01b73f2bd82d6a978656c15fd87c
+  metadata.gz: 1793293a1331bc23dd4107bd664cb3a58c94e08f
+  data.tar.gz: 75032fca2f9644099ffec1691c9e9e43eff88dd1
 SHA512:
-  metadata.gz: 266c53f8b005835192605ac3c2238f088ed61102d0efbb0c040c7f081e35c4734ab4e6bcbfd451ace3a772e131eab6a3b7ecae083f6d503dcaf9e3666c6dee72
-  data.tar.gz: 1d4618d047a7306437c05443423df5eab85ae9eedae7bf434c28eab9db50b8ef1647577aca463a1321eddced851ebbf2a5dab905c0c36012e13988b8699d64fc
+  metadata.gz: 41b1e28a7a1025348d6d8238b11f5c5e7fc336967690b34cba59c037722dac80adfcab55e58c4290e18de1b9df7db9ab408300e87adab03a97e9ab0d431bed73
+  data.tar.gz: b5020f50d233c5c863b4a6345b2cc9042022e6ac647d23943b6faadaf2996bb343ba106b06e46930c5190e88adc8afc5510ee2cb5b0765b4984bce8ca0681341

data/README.md

@@ -2,22 +2,13 @@
 
 By altering .obj file data you can get something like this :
 
-<img style="width:70%;height:70%;display:block;margin: 0 auto;" src="https://raw.githubusercontent.com/pskl/glitch3d/master/fixtures/demo.png">
+<img src="https://raw.githubusercontent.com/pskl/glitch3d/master/fixtures/demo.png" width="400">
 
-## Disclaimer
+This gem uses the Blender Python API to produces renders headlessly.
 
-Work in progress. The gem is not usable at the moment.
-Rationale: Model data manipulation is done in ruby, while anything related to the rendering process is done in Python using the Blender API.
-Usage
----
-- `3dglitch source_file_name` (a .obj file)
+## Warning
 
-## A quick note on the .obj file format
-
-- v -> represents a vertice position
-- f -> represents a face (contains references to vertices, can be triangle, quad...)
-- vt -> texture UV map
-- vn -> vertex normal
+Setting `BLENDER_EXECUTABLE_PATH` in your environment is required.
 
 ## Installation
 
@@ -37,7 +28,12 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+- `glitch3d file.obj`
+
+Options:
+- `mode` : (localized|default|none)
+- `shots-number` : integer representing the number of - images desired
+- `quality` : (high|low)
 
 ## Development
 
@@ -53,3 +49,6 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+
+## TODO
+- write specs

data/lib/glitch3d.rb

@@ -1,31 +1,40 @@
 require "glitch3d/version"
 require "glitch3d/objects/vertex"
 require "glitch3d/objects/face"
-require "glitch3d/strategies/default"
-require "glitch3d/strategies/localized"
-require "pry"
+require 'pry'
+Dir[File.dirname(__FILE__) + '/glitch3d/strategies/*.rb'].each {|file| require file }
 
 module Glitch3d
-  VERTEX_GLITCH_ITERATION_RATIO = 0.001
+  VERTEX_GLITCH_ITERATION_RATIO = 0.1
   VERTEX_GLITCH_OFFSET = 1
 
-  FACE_GLITCH_ITERATION_RATIO = 0.0
+  FACE_GLITCH_ITERATION_RATIO = 0.1
   FACE_GLITCH_OFFSET = 0.5
   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
 
+  def clean_model(source_file)
+    self.class.include Glitch3d::None
+    base_file_name = source_file.gsub(/.obj/, '')
+    model_name = File.basename(source_file, '.obj')
+    target_file = base_file_name + '.obj'
+    create_glitched_file(glitch(read_source(source_file)), target_file, model_name)
+  end
+
   def process_model(source_file)
-    raise 'Set Blender executable path in your env variables before using glitch3d' unless BLENDER_EXECUTABLE_PATH.present?
     args = Hash[ARGV.join(' ').scan(/--?([^=\s]+)(?:=(\S+))?/)]
+    return clean_model(source_file) if args["clean"]
+    raise 'Set Blender executable path in your env variables before using glitch3d' if BLENDER_EXECUTABLE_PATH.nil?
     self.class.include infer_strategy(args["mode"] || 'default')
     @quality = args["quality"] || 'low'
     source_file = source_file
     base_file_name = source_file.gsub(/.obj/, '')
+    model_name = File.basename(source_file, '.obj')
     target_file = base_file_name + '_glitched.obj'
-    boundaries = create_glitched_file(glitch(read_source(source_file)), target_file)
-    render(target_file, boundaries, args["shots-number"] || 6) unless args["no-render"]
+    create_glitched_file(glitch(read_source(source_file)), target_file, model_name)
+    render(target_file, args["shots-number"] || 6) unless args["no-render"]
   end
 
   def infer_strategy(mode)
@@ -90,7 +99,7 @@ module Glitch3d
     array[rand(0..array.size - 1)]
   end
 
-  def create_glitched_file(content_hash, target_file)
+  def create_glitched_file(content_hash, target_file, model_name)
     boundaries = Vertex.boundaries(content_hash[:vertices])
     puts boundaries.to_s
     while rescale_needed?(boundaries)
@@ -101,22 +110,21 @@ module Glitch3d
     puts boundaries.to_s
     File.open(target_file, 'w') do |f|
       f.puts '# Data corrupted with glitch3D script'
-      f.puts '# Boundaries: ' +  boundaries.to_s
+      f.puts '# Boundaries: ' + boundaries.to_s
       f.puts ''
-      f.puts 'g Glitch3D'
+      f.puts "g #{model_name}"
       f.puts ''
       f.puts content_hash[:vertices].map(&:to_s)
       f.puts ''
       f.puts content_hash[:faces].map(&:to_s).compact
     end
-    boundaries
   end
 
   def rescale_needed?(boundaries)
     boundaries.flatten.map(&:abs).max.abs > BOUNDARY_LIMIT
   end
 
-  def render(file_path, boundaries, shots_number)
+  def render(file_path, shots_number)
     args = [
       BLENDER_EXECUTABLE_PATH,
       '-b',

data/lib/glitch3d/bpy/helpers.py

@@ -1,3 +1,9 @@
+YELLOW = (1,0.7,0.1,1)
+
+def debug():
+    code.interact(local=dict(globals(), **locals()))
+    sys.exit("Aborting execution")
+
 # Helper methods
 def look_at(camera_object, point):
     location_camera = camera_object.matrix_world.to_translation()
@@ -7,9 +13,8 @@ def look_at(camera_object, point):
     camera_object.rotation_euler = rot_quat.to_euler()
 
 def empty_materials():
-    mats = bpy.data.materials
-    for mat in mats.keys():
-        mats.remove(mats[mat])
+    for material in bpy.data.materials.keys():
+        bpy.data.materials.remove(object.data.materials[material])
 
 def shoot(camera, model_object, filepath):
     look_at(camera, model_object)
@@ -42,21 +47,21 @@ def rand_color_vector():
     return (rand_color_value(), rand_color_value(), rand_color_value(), 1)
 
 def rand_scale():
-    return round(random.uniform(0, 0.3), 10)
+    return round(random.uniform(0, 0.15), 10)
+
+def rand_scale_vector():
+    return(rand_scale(), rand_scale(), rand_scale())
 
 def get_args():
   parser = argparse.ArgumentParser()
-
   # get all script args
   _, all_arguments = parser.parse_known_args()
   double_dash_index = all_arguments.index('--')
   script_args = all_arguments[double_dash_index + 1: ]
-
   # add parser rules
   parser.add_argument('-f', '--file', help="obj file to render")
   parser.add_argument('-n', '--shots-number', help="number of shots desired")
   parser.add_argument('-m', '--mode', help="quality mode: low | high")
-
   parsed_script_args, _ = parser.parse_known_args(script_args)
   return parsed_script_args
 
@@ -74,24 +79,51 @@ def assign_node_to_output(material, new_node):
     output_node = material.node_tree.nodes['Material Output']
     material.node_tree.links.new(new_node.outputs[0], output_node.inputs['Surface'])
 
+# Returns a new Cycles material with default DiffuseBsdf node linked to output
 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)
+    # nodes = material.node_tree.nodes
+    # new_node = nodes.new(random.choice(SHADERS))
+    # assign_node_to_output(material, new_node)
     return material
 
-def assign_random_texture_to_material(material):
+def random_texture():
+    texture_path = os.path.expanduser('fixtures/textures/checkered_texture.jpg')
+    # new_texture = bpy.data.textures.new('ColorTex', type = 'IMAGE')
+    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('ShaderNodeTexture')
+    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])
-    # code.interact(local=dict(globals(), **locals()))
-    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
+    material.node_tree.links.new(texture_node.inputs['Vector'], uv_node.outputs['UV'])
+
+def make_object_gold(object):
+    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
+    assign_node_to_output(material, glossy_node)
+    assign_material(object, material)
+
+def make_object_reflector(object):
+    object.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')
+    # Set color
+    emission_node.inputs[0].default_value = rand_color_vector()
+    # Set strength
+    emission_node.inputs[1].default_value = REFLECTOR_STRENGTH
+    assign_node_to_output(emissive_material, emission_node)
+    assign_material(object, emissive_material)

data/lib/glitch3d/bpy/rendering.py

@@ -8,7 +8,7 @@
 # 3) Create camera
 # 4) Rotate model and shoot image at each step
 #
-# Use `code.interact(local=dict(globals(), **locals()))` to pry into the script
+# Use `debug()` to pry into the script
 
 import bpy
 import os
@@ -21,6 +21,7 @@ import math
 import mathutils
 import random
 import uuid
+import sys
 
 exec(open("lib/glitch3d/bpy/helpers.py").read())
 
@@ -36,7 +37,7 @@ REFLECTOR_SCALE = 5
 REFLECTOR_STRENGTH = 12
 REFLECTOR_LOCATION_PADDING = 10
 PROPS_NUMBER = 100
-SHADERS = ['ShaderNodeBsdfGlossy', 'ShaderNodeBsdfDiffuse', 'ShaderNodeBsdfVelvet']
+SHADERS = ['ShaderNodeBsdfGlossy', 'ShaderNodeBsdfDiffuse', 'ShaderNodeBsdfVelvet', 'ShaderNodeEmission']
 
 # Scene
 new_scene = bpy.data.scenes.new("Automated Render Scene")
@@ -56,13 +57,18 @@ context.scene.render.image_settings.file_format='PNG'
 
 if mode == 'high':
     context.scene.render.image_settings.compression = 90
-    context.scene.cycles.samples = 500
+    context.scene.cycles.samples = 100
     context.scene.render.resolution_percentage = 100
 
+
+# Delete current objects
+for index, object in enumerate(bpy.data.objects):
+    bpy.data.objects.remove(object)
+
 # Load model
 model_path = os.path.join(file)
 bpy.ops.import_scene.obj(filepath = model_path, use_edges=True)
-model_object = bpy.data.objects['Glitch3D']
+model_object = bpy.data.objects[0]
 
 # Use center of mass to center object
 model_object.select = True
@@ -76,37 +82,42 @@ camera_data = bpy.data.cameras.new('Render Camera')
 bpy.data.objects.new('Render Camera', object_data=camera_data)
 camera_object = bpy.data.objects['Render Camera']
 new_scene.objects.link(camera_object)
-camera_object.location = (8, 8, 0)
+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))
+bpy.ops.mesh.primitive_plane_add(location=(0, 0, 8))
 
 plane1 = bpy.data.objects['Plane']
 plane2 = bpy.data.objects['Plane.001']
+plane3 = bpy.data.objects['Plane.002']
 
 # Adjust camera
 context.scene.camera = camera_object
 look_at(camera_object, model_object)
-assign_material(model_object, create_cycles_material())
-
-for index, plane in enumerate([plane1, plane2]):
-    plane.scale = (REFLECTOR_SCALE, REFLECTOR_SCALE, REFLECTOR_SCALE)
-    plane.rotation_euler.x += math.radians(90)
-    emissive_material = bpy.data.materials.new('Emissive Material #' + str(index))
-    emissive_material.use_nodes = True
-    emission_node = emissive_material.node_tree.nodes.new('ShaderNodeEmission')
-    # Set color
-    emission_node.inputs[0].default_value = rand_color_vector()
-    # Set strength
-    emission_node.inputs[1].default_value = REFLECTOR_STRENGTH
-    assign_node_to_output(emissive_material, emission_node)
-    assign_material(plane, emissive_material)
-
-# Tilt one of the reflectors
+make_object_gold(model_object)
+
+plane1.rotation_euler.x += math.radians(90)
+plane2.rotation_euler.x += math.radians(90)
 plane2.rotation_euler.z += math.radians(90)
 
-# Add other elements
+for plane in [plane1, plane2, plane3]:
+    make_object_reflector(plane)
+
+# Make floor
+bpy.ops.mesh.primitive_plane_add(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:
@@ -118,35 +129,90 @@ for index in range(0, int(PROPS_NUMBER)):
     else:
         object_name = 'Cube.00' + str(index)
     object = bpy.data.objects[object_name]
+    props.append(object)
     new_material = create_cycles_material()
-    assign_random_texture_to_material(new_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_circle_add(location=rand_location(),radius=rand_scale(), rotation=rand_rotation())
+    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 = 'Circle'
+        object_name = 'Torus'
     elif index > 9:
-        object_name = 'Circle.0' + str(index)
+        object_name = 'Torus.0' + str(index)
     elif index > 99:
-        object_name = 'Circle.' + str(index)
+        object_name = 'Torus.' + str(index)
     else:
-        object_name = 'Circle.00' + str(index)
+        object_name = 'Torus.00' + str(index)
     object = bpy.data.objects[object_name]
+    props.append(object)
     new_material = create_cycles_material()
-    assign_random_texture_to_material(new_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)
+
+# 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)
 
 # Add background to world
 world = bpy.data.worlds[0]
 world.use_nodes = True
 world_node_tree = world.node_tree
-# code.interact(local=dict(globals(), **locals()))
 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')
+
 # ------
 # Shoot
 # ------
@@ -154,6 +220,8 @@ print('Rendering images with resolution: ' + str(context.scene.render.resolution
 for index in range(0, int(shots_number)):
     print("-------------------------- " + str(index) + " --------------------------")
     rotate(model_object, index)
+    for prop in props:
+        prop.rotation_euler = rand_rotation()
     shoot(camera_object, model_object, output_name(index, model_path))
 
 print('FINISHED ¯\_(ツ)_/¯')

data/lib/glitch3d/strategies/localized.rb

@@ -15,7 +15,7 @@ module Glitch3d
     end
 
     def selected_area(vertices_objects_array)
-      Vertex.subset(x: :negative?, y: :positive?, z: :zero?, vertex_list: vertices_objects_array)
+      Vertex.subset(x: :positive?, y: :positive?, z: :positive?, vertex_list: vertices_objects_array)
     end
 
     def target(vertices_objects_array)

data/lib/glitch3d/strategies/none.rb

@@ -0,0 +1,11 @@
+module Glitch3d
+  module None
+    def alter_vertices(vertices_objects_array)
+      vertices_objects_array
+    end
+
+    def alter_faces(faces_objects_array, _)
+      faces_objects_array
+    end
+  end
+end

data/lib/glitch3d/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitch3d
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - pskl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,7 @@ files:
 - lib/glitch3d/objects/vertex.rb
 - lib/glitch3d/strategies/default.rb
 - lib/glitch3d/strategies/localized.rb
+- lib/glitch3d/strategies/none.rb
 - lib/glitch3d/version.rb
 homepage: http://pascal.cc
 licenses: