glitch3d 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b65aeea3897aebf558caa04c761a9bfc7c76a10f
-  data.tar.gz: b86201369d5bbd5bcf69d8ef13cb2d3ce9dd941b
+  metadata.gz: d1e35aa80a88a44932933cf304f139440a8bd6d8
+  data.tar.gz: 264d26898524291db0ec8423353d3af45923f0b8
 SHA512:
-  metadata.gz: b95f0df53586a2049dc1a178feb8d90d2fc6848e0537d7147ebea096a0be5505eb6544ba7c0a49bb234ddc0d4aa6fd07a8bf0abbf6b5847483d3e6e09ab918ed
-  data.tar.gz: 62ab5d1abe93abf1568e60de4a845226682d7c85b116b8ba0d0bf0a12b498886c4a8f1b0ae1af3c463a7253b07599bb732ae22939cabbd3c92534a97b7295d13
+  metadata.gz: 9be85c9ec9d29dc376a31f9e3745dfb5cdf0f94d0eac46278b68aad77edf0894be480b5315cc9f0291d2fe69f3d9ea6e672ac2d6dd50cbe0aa1b1d7798b38c37
+  data.tar.gz: 4323ec3551d730d7eac60086ab4aa9c74d1853f550811eb8ca888c3a6e020c8a104304be6c72059b76c67f2adbbc05717a99430ed93c167c745c9b0f4c59682b

data/lib/glitch3d/bpy/helpers.py

@@ -11,6 +11,7 @@ import uuid
 import sys
 import logging
 import string
+import colorsys
 
 REFLECTOR_SCALE = 5
 REFLECTOR_STRENGTH = 12
@@ -19,7 +20,7 @@ WIREFRAME_THICKNESS = 0.008
 DISPLACEMENT_AMPLITUDE = 0.06
 ORIGIN  = (0,0,0)
 
-PRIMITIVES = ['PYRAMID', 'CONE', 'PLANE', 'CUBE', 'ICO']
+PRIMITIVES = ['PYRAMID', 'CUBE']
 props = []
 YELLOW = (1, 0.7, 0.1, 1)
 GREY = (0.2, 0.2, 0.2 ,1)
@@ -61,8 +62,9 @@ def output_name(index, model_path):
 def rotate(model_object, index):
     model_object.rotation_euler[2] = math.radians(index * (360.0 / shots_number))
 
+# RGB 0 -> 1
 def rand_color_value():
-    return round(random.uniform(0.1, 1.0), 10)
+    return random.uniform(0, 255) / 255
 
 def rand_location():
     return (rand_location_value(), rand_location_value(), rand_location_value())
@@ -76,8 +78,8 @@ def rand_rotation_value():
 def rand_location_value():
     return round(random.uniform(-4, 4), 10)
 
-def rand_color_vector():
-    return (rand_color_value(), rand_color_value(), rand_color_value(), 1)
+def rand_color():
+    return random.choice(COLORS)
 
 def rand_scale():
     return round(random.uniform(0, 0.2), 10)
@@ -169,7 +171,7 @@ def make_object_emitter(obj, emission_strength):
     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()
+    emission_node.inputs[0].default_value = rand_color()
     # Set strength
     emission_node.inputs[1].default_value = emission_strength
     assign_node_to_output(emissive_material, emission_node)
@@ -222,8 +224,8 @@ def shuffle(obj):
     obj.rotation_euler = rand_rotation()
 
 def randomize_reflectors_colors():
-    reflector1.data.materials[-1].node_tree.nodes['Emission'].inputs[0].default_value = rand_color_vector()
-    reflector2.data.materials[-1].node_tree.nodes['Emission'].inputs[0].default_value = rand_color_vector()
+    reflector1.data.materials[-1].node_tree.nodes['Emission'].inputs[0].default_value = rand_color()
+    reflector2.data.materials[-1].node_tree.nodes['Emission'].inputs[0].default_value = rand_color()
 
 def add_object(obj, x, y, z, radius):
     infer_primitive(obj, location=(x, y, z), radius=radius)
@@ -298,15 +300,33 @@ def add_ocean(spatial_size, resolution):
     bpy.ops.object.modifier_add(type='OCEAN')
     ocean.modifiers["Ocean"].spatial_size = spatial_size
     ocean.modifiers["Ocean"].resolution = resolution
-    make_object_glossy(ocean, rand_color_vector())
+    make_object_glossy(ocean, rand_color())
     ocean.name = 'Ocean'
     return ocean
 
+# Delete current objects
 def flush_all_objects():
-    # Delete current objects
     for index, obj in enumerate(bpy.data.objects):
         bpy.data.objects.remove(obj)
 
+# Rotate hue to generate palette
+def adjacent_colors(r, g, b, number):
+    angle = (360 / 5) / 360
+    h, l, s = colorsys.rgb_to_hls(r, g, b)
+    hue_positions = []
+    for i in range(number):
+        hue_positions.append(angle * i)
+    h = [(h + offset) % 1 for offset in hue_positions]
+    adjacent = [colorsys.hls_to_rgb(hi, l, s) for hi in h]
+    # add alpha component
+    res = list(map(lambda x: list(x), adjacent))
+    for i in res:
+        i.append(1)
+    return res
+
+def rand_color_palette(number):
+    return adjacent_colors(rand_color_value(), rand_color_value(), rand_color_value(), number)
+
 def build_pyramid(width=1.0, length=1.0, height=1.0, location=ORIGIN):
     verts=[]
     faces=[]

data/lib/glitch3d/bpy/rendering.py

@@ -23,6 +23,7 @@ FIXTURES_FOLDER_PATH = path + '/../fixtures/'
 
 DEBUG = False
 FISHEYE = False
+COLORS = rand_color_palette(5)
 
 if DEBUG:
     shots_number = 2
@@ -111,23 +112,31 @@ if FISHEYE:
 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))
+bpy.ops.mesh.primitive_plane_add(location=(0, 0, -2))
 
-reflector1 = bpy.data.objects['Plane.001']
-reflector2 = bpy.data.objects['Plane.002']
+reflector1 = bpy.data.objects['Plane']
+reflector2 = bpy.data.objects['Plane.001']
+reflector3 = bpy.data.objects['Plane.002']
 
+bpy.data.groups.new('Plane')
+bpy.data.groups['Plane'].objects.link(reflector1)
+bpy.data.groups['Plane'].objects.link(reflector2)
+bpy.data.groups['Plane'].objects.link(reflector3)
+
+reflector2.rotation_euler.x += math.radians(90)
 reflector1.rotation_euler.x += math.radians(90)
-reflector1.rotation_euler.z += math.radians(90)
+reflector2.rotation_euler.z += math.radians(90)
 
 make_object_reflector(reflector1)
 make_object_reflector(reflector2)
+make_object_reflector(reflector3)
 
 # Adjust camera
 context.scene.camera = camera_object
 look_at(camera_object, model_object)
 
 # Make floor
-floor = bpy.data.objects['Plane']
-floor.rotation_euler.x += math.radians(90)
+floor = bpy.data.objects['Plane.003']
 floor.scale = (20,20,20)
 texture_object(floor)
 subdivide(floor, 8)
@@ -161,7 +170,7 @@ for index in range(0, int(shots_number)):
     rotate(model_object, index)
     randomize_reflectors_colors()
     OCEAN.modifiers['Ocean'].time += 1
-    make_object_glossy(OCEAN, rand_color_vector())
+    make_object_glossy(OCEAN, rand_color())
     OCEAN.modifiers['Ocean'].choppiness += 0.3
     for prop in props:
         prop.location = rand_location()

data/lib/glitch3d/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Glitch3d
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitch3d
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - pskl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler