glitch3d 0.2.3.8 → 0.2.4.0

data/lib/glitch3d.rb

@@ -11,7 +11,7 @@ module Glitch3d
 
   FACE_GLITCH_ITERATION_RATIO = 0.1
   FACE_GLITCH_OFFSET = 0.5
-  BOUNDARY_LIMIT = 4 # Contain model within 2x2x2 cube
+  BOUNDARY_LIMIT = 3 # Contain model within BOUNDARY_LIMITxBOUNDARY_LIMITxBOUNDARY_LIMIT cube
   CHUNK_SIZE=20
 
   BLENDER_EXECUTABLE_PATH = ENV['BLENDER_EXECUTABLE_PATH'].freeze
@@ -34,7 +34,7 @@ module Glitch3d
     source_file = random_fixture if source_file.nil?
     print_version if args.has_key?('version')
     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')
+    self.class.include infer_strategy(args['mode'])
     @quality = args['quality'] || 'low'
     source_file = source_file
     base_file_name = source_file&.gsub(/.obj/, '')
@@ -60,7 +60,12 @@ module Glitch3d
   end
 
   def infer_strategy(mode)
-    return [ Glitch3d::Default, Glitch3d::Duplication, Glitch3d::FindAndReplace, Glitch3d::Localized, Glitch3d::None].sample if mode.nil?
+    if !mode
+      mode_chosen = [ Glitch3d::Default, Glitch3d::Duplication, Glitch3d::FindAndReplace, Glitch3d::Localized, Glitch3d::None].sample
+      puts "Defaulting to #{mode_chosen}"
+      return mode_chosen
+    end
+    puts "Using #{mode}"
     begin
       return eval("Glitch3d::#{mode.to_s.gsub(/(?:_|^)(\w)/){$1.upcase}}")
     rescue

data/lib/glitch3d/bpy/canvas/aether.py

@@ -5,10 +5,9 @@ SCENE.frame_end = NUMBER_OF_FRAMES
 
 RADIUS=20
 
-# Container
 bpy.ops.mesh.primitive_cube_add(location=(0, 0, -0.4),radius=RADIUS)
 container = last_added_object('CUBE')
-container.name = 'Container'
+container.name = 'fluid_container'
 container.modifiers.new(name='container', type='FLUID_SIMULATION')
 container.modifiers['container'].settings.type = 'DOMAIN'
 container.modifiers['container'].settings.generate_particles = 1
@@ -16,14 +15,13 @@ container.modifiers['container'].settings.surface_subdivisions = 100
 container.modifiers['container'].settings.viscosity_exponent = 6
 container.modifiers['container'].settings.viscosity_base = 1.0
 container.modifiers['container'].settings.simulation_scale = 1
-
 container.location = (0, 0, 0)
 
 def spawn_emitter_fuild(location, emission_vector):
   bpy.ops.mesh.primitive_uv_sphere_add(location=location)
   emitter = last_added_object('Sphere')
   emitter.cycles_visibility.camera = False
-  emitter.name = 'Emitter' + str(uuid.uuid1())
+  emitter.name = 'Fluid Emitter' + str(uuid.uuid1())
   emitter.modifiers.new(name='emitter', type='FLUID_SIMULATION')
   emitter.modifiers['emitter'].settings.type = 'INFLOW'
   emitter.modifiers['emitter'].settings.inflow_velocity = emission_vector
@@ -40,8 +38,11 @@ spawn_emitter_fuild((0,0,((RADIUS/2) - 2)),mathutils.Vector((0.5, 0.5, -2)))
 spawn_emitter_fuild((0,3,((RADIUS/2) - 2)),mathutils.Vector((0., -0.5, -0.5)))
 
 make_object_gradient_fabulous(container, rand_color(), rand_color())
+container.modifiers.new(name='Container Subsurf', type='SUBSURF')
 make_object_fluid_collider(SUBJECT)
-make_object_fluid_collider(OCEAN[1])
+
+if OCEAN:
+  make_object_fluid_collider(OCEAN[1])
 
 # Bake animation
 print("*** Baking commence *** (you might see a bunch of gibberish popping up cause baking is not supposed to be used headlessly")

data/lib/glitch3d/bpy/canvas/dreamatorium.py

@@ -41,12 +41,10 @@ make_object_gradient_fabulous(m4a1, rand_color(), rand_color())
 # Make floor
 bpy.ops.mesh.primitive_plane_add(location=(0, 0, -2))
 floor = last_added_object('Plane')
+floor.name = 'Floor'
 floor.scale = (20,20,20)
 subdivide(floor, int(random.uniform(3, 7)))
 displace(floor)
-texture_object(floor)
-unwrap_model(floor)
-bpy.data.groups['Displays'].objects.link(floor)
 
 OCEAN = add_ocean(10, 20)
 

data/lib/glitch3d/bpy/canvas/frame_generator.py

@@ -0,0 +1,21 @@
+# Generate a frame that you can 3D Print
+# generate line -> rotate 45 degrees -> extrude -> mirror end -> cursor to center -> mirror
+
+def spawn_frame(profile_function, length=3, side = 40):
+  side = 40
+  profile = build_segment((-side, side, 0), series, 2)
+  profile.name = 'Profile'
+  profile.rotation_euler.z -= math.radians(45)
+  SCENE.objects.active = profile
+  bpy.ops.object.editmode_toggle()
+  bpy.ops.mesh.extrude_region_move(MESH_OT_extrude_region={"mirror":False}, TRANSFORM_OT_translate={"value":(+side, side, 0), "constraint_axis":(True, False, False), "constraint_orientation":'GLOBAL', "mirror":False, "proportional":'DISABLED', "proportional_edit_falloff":'SMOOTH', "proportional_size":1, "snap":False, "snap_target":'CLOSEST', "snap_point":(0, 0, 0), "snap_align":False, "snap_normal":(0, 0, 0), "gpencil_strokes":False, "texture_space":False, "remove_on_cancel":False, "release_confirm":False, "use_accurate":False})
+  bpy.ops.mesh.extrude_region_move(MESH_OT_extrude_region={"mirror":False}, TRANSFORM_OT_translate={"value":(side, -side, 0), "constraint_axis":(False, True, False), "constraint_orientation":'GLOBAL', "mirror":False, "proportional":'DISABLED', "proportional_edit_falloff":'SMOOTH', "proportional_size":1, "snap":False, "snap_target":'CLOSEST', "snap_point":(0, 0, 0), "snap_align":False, "snap_normal":(0, 0, 0), "gpencil_strokes":False, "texture_space":False, "remove_on_cancel":False, "release_confirm":False, "use_accurate":False})
+  bpy.ops.mesh.extrude_region_move(MESH_OT_extrude_region={"mirror":False}, TRANSFORM_OT_translate={"value":(-side, -side, 0), "constraint_axis":(True, False, False), "constraint_orientation":'GLOBAL', "mirror":False, "proportional":'DISABLED', "proportional_edit_falloff":'SMOOTH', "proportional_size":1, "snap":False, "snap_target":'CLOSEST', "snap_point":(0, 0, 0), "snap_align":False, "snap_normal":(0, 0, 0), "gpencil_strokes":False, "texture_space":False, "remove_on_cancel":False, "release_confirm":False, "use_accurate":False})
+  bpy.ops.mesh.extrude_region_move(MESH_OT_extrude_region={"mirror":False}, TRANSFORM_OT_translate={"value":(-side, side, 0), "constraint_axis":(False, True, False), "constraint_orientation":'GLOBAL', "mirror":False, "proportional":'DISABLED', "proportional_edit_falloff":'SMOOTH', "proportional_size":1, "snap":False, "snap_target":'CLOSEST', "snap_point":(0, 0, 0), "snap_align":False, "snap_normal":(0, 0, 0), "gpencil_strokes":False, "texture_space":False, "remove_on_cancel":False, "release_confirm":False, "use_accurate":False})
+  bpy.ops.object.editmode_toggle()
+  bpy.ops.mesh.remove_doubles()
+  return profile
+
+frame = spawn_frame(series(3))
+assign_material(frame, random_material())
+apply_displacement(frame)

data/lib/glitch3d/bpy/canvas/lyfe.py

@@ -1,49 +1,55 @@
 # Game of life inspired scene
-SIZE = 10
+SIZE = 5
 DURATION=NUMBER_OF_FRAMES
 SCENE.frame_start = 0
 SCENE.frame_end = DURATION
-cubes = build_grid_object('CUBE', SIZE-1, 0.5, 1)
+cubes = build_composite_object('CUBE', SIZE-1, 0.5)
 
-cells = [[ 0 for i in range(SIZE)] for j in range(SIZE)]
-next_generation = [[ 0 for i in range(SIZE)] for j in range(SIZE)]
+cells = [[[ 0 for i in range(SIZE)] for k in range(SIZE)] for j in range(SIZE)]
+next_generation = [[[ 0 for i in range(SIZE)] for k in range(SIZE)] for j in range(SIZE)]
 
 for x in range(SIZE):
     for y in range(SIZE):
-        cubes[x][y].scale=(.1,.1,.1)
-        cells[x][y] = random.choice(range(2))
-        make_object_gradient_fabulous(cubes[x][y], rand_color(), rand_color())
+        for z in range(SIZE):
+            cubes[x][y][z].scale=(.1,.1,.1)
+            cells[x][y][z] = random.choice(range(2))
+            make_object_gradient_fabulous(cubes[x][y][z], rand_color(), rand_color())
 
 def adjust_scale():
     for x in range(SIZE):
         for y in range(SIZE):
-            if  cells[x][y] == 1 :
-                cubes[x][y].scale=(random.uniform(0.4, 0.6), random.uniform(0.4, 0.6), random.uniform(0.4, 0.6))
-            else:
-                cubes[x][y].scale=(.2,.2,.2)
-            for line in cubes:
-                add_frame(line)
+            for z in range(SIZE):
+                if  cells[x][y][z] == 1 :
+                    cubes[x][y][z].scale=(random.uniform(0.4, 0.6), random.uniform(0.4, 0.6), random.uniform(0.4, 0.6))
+                else:
+                    cubes[x][y][z].scale=(.1,.1,.1)
+                add_frame([cubes[x][y][z]])
 
 def life(l):
     print("Life in " + str(l))
     for x in range(SIZE):
         for y in range(SIZE):
-            neighbors_alive_count = 0
-            for i in range(-1,2):
-                for j in range( -1, 2):
-                    x_index = (x + i + SIZE) % SIZE
-                    y_index = (y + j + SIZE) % SIZE
-                    if not( x_index == x and y_index == y):
-                        neighbors_alive_count += cells[x_index][y_index]
-            if ( cells[x][y] == 1 and (neighbors_alive_count == 2 or neighbors_alive_count == 3)):
-                next_generation[x][y] = 1
-            elif ( cells[x][y] == 0 and neighbors_alive_count == 3 ):
-                next_generation[x][y] = 1
-            else:
-                next_generation[x][y] = 0
+            for z in range(SIZE):
+                neighbors_alive_count = 0
+                for i in range(-1,2):
+                    for j in range(-1,2):
+                        for k in range( -1, 2):
+                            x_index = (x + i + SIZE) % SIZE
+                            y_index = (y + j + SIZE) % SIZE
+                            z_index = (z + k + SIZE) % SIZE
+                            print("Checking: " + str((x_index, y_index, z_index)) + " for: " + str((x, y, z)))
+                            if not( x_index == x and y_index == y and z_index == z):
+                                neighbors_alive_count += cells[x_index][y_index][z_index]
+                if ( cells[x][y][z] == 1 and (neighbors_alive_count == 2 or neighbors_alive_count == 3)):
+                    next_generation[x][y][z] = 1
+                elif ( cells[x][y][z] == 0 and neighbors_alive_count == 3 ):
+                    next_generation[x][y][z] = 1
+                else:
+                    next_generation[x][y][z] = 0
     for x in range(SIZE):
-        for y in range(SIZE):
-            cells[x][y] = next_generation[x][y]
+        for k in range(SIZE):
+            for y in range(SIZE):
+                cells[x][y][z] = next_generation[x][y][z]
     adjust_scale()
 
 print("Synthetic life begin")

data/lib/glitch3d/bpy/canvas/particles.py

@@ -0,0 +1,19 @@
+def spawn_particles_system(base, object):
+  particles = base.modifiers.new("Particles", type='PARTICLE_SYSTEM')
+  settings = bpy.data.particles[-1]
+  settings.emit_from = 'VERT'
+  settings.physics_type = 'NO'
+  settings.count = 10000 #default 1000
+  settings.particle_size = 0.01
+  settings.render_type = 'OBJECT'
+  settings.dupli_object = bpy.data.objects['Cube']
+  settings.show_unborn = True
+  settings.use_dead = True
+  settings.size_random = 0.5
+  bpy.ops.object.duplicates_make_real()
+
+bpy.ops.mesh.primitive_cube_add(location=(0, 0, 100),radius=1)
+cube = last_added_object('CUBE')
+assign_material(cube, random_material(['emission']))
+spawn_particles_system(SUBJECT, cube)
+

data/lib/glitch3d/bpy/helpers.py

@@ -1,12 +1,12 @@
 REFLECTOR_SCALE = random.uniform(5, 8)
 REFLECTOR_STRENGTH = random.uniform(10, 15)
 REFLECTOR_LOCATION_PADDING = random.uniform(10, 12)
-WIREFRAME_THICKNESS = random.uniform(0.006, 0.02)
+WIREFRAME_THICKNESS = random.uniform(0.0004, 0.002)
 DISPLACEMENT_AMPLITUDE = random.uniform(0.02, 0.1)
 REPLACE_TARGET = str(random.uniform(0, 9))
 REPLACEMENT = str(random.uniform(0, 9))
 ORIGIN  = (0,0,2)
-NUMBER_OF_FRAMES = 300
+NUMBER_OF_FRAMES = 100
 SCATTER_INTENSITY = 0.015
 ABSORPTION_INTENSITY = 0.25
 DISPLAY_SCALE = (2, 2, 2)
@@ -19,6 +19,7 @@ PINK = (0.8, 0.2, 0.7, 1.0)
 WORDS = string.ascii_lowercase
 RENDER_OUTPUT_PATHS = []
 NORMALS_RENDERING = False #(random.randint(0, 1) == 1)
+MATERIALS_NAMES = []
 
 def pry():
     code.interact(local=dict(globals(), **locals()))
@@ -28,7 +29,16 @@ def fetch_material(material_name):
     new_material = bpy.data.materials[material_name].copy()
     return new_material
 
-# Helper methods
+def apply_displacement(obj):
+    subdivide(obj, 6)
+    subsurf = obj.modifiers.new(name='subsurf', type='SUBSURF')
+    subsurf.levels = 2
+    subsurf.render_levels = 2
+    displace = obj.modifiers.new(name='displace', type='DISPLACE')
+    new_texture = bpy.data.textures.new(name='texture', type='IMAGE')
+    new_texture.image = random_height_map()
+    displace.texture = new_texture
+
 def look_at(obj):
     location_camera = CAMERA.matrix_world.to_translation()
     location_object = obj.matrix_world.to_translation()
@@ -98,7 +108,11 @@ def camera_location_string(camera):
     return str(int(camera.location.x)) + ' ' + str(int(camera.location.y)) + ' ' + str(int(camera.location.z))
 
 def assign_material(obj, material):
-    obj.data.materials.append(material)
+    flush_materials(obj.data.materials)
+    if len(obj.data.materials) == 0:
+        obj.data.materials.append(material)
+    else:
+        obj.data.materials[0] = material
     return material
 
 # Returns a new Cycles material with default DiffuseBsdf node linked to output
@@ -114,8 +128,13 @@ def random_texture():
     print("LOADING TEXTURE -> " + texture_path)
     return bpy.data.images.load(texture_path)
 
-def random_material():
-    return random.choice(bpy.data.materials)
+def random_height_map():
+    path = HEIGHT_MAP_FOLDER_PATH + random.choice(os.listdir(HEIGHT_MAP_FOLDER_PATH))
+    print("LOADING HEIGHT MAP -> " + path)
+    return bpy.data.images.load(path)
+
+def random_material(blacklist=[]):
+    return fetch_material(random.choice(MATERIALS_NAMES))
 
 def assign_texture_to_material(material, texture):
     assert material.use_nodes == True
@@ -166,7 +185,7 @@ def make_object_transparent(obj):
     assign_node_to_output(material, trans)
     assign_material(obj, material)
 
-def make_object_emitter(obj, emission_strength):
+def make_object_emitter(obj, emission_strength = 1):
     emissive_material = assign_material(obj, fetch_material('emission'))
     emission_node = emissive_material.node_tree.nodes['Emission']
     emission_node.inputs[0].default_value = rand_color()
@@ -208,9 +227,9 @@ def random_text():
     global WORDS
     return random.choice(WORDS)
 
-def create_mesh(name, verts, faces, location):
+def create_mesh(name, verts, faces, location, edges=[]):
     mesh_data = bpy.data.meshes.new("mesh_data")
-    mesh_data.from_pydata(verts, [], faces)
+    mesh_data.from_pydata(verts, edges, faces)
     mesh_data.update()
     obj = bpy.data.objects.new(name, mesh_data)
     obj.location = location
@@ -226,11 +245,11 @@ def spawn_text():
     SCENE.objects.link(new_text)
     return new_text
 
-def wireframize(obj):
+def wireframize(obj, emission_strength = 1):
     SCENE.objects.active = obj
-    bpy.ops.object.modifier_add(type='WIREFRAME')
-    obj.modifiers['Wireframe'].thickness = WIREFRAME_THICKNESS
-    make_object_emitter(obj, 1)
+    obj.modifiers.new(name = 'wireframe', type='WIREFRAME')
+    obj.modifiers['wireframe'].thickness = WIREFRAME_THICKNESS
+    make_object_emitter(obj, emission_strength)
     return obj
 
 def shuffle(obj):
@@ -238,8 +257,8 @@ 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)), pitched_array(0.0, length, 0.1)))
+def series(length, function = math.cos):
+    return list(map(lambda x: (0, x, function(x)), pitched_array(0.0, length, 0.1)))
 
 def randomize_reflectors_colors():
     for r in bpy.data.groups['Reflectors'].objects:
@@ -330,6 +349,7 @@ def subdivide(object, cuts):
     bpy.ops.object.mode_set(mode='EDIT')
     for index in range(0, cuts):
         bpy.ops.mesh.subdivide(cuts)
+    bpy.ops.object.editmode_toggle()
 
 def clone(obj):
     new_obj = obj.copy()
@@ -363,12 +383,18 @@ def flush_objects(objs = bpy.data.objects):
 # Delete materials
 def flush_materials(mats = bpy.data.materials):
     for mat in mats:
-        bpy.data.materials.remove(mat, do_unlink=True)
+        if mat != None:
+            bpy.data.materials.remove(mat, do_unlink=True)
 
 def flush_nodes(material):
     for node in material.node_tree.nodes:
         material.node_tree.nodes.remove(node)
 
+def delete_useless_materials():
+    for mat in bpy.data.materials:
+        if mat.name.startswith('Material'):
+            bpy.data.materials.remove(mat, do_unlink=True)
+
 # Rotate hue to generate palette
 def adjacent_colors(r, g, b, number):
     angle = (360 / 5) / 360
@@ -402,6 +428,13 @@ def build_pyramid(width=random.uniform(1,3), length=random.uniform(1,3), height=
     faces.append([3,0,4])
     return create_mesh('Pyramid ' + str(uuid.uuid1()), verts, faces, location)
 
+def build_segment(location, function = series, length = 2):
+    verts = function(length)
+    edges = []
+    for v in range(0, (len(verts) - 1)):
+        edges.append([v, v+1])
+    return create_mesh('Segment ' + str(uuid.uuid1()), verts, [], location, edges)
+
 def camera_path(pitch = NUMBER_OF_FRAMES):
     res = []
     initial_z = INITIAL_CAMERA_LOCATION[2]
@@ -419,16 +452,17 @@ def camera_path(pitch = NUMBER_OF_FRAMES):
 def pitched_array(minimum, maximum, pitch):
     return list(map(lambda x: (minimum + pitch * x), range(int((maximum - minimum) / pitch))))
 
-def still_routine(index = 1):
-    CAMERA.location = mathutils.Vector(INITIAL_CAMERA_LOCATION) + mathutils.Vector((round(random.uniform(-CAMERA_OFFSET, CAMERA_OFFSET), 10),round(random.uniform(-CAMERA_OFFSET, CAMERA_OFFSET), 10), round(random.uniform(-1, 1), 10)))
+def still_routine(max_index, index = 1):
+    CAMERA.location = CAMERA_PATH[int((len(CAMERA_PATH) / max_index) * index)]
+    CAMERA.rotation_euler.y += math.radians(round(random.uniform(-25, +25)))
     randomize_reflectors_colors()
-    make_object_glossy(OCEAN[0])
+    if OCEAN:
+        make_object_glossy(OCEAN[0])
     assign_material(SUBJECT, random_material())
     rotate(SUBJECT, index)
-    CAMERA.rotation_euler.y += math.radians(round(random.uniform(-50, +50)))
     for ocean in OCEAN:
         ocean.modifiers['Ocean'].random_seed = round(random.uniform(0, 100))
-        ocean.modifiers['Ocean'].choppiness += random.uniform(0, 0.5)
+        ocean.modifiers['Ocean'].choppiness += random.uniform(0, 0.3)
     if bpy.data.groups['Lines'].objects:
         for l in bpy.data.groups['Lines'].objects:
             rotation = rand_rotation()
@@ -447,14 +481,17 @@ def still_routine(index = 1):
             rotate(display, index)
 
 def animation_routine(frame):
-    assert len(CAMERA_PATH) >= NUMBER_OF_FRAMES
     CAMERA.location = CAMERA_PATH[frame]
     look_at(SUBJECT)
+    assign_material(SUBJECT, random_material())
     randomize_reflectors_colors()
     displace(SUBJECT)
     for ocean in OCEAN:
         ocean.modifiers['Ocean'].time += 0.5
-    make_object_glossy(OCEAN[0])
+    if OCEAN:
+        make_object_glossy(OCEAN[0])
+    for particle_system in bpy.data.particles:
+        particle_system.phase_factor_random += 0.01
     SUBJECT.rotation_euler.z += math.radians(1)
     for l in bpy.data.groups['Lines'].objects:
         l.rotation_euler.x += math.radians(1)
@@ -507,8 +544,8 @@ def make_world_volumetric(world, scatter_intensity = SCATTER_INTENSITY, absorpti
     absorption_node.inputs['Density'].default_value = ABSORPTION_INTENSITY
     bg_node.inputs[0].default_value = rand_color()
 
-def add_frame(collection = bpy.data.objects):
-    for obj in collection:
+def add_frame(collection = bpy.data.objects, blacklist = set([])):
+    for obj in set(collection) - blacklist:
         obj.keyframe_insert(data_path="rotation_euler", index=-1)
         obj.keyframe_insert(data_path="location", index=-1)
         obj.keyframe_insert(data_path="scale", index=-1)

data/lib/glitch3d/bpy/main.py

@@ -20,7 +20,6 @@ def get_args():
     parsed_script_args, _ = parser.parse_known_args(script_args)
     return parsed_script_args
 
-
 args = get_args()
 file = args.file
 mode = args.mode
@@ -49,6 +48,11 @@ load_file(os.path.join(path + '/glitch3d/bpy/helpers.py'))
 load_file(os.path.join(path + '/glitch3d/bpy/render_settings.py'))
 load_file(os.path.join(path + '/glitch3d/bpy/lighting.py'))
 
+# Fill base materials list
+for mat in bpy.data.materials:
+    MATERIALS_NAMES.append(mat.name)
+print("Detected " + str(len(MATERIALS_NAMES)) + " materials in base scene: " + str(MATERIALS_NAMES))
+
 # Create groups
 WIREFRAMES = []
 VORONOIED = []
@@ -67,6 +71,7 @@ CAMERA_OFFSET = 1
 INITIAL_CAMERA_LOCATION = (CAMERA_OFFSET, CAMERA_OFFSET, 1)
 FIXTURES_FOLDER_PATH = path + '/../fixtures/'
 TEXTURE_FOLDER_PATH = FIXTURES_FOLDER_PATH + 'textures/'
+HEIGHT_MAP_FOLDER_PATH = FIXTURES_FOLDER_PATH + 'height_maps/'
 
 # Scene
 context = bpy.context
@@ -100,40 +105,41 @@ SUBJECT = bpy.data.objects['0_glitch3d']
 SUBJECT.select = True
 bpy.ops.object.origin_set(type="ORIGIN_CENTER_OF_MASS")
 SUBJECT.location = ORIGIN
-# make_object_glossy(SUBJECT, YELLOW, 0.01)
-assign_material(SUBJECT, fetch_material('magma'))
-look_at(SUBJECT)
+SUBJECT.modifiers.new(name='Subject Subsurf', type='SUBSURF')
 let_there_be_light(SCENE)
 
 if debug == False:
-    load_file(os.path.join(path + '/glitch3d/bpy/canvas', 'dreamatorium.py'))
-    load_file(os.path.join(path + '/glitch3d/bpy/canvas', 'lyfe.py'))
+    load_file(os.path.join(path + '/glitch3d/bpy/canvas', 'particles.py'))
     load_file (os.path.join(path + '/glitch3d/bpy/canvas', 'aether.py'))
+    load_file(os.path.join(path + '/glitch3d/bpy/canvas', 'lyfe.py'))
+    load_file(os.path.join(path + '/glitch3d/bpy/canvas', 'dreamatorium.py'))
 
     print('Rendering images with resolution: ' + str(SCENE.render.resolution_x) + ' x ' + str(SCENE.render.resolution_y))
 
+    x = 0.08
+    while len(camera_path(x)) <= NUMBER_OF_FRAMES:
+        x -= 0.01
+    CAMERA_PATH = camera_path(x)
+    assert len(CAMERA_PATH) >= NUMBER_OF_FRAMES
+
     if animate:
         print('ANIMATION RENDERING BEGIN')
         SCENE.frame_start = 0
         SCENE.frame_end = NUMBER_OF_FRAMES
 
-        x = 0.08
-        while len(camera_path(x)) <= NUMBER_OF_FRAMES:
-            x -= 0.01
-        CAMERA_PATH = camera_path(x)
-
         for frame in range(0, NUMBER_OF_FRAMES):
             SCENE.frame_set(frame)
             animation_routine(frame)
-            add_frame()
+            look_at(SUBJECT)
+            add_frame(bpy.data.objects, set([bpy.data.objects['fluid_container']]))
         shoot(output_name(model_path))
 
     else:
         print('STILL RENDERING BEGIN')
-        for index in range(0, int(shots_number)):
+        for index in range(0, shots_number):
             print("-------------------------- " + str(index) + " --------------------------")
             look_at(SUBJECT)
-            still_routine(index)
+            still_routine(shots_number, index)
             SCENE.frame_set(int(SCENE.frame_end/(index+1)))
             shoot(output_name(model_path, index))
 else:
@@ -147,7 +153,8 @@ print("Files rendered:")
 for p in RENDER_OUTPUT_PATHS:
     print(p)
 
-call(["python", os.path.join(path + '/glitch3d/bpy/post-processing/optimize.py')])
-call(["python", os.path.join(path + '/glitch3d/bpy/post-processing/mosaic.py')])
+if animate == False and debug == False:
+    call(["python", os.path.join(path + '/glitch3d/bpy/post-processing/optimize.py')])
+    call(["python", os.path.join(path + '/glitch3d/bpy/post-processing/mosaic.py')])
 
 print('FINISHED ¯\_(ツ)_/¯')