glitch3d 0.2.3.3 → 0.2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 246e3f5ad753205a1da7847ad49660d5760bccc2
-  data.tar.gz: 059bdda653c3cac77696c54204fa0e8710c23185
+  metadata.gz: f9a221d591135c6764014bb2f568a8d97568dde6
+  data.tar.gz: a941e1d8f3ed02a05ac14b0ae0d2fb89b7020d54
 SHA512:
-  metadata.gz: 21e27d27c995d89cf1aa4f8b84878622280a2689b43b95b308a9aafb1292d2a611a966dd28b9de4df0b6fb50d406d22fdefb35c536466a6413200232ec582486
-  data.tar.gz: 2f395fa7b47217d5bec2e1390fefb8a966811d62c956dba2a88277e2070705be879b8e4ce9e20459083769b1d987f604f318df77007c867d3df6d6ad1385ec06
+  metadata.gz: ba1e3e41b11f3c551809593346c880ec70d74f3d943da2aa0b921673b8be76a5cf960eced4abd78f3c23f13a818b6ecbddb5091bfa7ca67d7f93ab83bdf30f2a
+  data.tar.gz: 3a01ad67f7ba65c5d6cfd37531f0a41b481bc516096516f3bdceac7d58d5a53b26d7acaba545bd6deadae1e294ed80197831452a2faded9d0a5283398ce423cd

data/.gitignore

@@ -11,6 +11,7 @@
 /fixtures/models/*
 /fixtures/*_glitched.obj
 !/fixtures/textures/*
+!/fixtures/textures/height_maps
 !/fixtures/skull.obj
 .DS_Store
 *.png

data/.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "ruby.rubocop.onSave": false,
+  "editor.insertSpaces": true
+}

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

@@ -11,7 +11,7 @@ container = last_added_object('CUBE')
 container.name = 'Container'
 container.modifiers.new(name='container', type='FLUID_SIMULATION')
 container.modifiers['container'].settings.type = 'DOMAIN'
-container.modifiers['container'].settings.generate_particles = 0.06
+container.modifiers['container'].settings.generate_particles = 1
 container.modifiers['container'].settings.surface_subdivisions = 100
 container.modifiers['container'].settings.viscosity_exponent = 6
 container.modifiers['container'].settings.viscosity_base = 1.0
@@ -19,20 +19,31 @@ container.modifiers['container'].settings.simulation_scale = 1
 
 container.location = (0, 0, 0)
 
-# Emitter of fluid
-bpy.ops.mesh.primitive_uv_sphere_add(location=(0,0,((RADIUS/2) - 1)))
-emitter = bpy.data.objects['Sphere']
-emitter.cycles_visibility.camera = False
-emitter.name = 'Emitter'
-emitter.modifiers.new(name='emitter', type='FLUID_SIMULATION')
-emitter.modifiers['emitter'].settings.type = 'INFLOW'
-emitter.modifiers['emitter'].settings.inflow_velocity = mathutils.Vector((0, 0.5, -2))
-emitter.scale = (0.5, 0.5, 0.5)
-
-# make_object_transparent(container)
+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.modifiers.new(name='emitter', type='FLUID_SIMULATION')
+  emitter.modifiers['emitter'].settings.type = 'INFLOW'
+  emitter.modifiers['emitter'].settings.inflow_velocity = emission_vector
+  emitter.scale = (0.5, 0.5, 0.5)
+  return emitter
+
+def make_object_fluid_collider(obj):
+    obj.modifiers.new(name='obstacle', type='FLUID_SIMULATION')
+    obj.modifiers['obstacle'].settings.type = 'OBSTACLE'
+    obj.modifiers['obstacle'].settings.volume_initialization = 'BOTH'
+    obj.modifiers['obstacle'].settings.partial_slip_factor = 0.15
+
+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())
 make_object_fluid_collider(SUBJECT)
-make_object_fluid_collider(OCEAN[0])
+make_object_fluid_collider(OCEAN[1])
 
 # Bake animation
-bpy.ops.fluid.bake({'scene': context.scene, 'active_object': container})
+print("*** Baking commence *** (you might see a bunch of gibberish popping up cause baking is not supposed to be used headlessly")
+bpy.ops.fluid.bake({'scene': context.scene, 'active_object': container})
+print("*** Baking finished ***")

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

@@ -16,9 +16,9 @@ for l1 in elements:
 
 # Set up virtual displays
 bpy.ops.mesh.primitive_grid_add(x_subdivisions=100, y_subdivisions=100, location=(0, 6, 2))
-display1 = bpy.data.objects['Grid']
+display1 = last_added_object('Grid')
 bpy.ops.mesh.primitive_grid_add(x_subdivisions=100, y_subdivisions=100, location=(6, 0, 2))
-display2 = bpy.data.objects['Grid.001']
+display2 = last_added_object('Grid')
 
 bpy.data.groups['Displays'].objects.link(display1)
 bpy.data.groups['Displays'].objects.link(display2)
@@ -33,21 +33,19 @@ for display in bpy.data.groups['Displays'].objects:
     display.rotation_euler.x += math.radians(90)
     display.scale = DISPLAY_SCALE
     texture_object(display)
-    make_texture_object_transparent(display)
     unwrap_model(display)
-    glitch(display)
 
 glitch(m4a1)
 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')
-bpy.data.groups['Planes'].objects.link(floor)
+floor = last_added_object('Plane')
 floor.scale = (20,20,20)
 subdivide(floor, int(random.uniform(3, 7)))
 displace(floor)
 texture_object(floor)
+unwrap_model(floor)
 
 OCEAN = add_ocean(10, 20)
 
@@ -62,14 +60,12 @@ for j in range(0,20):
 # Add flying letters, lmao
 for index in range(1, len(WORDS)):
     new_object = spawn_text()
+    bpy.data.groups['Texts'].objects.link(new_object)
     props.append(new_object)
     text_scale = random.uniform(0.75, 3)
     make_object_glossy(new_object, rand_color(), 0.0)
     new_object.scale = (text_scale, text_scale, text_scale)
     new_object.location = rand_location()
 
-for plane in bpy.data.groups['Planes'].objects:
-    unwrap_model(plane)
-
 for obj in WIREFRAMES:
     wireframize(obj)

data/lib/glitch3d/bpy/helpers.py

@@ -17,6 +17,7 @@ GREY = (0.2, 0.2, 0.2 ,1)
 BLUE = (0.1, 0.1, 0.8, 0.4)
 PINK = (0.8, 0.2, 0.7, 1.0)
 WORDS = string.ascii_lowercase
+RENDER_OUTPUT_PATHS = []
 
 def pry():
     code.interact(local=dict(globals(), **locals()))
@@ -34,8 +35,10 @@ def shoot(filepath):
     print('Camera now at location: ' + camera_location_string(CAMERA) + ' / rotation: ' + camera_rotation_string(CAMERA))
     SCENE.render.filepath = filepath
     if animate:
-        return bpy.ops.render.render(animation=animate, write_still=True)
-    bpy.ops.render.render(write_still=True)
+        bpy.ops.render.render(animation=animate, write_still=True)
+    else:
+        RENDER_OUTPUT_PATHS.append(filepath)
+        bpy.ops.render.render(write_still=True)
 
 def output_name(model_path, index = 0):
     if animate:
@@ -100,9 +103,7 @@ def create_cycles_material():
 
 def random_texture():
     texture_path = TEXTURE_FOLDER_PATH + random.choice(os.listdir(TEXTURE_FOLDER_PATH))
-    logging.info('---------')
-    logging.info(TEXTURE_FOLDER_PATH)
-    logging.info('---------')
+    print("LOADING TEXTURE -> " + texture_path)
     return bpy.data.images.load(texture_path)
 
 def assign_texture_to_material(material, texture):
@@ -225,7 +226,7 @@ def wireframize(obj):
     SCENE.objects.active = obj
     bpy.ops.object.modifier_add(type='WIREFRAME')
     obj.modifiers['Wireframe'].thickness = WIREFRAME_THICKNESS
-    make_object_emitter(obj, 2)
+    make_object_emitter(obj, 1)
 
 def shuffle(obj):
     obj.location = rand_location()
@@ -342,7 +343,7 @@ def add_ocean(spatial_size, resolution, depth = 100, scale=(4,4,4)):
     ocean.modifiers["Ocean"].depth = depth
     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'])
+    # mix_nodes(ocean.data.materials[0], ocean.data.materials[0].node_tree.nodes['Diffuse BSDF'], ocean.data.materials[0].node_tree.nodes['Glossy BSDF'])
     shadow = clone(ocean)
     shadow.location += mathutils.Vector((1,1,-0.4))
     wireframize(shadow)
@@ -419,7 +420,7 @@ def still_routine(index = 1):
     map(move_ocean, OCEAN)
     map(make_object_glossy, OCEAN)
     rotate(SUBJECT, index)
-    CAMERA.rotation_euler.y += math.radians(round(random.uniform(-30, +30)))
+    CAMERA.rotation_euler.y += math.radians(round(random.uniform(-50, +50)))
     if bpy.data.groups['Lines'].objects:
         for l in bpy.data.groups['Lines'].objects:
             rotation = rand_rotation()
@@ -442,10 +443,10 @@ def animation_routine(frame):
     CAMERA.location = CAMERA_PATH[frame]
     look_at(SUBJECT)
     randomize_reflectors_colors()
+    displace(SUBJECT)
     if OCEAN:
         map(move_ocean, OCEAN)
         map(make_object_glossy, OCEAN)
-    glitch(SUBJECT)
     SUBJECT.rotation_euler.z += math.radians(4)
     for l in bpy.data.groups['Lines'].objects:
         l.rotation_euler.x += math.radians(5)
@@ -498,12 +499,6 @@ 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 make_object_fluid_collider(obj):
-    obj.modifiers.new(name='obstacle', type='FLUID_SIMULATION')
-    obj.modifiers['obstacle'].settings.type = 'OBSTACLE'
-    obj.modifiers['obstacle'].settings.volume_initialization = 'BOTH'
-    obj.modifiers['obstacle'].settings.partial_slip_factor = 0.15
-
 def add_frame(collection = bpy.data.objects):
     for obj in collection:
         obj.keyframe_insert(data_path="rotation_euler", index=-1)

data/lib/glitch3d/bpy/lighting.py

@@ -15,7 +15,6 @@ def let_there_be_light(scene):
 
   for r in [reflector1, reflector2, reflector3]:
     r.cycles_visibility.camera = False
-    bpy.data.groups['Planes'].objects.link(r)
     bpy.data.groups['Reflectors'].objects.link(r)
 
   reflector2.rotation_euler.x += math.radians(90)

data/lib/glitch3d/bpy/main.py

@@ -48,7 +48,7 @@ WIREFRAMES = []
 VORONOIED = []
 OCEAN = []
 
-for s in ['Lines', 'Displays', 'Reflectors', 'Planes']:
+for s in ['Texts', 'Lines', 'Displays', 'Reflectors']:
     bpy.data.groups.new(s)
 
 LINES = bpy.data.groups['Lines'].objects
@@ -99,24 +99,21 @@ look_at(SUBJECT)
 let_there_be_light(SCENE)
 
 if debug == False:
-    exec(open(os.path.join(path + '/glitch3d/bpy/canvas', 'lyfe.py')).read())
     exec(open(os.path.join(path + '/glitch3d/bpy/canvas', 'dreamatorium.py')).read())
+    exec(open(os.path.join(path + '/glitch3d/bpy/canvas', 'lyfe.py')).read())
     exec(open(os.path.join(path + '/glitch3d/bpy/canvas', 'aether.py')).read())
 
     print('Rendering images with resolution: ' + str(SCENE.render.resolution_x) + ' x ' + str(SCENE.render.resolution_y))
 
-    for plane in bpy.data.groups['Planes'].objects:
-        unwrap_model(plane)
-
     if animate:
         print('ANIMATION RENDERING BEGIN')
         SCENE.frame_start = 0
         SCENE.frame_end = NUMBER_OF_FRAMES
-        CAMERA_PATH = camera_path(0.008)
+        CAMERA_PATH = camera_path(0.08)
 
         for frame in range(0, NUMBER_OF_FRAMES):
             SCENE.frame_set(frame)
-            animation_routine(frame - 1)
+            animation_routine(frame)
             add_frame()
         shoot(output_name(model_path))
 
@@ -124,13 +121,17 @@ if debug == False:
         print('STILL RENDERING BEGIN')
         for index in range(0, int(shots_number)):
             print("-------------------------- " + str(index) + " --------------------------")
+            look_at(SUBJECT)
             still_routine(index)
             SCENE.frame_set(int(SCENE.frame_end/(index+1)))
-            look_at(SUBJECT)
             shoot(output_name(model_path, index))
-
-
-    print('FINISHED ¯\_(ツ)_/¯')
-
-look_at(SUBJECT)
-shoot(output_name(model_path))
+else:
+    look_at(SUBJECT)
+    shoot(output_name(model_path))
+
+# Save scene as .blend file
+bpy.ops.wm.save_as_mainfile(filepath=output_name(model_path) + '.blend')
+print("Files rendered:")
+for p in RENDER_OUTPUT_PATHS:
+    print(p)
+print('FINISHED ¯\_(ツ)_/¯')

data/{image.py → lib/glitch3d/bpy/post-processing/mosaic.py}

@@ -1,17 +1,15 @@
 # Make a mosaic with images
-import sys
-import os
+import os, sys
 from PIL import Image
 
-RES_X = 5000
-RES_Y = 5000
+print("Mosaicing")
 path = './renders/'
 files = [path + f for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
 images = map(Image.open, files)
 widths, heights = zip(*(i.size for i in images))
 
 total_width = images[0].size[0] * 4
-total_height = total_width
+total_height = images[0].size[1] * 4
 
 res = Image.new('RGB', (total_height,total_width))
 print('stitching ' + str(len(files)) + ' images')

data/lib/glitch3d/bpy/render_settings.py

@@ -1,3 +1,8 @@
+# Square wall art resolution: 10200x10200 (threadless, society6)
+def set_tile(size):
+    SCENE.render.tile_x = size
+    SCENE.render.tile_y = size
+
 def render_settings(animate, mode):
     SCENE.render.resolution_x = 2000
     SCENE.render.resolution_y = 2000
@@ -5,15 +10,16 @@ def render_settings(animate, mode):
     SCENE.render.resolution_percentage = 25
 
     # bpy.SCENE.cycles.device = 'GPU'
-    SCENE.render.image_settings.compression = 0
-    SCENE.cycles.samples = 25
+    SCENE.render.image_settings.compression = 90
+    SCENE.cycles.samples = 20
     SCENE.cycles.max_bounces = 1
     SCENE.cycles.min_bounces = 1
     SCENE.cycles.caustics_reflective = False
     SCENE.cycles.caustics_refractive = False
-    SCENE.render.tile_x = 32
-    SCENE.render.tile_y = 32
+
     SCENE.render.image_settings.color_mode ='RGBA'
+    SCENE.render.layers[0].cycles.use_denoising = True
+    set_tile(32)
 
     if animate:
         SCENE.render.image_settings.file_format='AVI_RAW'
@@ -21,6 +27,7 @@ def render_settings(animate, mode):
         SCENE.render.image_settings.file_format='PNG'
 
     if mode == 'high':
-        SCENE.render.image_settings.compression = 90
-        SCENE.cycles.samples = 400
-        SCENE.render.resolution_percentage = 100
+        set_tile(64)
+        SCENE.cycles.samples = 100
+        SCENE.render.resolution_percentage = 100
+

data/lib/glitch3d/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitch3d
 version: !ruby/object:Gem::Version
-  version: 0.2.3.3
+  version: 0.2.3.6
 platform: ruby
 authors:
 - pskl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - COPYING
 - Gemfile
@@ -99,19 +100,21 @@ files:
 - fixtures/textures/afx_face.jpeg
 - fixtures/textures/afx_logo.jpg
 - fixtures/textures/anime.jpg
+- fixtures/textures/baby.jpg
 - fixtures/textures/btc.jpg
 - fixtures/textures/checkered_texture.jpg
 - fixtures/textures/dude.jpg
 - fixtures/textures/grid.jpg
 - fixtures/textures/kago.jpg
 - fixtures/textures/kawai.jpg
+- fixtures/textures/mario.jpg
 - fixtures/textures/rug.jpg
 - fixtures/textures/slavs.jpg
 - fixtures/textures/spiral.jpg
 - fixtures/textures/vapor.jpg
 - fixtures/textures/woman.jpg
+- fixtures/textures/yolo.jpg
 - glitch3d.gemspec
-- image.py
 - lib/glitch3d.rb
 - lib/glitch3d/bpy/canvas/aether.py
 - lib/glitch3d/bpy/canvas/dreamatorium.py
@@ -119,6 +122,7 @@ files:
 - lib/glitch3d/bpy/helpers.py
 - lib/glitch3d/bpy/lighting.py
 - lib/glitch3d/bpy/main.py
+- lib/glitch3d/bpy/post-processing/mosaic.py
 - lib/glitch3d/bpy/render_settings.py
 - lib/glitch3d/objects/face.rb
 - lib/glitch3d/objects/vertex.rb