glitch3d 0.2.2.1 → 0.2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed8edaa542efe134c14e128217a11744c8756d70
-  data.tar.gz: 3f87c6e2e4205730927bcf0ccd8784a6f7fb2f92
+  metadata.gz: 601218ffff3ed8224664f46004c6904e595e1828
+  data.tar.gz: 6af29a322182537cf3276e1167e0f4baed417860
 SHA512:
-  metadata.gz: 04695b011ee8b5e90efd916c69e9980cf68d5b2b305e413ed4e576e0e8f0f6fda3c2993c133e45647da63c5c1a37782fce9baa822d43771921ef9df7b9768c7a
-  data.tar.gz: cc3807e627994cff2713eab5d2994a4d1f6461e626b83129d61b966c6e7be69269d38da5a7e570fde77cfc6e50df937e50546d5e53755fc55fd2e7eadc8960ec
+  metadata.gz: a1a93d53edc0792de77cec65d854788ceb501bc9af3b690a888c526310111b2c53807cda5c2fbf5967994e0cbad30bdd38e840c94f8f37c91d78ff2d5dc53727
+  data.tar.gz: d595211c09ce7ad96715cbee6d438d007deda6178686306a3b39ee82c8ad8ac03927c1abc782c13b71cf4571671af8e96df2bbbbd5847550bea8f13af7292a53

data/lib/glitch3d/bpy/animation_recording.py

@@ -1,11 +1,13 @@
-scene = bpy.context.scene
-scene.frame_start = 0
-scene.frame_end   = NUMBER_OF_FRAMES
+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)
-    # do stuff here
+
+    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)
 

data/lib/glitch3d/bpy/helpers.py

@@ -50,13 +50,16 @@ def empty_materials():
     for material in bpy.data.materials.keys():
         bpy.data.materials.remove(object.data.materials[material])
 
-def shoot(camera, model_object, filepath):
+def shoot(animate, camera, model_object, filepath):
     directory = os.path.dirname('./renders')
     if not os.path.exists(directory):
       os.makedirs(directory)
     look_at(camera, model_object)
     print('Camera now at location: ' + camera_location_string(camera) + ' / rotation: ' + camera_rotation_string(camera))
     bpy.context.scene.render.filepath = filepath
+    if animate:
+        bpy.context.scene.render.filepath = './renders/animation-' + str(uuid.uuid1()) + '/'
+        return bpy.ops.render.render(animation=animate)
     bpy.ops.render.render(write_still=True)
 
 def output_name(index, model_path):
@@ -122,11 +125,6 @@ def camera_location_string(camera):
 def assign_material(model_object, material):
     model_object.data.materials.append(material)
 
-def assign_node_to_output(material, new_node):
-    assert material.use_nodes == True
-    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()))
@@ -147,6 +145,17 @@ def assign_texture_to_material(material, texture):
     texture_node.image = texture
     material.node_tree.links.new(texture_node.outputs['Color'], bsdf_node.inputs['Color'])
 
+def assign_node_to_output(material, new_node):
+    assert material.use_nodes == True
+    output_node = material.node_tree.nodes['Material Output']
+    material.node_tree.links.new(new_node.outputs[0], output_node.inputs['Surface'])
+
+def mix_nodes(material, node1, node2):
+    mix = material.node_tree.nodes.new('ShaderNodeMixShader')
+    material.node_tree.links.new(mix.inputs[1], node1.outputs[0])
+    material.node_tree.links.new(mix.inputs[2], node2.outputs[0])
+    assign_node_to_output(material, mix)
+
 def make_object_glossy(obj, color):
     material = bpy.data.materials.new('Glossy Material - ' + str(uuid.uuid1()))
     material.use_nodes = True
@@ -181,6 +190,19 @@ def make_object_emitter(obj, emission_strength):
     assign_material(obj, emissive_material)
     return emission_node
 
+def make_object_gradient_fabulous(obj, color1, color2):
+    material = bpy.data.materials.new('Fabulous #' + str(uuid.uuid1()))
+    material.use_nodes = True
+    assign_material(obj, material)
+    mixer_node = material.node_tree.nodes.new('ShaderNodeMixRGB')
+    gradient_node = material.node_tree.nodes.new('ShaderNodeTexGradient')
+    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'])
+    assign_node_to_output(material, bsdf_node)
+    mixer_node.inputs['Color1'].default_value = color1
+    mixer_node.inputs['Color2'].default_value = color2
+
 def texture_object(obj):
     new_material = create_cycles_material()
     assign_texture_to_material(new_material, random_texture())
@@ -309,6 +331,8 @@ def add_ocean(spatial_size, resolution):
     ocean.modifiers["Ocean"].spatial_size = spatial_size
     ocean.modifiers["Ocean"].resolution = 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'
     return ocean
 
@@ -335,7 +359,7 @@ def adjacent_colors(r, g, b, number):
 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):
+def build_pyramid(width=random.uniform(1,3), length=random.uniform(1,3), height=random.uniform(1,3), location=ORIGIN):
     verts=[]
     faces=[]
     verts.append([-(width/2),(length/2),0.0])
@@ -348,6 +372,24 @@ def build_pyramid(width=1.0, length=1.0, height=1.0, location=ORIGIN):
     faces.append([1,2,4])
     faces.append([2,3,4])
     faces.append([3,0,4])
-    id = str(uuid.uuid1())
-    return create_mesh('Pyramid ' + id, verts, faces, location)
+    return create_mesh('Pyramid ' + str(uuid.uuid1()), verts, faces, location)
+
+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
+    for prop in props:
+        prop.location = rand_location()
+        prop.rotation_euler = rand_rotation()
+    for obj in WIREFRAMES:
+        rotate(obj, index)
+        obj.location.z += round(random.uniform(-1, 1), 10)
+        obj.rotation_euler.z += math.radians(round(random.uniform(0, 90)))
+    for display in bpy.data.groups['Displays'].objects:
+        display.location = rand_location()
 

data/lib/glitch3d/bpy/rendering.py

@@ -11,7 +11,6 @@
 # Use `debug()` to pry into the script
 import os
 exec(open(os.path.join(os.path.dirname(__file__), 'helpers.py')).read())
-exec(open(os.path.join(os.path.dirname(__file__), 'animation_recording.py')).read())
 
 # Arguments parsing
 args = get_args()
@@ -26,6 +25,7 @@ DEBUG = False
 FISHEYE = False
 COLORS = rand_color_palette(5)
 INITIAL_CAMERA_LOCATION = (8, 8, 1)
+ANIMATE = False
 
 if DEBUG:
     shots_number = 2
@@ -63,6 +63,7 @@ if mode == 'high':
     context.scene.render.resolution_percentage = 100
 
 # Add background to world
+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
@@ -81,7 +82,8 @@ model_object = bpy.data.objects[0]
 bpy.ops.import_scene.obj(filepath = os.path.join(FIXTURES_FOLDER_PATH + 'm4a1.obj'), use_edges=True)
 m4a1 = bpy.data.objects['m4a1']
 m4a1.location = rand_location()
-m4a1.scale = (0.4, 0.4, 0.4)
+m4a1.scale = (0.5, 0.5, 0.5)
+props.append(m4a1)
 
 # Use center of mass to center object
 model_object.select = True
@@ -134,9 +136,9 @@ make_object_reflector(reflector2)
 make_object_reflector(reflector3)
 
 # Set up virtual displays
-bpy.ops.mesh.primitive_grid_add(x_subdivisions=100, y_subdivisions=100, location=(0, 3, 2))
+bpy.ops.mesh.primitive_grid_add(x_subdivisions=100, y_subdivisions=100, location=(0, 6, 2))
 display1 = bpy.data.objects['Grid']
-bpy.ops.mesh.primitive_grid_add(x_subdivisions=100, y_subdivisions=100, location=(3, 0, 2))
+bpy.ops.mesh.primitive_grid_add(x_subdivisions=100, y_subdivisions=100, location=(6, 0, 2))
 display2 = bpy.data.objects['Grid.001']
 
 bpy.data.groups.new('Displays')
@@ -144,13 +146,21 @@ bpy.data.groups['Displays'].objects.link(display1)
 bpy.data.groups['Displays'].objects.link(display2)
 
 display1.rotation_euler.x += math.radians(90)
+display1.rotation_euler.z -= math.radians(90)
 display2.rotation_euler.x += math.radians(90)
+display2.rotation_euler.y += math.radians(90)
+display2.rotation_euler.z += math.radians(120)
 
-for display in [display1, display2]:
+for display in bpy.data.groups['Displays'].objects:
+    display.rotation_euler.x += math.radians(90)
+    display.scale = (3,3,3)
     texture_object(display)
     unwrap_model(display)
     glitch(display)
 
+glitch(m4a1)
+make_object_gradient_fabulous(m4a1, rand_color(), rand_color())
+
 # Adjust camera
 context.scene.camera = camera_object
 look_at(camera_object, model_object)
@@ -181,29 +191,36 @@ 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())
+
 # ------
 # Shoot
 # ------
 print('Rendering images with resolution: ' + str(context.scene.render.resolution_x) + ' x ' + str(context.scene.render.resolution_y))
-for index in range(0, int(shots_number)):
-    print("-------------------------- " + str(index) + " --------------------------")
-    rotate(model_object, index)
-    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
-    for prop in props:
-        prop.location = rand_location()
-    for obj in WIREFRAMES:
-        rotate(obj, index)
-        obj.location.z += round(random.uniform(-1, 1), 10)
-        obj.rotation_euler.z += math.radians(round(random.uniform(0, 90)))
-    m4a1.location = rand_location()
-    m4a1.rotation_euler = rand_rotation()
-    shoot(camera_object, model_object, output_name(index, model_path))
+
+if ANIMATE:
+    print('ANIMATION RENDERING BEGIN')
+    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)
+
+        dance_routine()
+
+        for ob in context.scene.objects:
+            ob.keyframe_insert(data_path="location", index=-1)
+
+    bpy.ops.screen.frame_jump(end=False)
+    shoot(True, camera_object, model_object, output_name(index, model_path))
+else:
+    print('STILL RENDERING BEGIN')
+    for index in range(0, int(shots_number)):
+        print("-------------------------- " + str(index) + " --------------------------")
+        shoot(False, camera_object, model_object, output_name(index, model_path))
+        dance_routine()
+
 
 print('FINISHED ¯\_(ツ)_/¯')

data/lib/glitch3d/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitch3d
 version: !ruby/object:Gem::Version
-  version: 0.2.2.1
+  version: 0.2.2.2
 platform: ruby
 authors:
 - pskl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,12 +98,13 @@ files:
 - fixtures/textures/anime.jpg
 - fixtures/textures/checkered_texture.jpg
 - fixtures/textures/grid.jpg
+- fixtures/textures/kago.jpg
+- fixtures/textures/spiral.jpg
 - glitch3d.gemspec
 - lib/glitch3d.rb
 - lib/glitch3d/bpy/animation_recording.py
 - lib/glitch3d/bpy/helpers.py
 - lib/glitch3d/bpy/rendering.py
-- lib/glitch3d/bpy/uv_glitch.py
 - lib/glitch3d/objects/face.rb
 - lib/glitch3d/objects/vertex.rb
 - lib/glitch3d/strategies/default.rb

data/lib/glitch3d/bpy/uv_glitch.py

@@ -1 +0,0 @@
-# Glitch UV map