glitch3d 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 688564a4811119581f00dbdbb11be49fa3806ab7
-  data.tar.gz: f83b133f69d6a5d9819594f29db45e653a378901
+  metadata.gz: eab3428beb9ab872707d266ddb1bdc9ffdc69bbb
+  data.tar.gz: b1af5a621c4cfb76a523ede94837d9c82fff1eb2
 SHA512:
-  metadata.gz: 4776bb914bc36b06c585cbdc4b154252929b14b3da310adcd17a3d7625f729fd20a8a60f2660174d6cfd6f5f2462bf5944bc7d59fc7fcadafdf2c8677e0d275b
-  data.tar.gz: 3bcb160eadfb8d633a05c0b2e8f5d60402b62e5c9be5e0a4a3496b42c7493019663bea51ab0118490b666f2e3e00562f6dd5e5e849a629877fc9ff309a95ba66
+  metadata.gz: 6dec0a64750aaa887a880293acdd19b44efde3b4dd15b8622a0da150aa981238f6495b1d983e10094c043c91b87bb6124587c7e3ff19075a89bdd09d5b927f60
+  data.tar.gz: 10c084a6f15c0e80daced25c590d1df1c93432f6e71e603b0596bfe50b12dd48e245352fad13f5d0a9e702bf5032b143aeebcf8586e74790b3868072c4400d55

data/.gitignore

@@ -13,3 +13,4 @@
 !/fixtures/textures/*
 !/fixtures/skull.obj
 .DS_Store
+*.png

data/README.md

@@ -43,7 +43,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/glitch3d. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/pskl/glitch3d. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/glitch3d/bpy/helpers.py

@@ -9,6 +9,7 @@ import mathutils
 import random
 import uuid
 import sys
+import logging
 
 REFLECTOR_SCALE = 5
 REFLECTOR_STRENGTH = 12
@@ -17,6 +18,7 @@ PROPS_NUMBER = 100
 SHADERS = ['ShaderNodeBsdfGlossy', 'ShaderNodeBsdfDiffuse', 'ShaderNodeBsdfVelvet', 'ShaderNodeEmission']
 props = []
 YELLOW = (1,0.7,0.1,1)
+WORDS = ['POWER', 'MONEY', 'SEX', 'BLOOD', 'DOLLARS', 'PSKL', 'SKYNET', 'LOVE']
 
 def debug():
     code.interact(local=dict(globals(), **locals()))
@@ -59,7 +61,7 @@ def rand_rotation_value():
     return round(random.uniform(0, 1), 10)
 
 def rand_location_value():
-    return round(random.uniform(-8, 8), 10)
+    return round(random.uniform(-4, 4), 10)
 
 def rand_color_vector():
     return (rand_color_value(), rand_color_value(), rand_color_value(), 1)
@@ -72,7 +74,7 @@ def rand_scale_vector():
     return(scale, scale, scale)
 
 def unwrap_model(obj):
-    if obj == camera_object:
+    if obj == camera_object or obj.name.startswith('Text'):
         return False
     context.scene.objects.active = obj
     bpy.ops.object.mode_set(mode='EDIT')
@@ -80,17 +82,18 @@ def unwrap_model(obj):
     bpy.ops.object.mode_set(mode='OBJECT')
 
 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
+    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")
+    parser.add_argument('-p', '--path', help="root path of assets")
+    parsed_script_args, _ = parser.parse_known_args(script_args)
+    return parsed_script_args
 
 def camera_rotation_string(camera):
     return str(int(camera.rotation_euler.x)) + ' ' + str(int(camera.rotation_euler.y)) + ' ' + str(int(camera.rotation_euler.z))
@@ -113,8 +116,10 @@ def create_cycles_material():
     return material
 
 def random_texture():
-    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))
+    logging.info('---------')
+    logging.info(texture_folder_path)
+    logging.info('---------')
     return bpy.data.images.load(texture_path)
 
 def assign_texture_to_material(material, texture):
@@ -157,3 +162,20 @@ def duplicate_object(obj):
     new_object.data = obj.data.copy()
     context.scene.objects.link(new_object)
     return new_object
+
+def random_text():
+    return random.choice(WORDS)
+
+def spawn_text():
+    identifier = str(uuid.uuid1())
+    new_curve = bpy.data.curves.new(type="FONT",name="Curve - " + identifier)
+    new_curve.extrude = 0.15
+    new_text = bpy.data.objects.new("Text - " + identifier, new_curve)
+    new_text.data.body = random_text()
+    bpy.context.scene.objects.link(new_text)
+    return new_text
+
+def shuffle(obj):
+    obj.location = rand_location()
+    obj.scale = rand_scale_vector()
+    obj.rotation_euler = rand_rotation()

data/lib/glitch3d/bpy/rendering.py

@@ -19,6 +19,7 @@ mode = args.mode
 shots_number = int(args.shots_number)
 
 context = bpy.context
+texture_folder_path = str(args.path) + '/../fixtures/textures/'
 
 # Scene
 new_scene = bpy.data.scenes.new("Automated Render Scene")
@@ -38,18 +39,14 @@ context.scene.render.image_settings.file_format='PNG'
 
 if mode == 'high':
     context.scene.render.image_settings.compression = 90
-    context.scene.cycles.samples = 100
+    context.scene.cycles.samples = 400
     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)
+world_node_tree.nodes['Background'].inputs[0].default_value = rand_color_vector()
 
 # Delete current objects
 for index, obj in enumerate(bpy.data.objects):
@@ -128,26 +125,19 @@ for index in range(1, int(PROPS_NUMBER)):
     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(1, 5):
     new_object = duplicate_object(m4a1)
     props.append(new_object)
+    shuffle(new_object)
+    texture_object(new_object)
+
+for index in range(1, len(WORDS)):
+    new_object = spawn_text()
+    props.append(new_object)
+    new_object.scale = (0.75, 0.75, 0.75)
     new_object.location = rand_location()
-    new_object.scale = rand_scale_vector()
     new_object.rotation_euler = rand_rotation()
-    texture_object(new_object)
 
 for model in bpy.data.objects:
     unwrap_model(model)

data/lib/glitch3d/version.rb

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

data/lib/glitch3d.rb

@@ -136,7 +136,9 @@ module Glitch3d
       '-n',
       shots_number.to_s,
       '-m',
-      @quality
+      @quality,
+      '-p',
+      File.dirname(__FILE__).to_s
     ]
     unless system(*args)
       fail 'Make sure Blender is correctly installed'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitch3d
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - pskl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,10 +92,6 @@ files:
 - fixtures/male_head.obj
 - fixtures/skull.obj
 - 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