glitch3d 0.2.2.2 → 0.2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 601218ffff3ed8224664f46004c6904e595e1828
-  data.tar.gz: 6af29a322182537cf3276e1167e0f4baed417860
+  metadata.gz: b4f2f6d21ae96e8105a1c6da16f6e1fb2838f1d9
+  data.tar.gz: d9860cd506ad2b7c87ea43f3da5527a0282402c1
 SHA512:
-  metadata.gz: a1a93d53edc0792de77cec65d854788ceb501bc9af3b690a888c526310111b2c53807cda5c2fbf5967994e0cbad30bdd38e840c94f8f37c91d78ff2d5dc53727
-  data.tar.gz: d595211c09ce7ad96715cbee6d438d007deda6178686306a3b39ee82c8ad8ac03927c1abc782c13b71cf4571671af8e96df2bbbbd5847550bea8f13af7292a53
+  metadata.gz: d980c45b765663cd5aa61736b6f79b82b9d75993efec48806e668e800077ab41ec513a4b99ee2b6be7d3a4d21b6df0d6c33bc803992995e24e4b23084e685c7c
+  data.tar.gz: 1db6e37de5e965a3ea6ff0526c4bdfb0be99d1c7782f39668c8c9ea876985ff02ded591c2ec76f5cf3378e0d76e7cbc0065c376b914c1e47e70546331abef6e8

data/lib/glitch3d/bpy/helpers.py

@@ -12,6 +12,7 @@ import sys
 import logging
 import string
 import colorsys
+import numpy
 
 REFLECTOR_SCALE = random.uniform(4, 6)
 REFLECTOR_STRENGTH = random.uniform(8, 12)
@@ -63,7 +64,7 @@ def shoot(animate, 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 './renders/' + os.path.splitext(model_path)[0].split('/')[-1] + '_' + str(index) + '_' + str(datetime.date.today()) + '_' + str(mode) + '.png'
 
 def rotate(model_object, index):
     model_object.rotation_euler[2] = math.radians(index * (360.0 / shots_number))
@@ -81,6 +82,9 @@ def rand_rotation():
 def rand_rotation_value():
     return round(random.uniform(0, 1), 10)
 
+def rand_rotation():
+    return (random.uniform(0, 20), random.uniform(0, 20), random.uniform(0, 20))
+
 def rand_location_value():
     return round(random.uniform(-4, 4), 10)
 
@@ -140,10 +144,11 @@ def random_texture():
 
 def assign_texture_to_material(material, texture):
     assert material.use_nodes == True
-    bsdf_node = material.node_tree.nodes['Diffuse BSDF']
     texture_node = material.node_tree.nodes.new('ShaderNodeTexImage')
+    emission_node = material.node_tree.nodes.new('ShaderNodeEmission')
+    material.node_tree.links.new(texture_node.outputs['Color'], emission_node.inputs['Color'])
     texture_node.image = texture
-    material.node_tree.links.new(texture_node.outputs['Color'], bsdf_node.inputs['Color'])
+    assign_node_to_output(material, emission_node)
 
 def assign_node_to_output(material, new_node):
     assert material.use_nodes == True
@@ -196,6 +201,7 @@ def make_object_gradient_fabulous(obj, color1, color2):
     assign_material(obj, material)
     mixer_node = material.node_tree.nodes.new('ShaderNodeMixRGB')
     gradient_node = material.node_tree.nodes.new('ShaderNodeTexGradient')
+    gradient_node.gradient_type = 'SPHERICAL'
     bsdf_node = material.node_tree.nodes.new('ShaderNodeBsdfDiffuse')
     material.node_tree.links.new(gradient_node.outputs['Fac'], mixer_node.inputs['Fac'])
     material.node_tree.links.new(mixer_node.outputs[0], bsdf_node.inputs['Color'])
@@ -248,6 +254,9 @@ def shuffle(obj):
     obj.scale = rand_scale_vector()
     obj.rotation_euler = rand_rotation()
 
+def series(length):
+    return list(map(lambda x: (0, x, math.cos(x)), numpy.arange(0.0, length, 0.1)))
+
 def randomize_reflectors_colors():
     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()
@@ -301,7 +310,7 @@ def build_object_line(obj, size, z_index, y_index, radius):
         new_obj.location = ((last_object_group(obj).location.x + 2 * radius), y_index, z_index)
 
 # Displace vertex by random offset
-def displace(vector):
+def displace_vector(vector):
     return mathutils.Vector((vector.x + random.uniform(-DISPLACEMENT_AMPLITUDE, DISPLACEMENT_AMPLITUDE), vector.y + random.uniform(-DISPLACEMENT_AMPLITUDE, DISPLACEMENT_AMPLITUDE), vector.z + random.uniform(-DISPLACEMENT_AMPLITUDE, DISPLACEMENT_AMPLITUDE)))
 
 # Replace vertex coordinate everywhere
@@ -314,6 +323,12 @@ def glitch(object):
     for vertex in object.data.vertices:
         vertex.co = find_and_replace(vertex.co)
 
+def displace(object):
+    bpy.ops.object.mode_set(mode='OBJECT')
+    assert object.type == 'MESH'
+    for vertex in object.data.vertices:
+        vertex.co = displace_vector(vertex.co)
+
 def subdivide(object, cuts):
     if context.scene.objects.active != object:
         context.scene.objects.active = object
@@ -322,6 +337,13 @@ def subdivide(object, cuts):
     for index in range(0, cuts):
         bpy.ops.mesh.subdivide(cuts)
 
+def clone(obj):
+    new_obj = obj.copy()
+    new_obj.data = obj.data.copy()
+    new_obj.animation_data_clear()
+    context.scene.objects.link(new_obj)
+    return new_obj
+
 def add_ocean(spatial_size, resolution):
     bpy.ops.mesh.primitive_cube_add(location=(0, 0, -1),radius=1)
     ocean = last_added_object('CUBE')
@@ -333,7 +355,11 @@ def add_ocean(spatial_size, resolution):
     make_object_glossy(ocean, rand_color())
     make_object_gradient_fabulous(ocean, rand_color(), rand_color())
     mix_nodes(ocean.data.materials[0], ocean.data.materials[0].node_tree.nodes['Diffuse BSDF'], ocean.data.materials[0].node_tree.nodes['Glossy BSDF'])
-    ocean.name = 'Ocean'
+    shadow = clone(ocean)
+    shadow.location.x += 3
+    wireframize(shadow)
+    shadow.name = 'ocean'
+    ocean.name = 'ocean'
     return ocean
 
 # Delete current objects
@@ -377,12 +403,15 @@ def build_pyramid(width=random.uniform(1,3), length=random.uniform(1,3), height=
 def dance_routine():
     camera_object.location.x = INITIAL_CAMERA_LOCATION[0] + round(random.uniform(-2, 2), 10)
     camera_object.location.y = INITIAL_CAMERA_LOCATION[1] + round(random.uniform(-2, 2), 10)
-    look_at(camera_object, model_object)
     randomize_reflectors_colors()
     OCEAN.modifiers['Ocean'].time += 1
     OCEAN.modifiers['Ocean'].random_seed = round(random.uniform(0, 100))
     make_object_glossy(OCEAN, rand_color())
     OCEAN.modifiers['Ocean'].choppiness += 0.3
+    rotate(model_object, index)
+    for l in bpy.data.groups['Lines'].objects:
+        rotation = rand_rotation()
+        l.rotation_euler = rotation
     for prop in props:
         prop.location = rand_location()
         prop.rotation_euler = rand_rotation()
@@ -392,4 +421,22 @@ def dance_routine():
         obj.rotation_euler.z += math.radians(round(random.uniform(0, 90)))
     for display in bpy.data.groups['Displays'].objects:
         display.location = rand_location()
-
+        rotate(display, index)
+
+def create_line(name, point_list, thickness = 0.002, location = (0, -10, 0)):
+    # setup basic line data
+    line_data = bpy.data.curves.new(name=name,type='CURVE')
+    line_data.dimensions = '3D'
+    line_data.fill_mode = 'FULL'
+    line_data.bevel_depth = thickness
+    # define points that make the line
+    polyline = line_data.splines.new('POLY')
+    polyline.points.add(len(point_list)-1)
+    for idx in range(len(point_list)):
+        polyline.points[idx].co = (point_list[idx])+(1.0,)
+    # create an object that uses the linedata
+    line = bpy.data.objects.new('LineOne', line_data)
+    bpy.context.scene.objects.link(line)
+    line.location = location
+    make_object_emitter(line, 0.8)
+    return line

data/lib/glitch3d/bpy/rendering.py

@@ -22,11 +22,12 @@ shots_number = int(args.shots_number)
 FIXTURES_FOLDER_PATH = path + '/../fixtures/'
 
 DEBUG = False
-FISHEYE = False
+FISHEYE = True
 COLORS = rand_color_palette(5)
-INITIAL_CAMERA_LOCATION = (8, 8, 1)
+INITIAL_CAMERA_LOCATION = (4, 4, 1)
 ANIMATE = False
 
+# DEBUG = True
 if DEBUG:
     shots_number = 2
     import os
@@ -46,8 +47,8 @@ for primitive in PRIMITIVES:
     bpy.data.groups.new(primitive.lower().title())
 
 # Render settings
-context.scene.render.resolution_x = 1920
-context.scene.render.resolution_y = 1080
+context.scene.render.resolution_x = 2000
+context.scene.render.resolution_y = 2000
 context.scene.render.engine = 'CYCLES'
 context.scene.render.resolution_percentage = 25
 # uncomment if GPU
@@ -63,7 +64,9 @@ if mode == 'high':
     context.scene.render.resolution_percentage = 100
 
 # Add background to world
-bpy.data.worlds.remove(bpy.data.worlds[0])
+
+# This shit doesnt work in v 2.76
+# bpy.data.worlds.remove(bpy.data.worlds[0])
 world = bpy.data.worlds.new('A Brave New World')
 world.use_nodes = True
 world_node_tree = world.node_tree
@@ -107,15 +110,15 @@ camera_object.location = INITIAL_CAMERA_LOCATION
 if FISHEYE:
     camera_object.data.type = 'PANO'
     camera_object.data.cycles.panorama_type = 'FISHEYE_EQUISOLID'
-    camera_object.data.cycles.fisheye_lens = 8
-    camera_object.data.cycles.fisheye_fov = 2.27
-    camera_object.data.sensor_width = 15.81
-    camera_object.data.sensor_height = 8.88
+    camera_object.data.cycles.fisheye_lens = 12
+    camera_object.data.cycles.fisheye_fov = 2.5
+    camera_object.data.sensor_width = 20
+    camera_object.data.sensor_height = 20
 
 # 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))
+bpy.ops.mesh.primitive_plane_add(location=(0, 0, 20))
 bpy.ops.mesh.primitive_plane_add(location=(0, 0, -2))
 
 reflector1 = bpy.data.objects['Plane']
@@ -167,13 +170,20 @@ look_at(camera_object, model_object)
 
 # Make floor
 floor = bpy.data.objects['Plane.003']
+bpy.data.groups['Plane'].objects.link(floor)
 floor.scale = (20,20,20)
-texture_object(floor)
 subdivide(floor, 8)
-glitch(floor)
+displace(floor)
+texture_object(floor)
 
 OCEAN = add_ocean(10, 20)
 
+# Create lines
+bpy.data.groups.new('Lines')
+for i in range(0, 20):
+    new_line = create_line('line' + str(uuid.uuid1()), series(30))
+    new_line.location.z += i / 6
+
 for index in range(1, len(WORDS)):
     new_object = spawn_text()
     props.append(new_object)
@@ -191,8 +201,8 @@ for plane in bpy.data.groups['Plane'].objects:
 for obj in WIREFRAMES:
     wireframize(obj)
 
-if ANIMATE == True:
-    exec(open(os.path.join(os.path.dirname(__file__), 'animation_recording.py')).read())
+look_at(camera_object, model_object)
+model_object.location.z += 2
 
 # ------
 # Shoot

data/lib/glitch3d/strategies/duplication.rb

@@ -2,21 +2,31 @@
 module Glitch3d
   module Duplication
     def alter_vertices(vertices_objects_array)
-      iteration_number = 2
-      res = []
-      iteration_number.times do |_|
-        res = copy_random_element(vertices_objects_array, iteration_number, CHUNK_SIZE)
-      end
-      res
+      # iteration_number = 2
+      # res = []
+      # iteration_number.times do |_|
+      #   res = copy_random_element(vertices_objects_array, iteration_number, CHUNK_SIZE)
+      # end
+      # res
+      shuffle_vertices(vertices_objects_array)
     end
 
     def alter_faces(faces_objects_array, vertex_objects_array)
       faces_objects_array
     end
 
+    def shuffle_vertices(array)
+      2.times do
+        rand_index1 = rand(0..array.size - 1)
+        rand_index2 = rand(0..array.size - 1)
+        array[rand_index1], array[rand_index2] = array[rand_index2], array[rand_index1]
+      end
+      array
+    end
+
     def copy_random_element(collection, iteration_number, chunk_size)
       new_array = collection
-      iteration_number.times do 
+      iteration_number.times do
         rand1 = rand(0..collection.size - 1)
         rand2 = rand(0..collection.size - 1)
         new_array[rand1..rand1 + chunk_size] = new_array[rand2..rand2 + chunk_size]

data/lib/glitch3d/strategies/find_and_replace.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 module Glitch3d
   module FindAndReplace
+    # Find and replace for vertices
     def alter_vertices(vertices_objects_array)
       @target = rand(9).to_s
       @replacement = rand(9).to_s
@@ -10,7 +11,11 @@ module Glitch3d
       vertices_objects_array
     end
 
+    # Assign some faces to different vertices
     def alter_faces(faces_objects_array, vertices_objects_array)
+      faces_objects_array.sample(3) do |face|
+        face.v1 = rand(0..vertices_objects_array.size - 1)
+      end
       faces_objects_array
     end
 

data/lib/glitch3d/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitch3d
 version: !ruby/object:Gem::Version
-  version: 0.2.2.2
+  version: 0.2.2.3
 platform: ruby
 authors:
 - pskl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,14 +95,17 @@ files:
 - fixtures/mars.obj
 - fixtures/mecha.obj
 - fixtures/skull.obj
+- fixtures/textures/afx_face.jpeg
+- fixtures/textures/afx_logo.jpg
 - fixtures/textures/anime.jpg
 - fixtures/textures/checkered_texture.jpg
 - fixtures/textures/grid.jpg
 - fixtures/textures/kago.jpg
+- fixtures/textures/kawai.jpg
 - fixtures/textures/spiral.jpg
+- fixtures/textures/vapor.jpg
 - glitch3d.gemspec
 - lib/glitch3d.rb
-- lib/glitch3d/bpy/animation_recording.py
 - lib/glitch3d/bpy/helpers.py
 - lib/glitch3d/bpy/rendering.py
 - lib/glitch3d/objects/face.rb

data/lib/glitch3d/bpy/animation_recording.py

@@ -1,14 +0,0 @@
-context.scene.frame_start = 0
-context.scene.frame_end   = NUMBER_OF_FRAMES
-bpy.ops.screen.frame_jump(end=False)
-
-for frame in range(1, NUMBER_OF_FRAMES):
-    bpy.context.scene.frame_set(frame)
-
-    OCEAN.modifiers['Ocean'].time += 1
-    model_object.rotation_euler.z += math.radians(10)
-
-    for ob in context.scene.objects:
-        ob.keyframe_insert(data_path="location", index=-1)
-
-bpy.ops.screen.frame_jump(end=False)