glitch3d 0.5.0.0 → 0.5.0.1

data/lib/glitch3d/bpy/post-processing/average.py

@@ -1,14 +1,13 @@
-# Use Pillow fork with Python3
+import sys
 from PIL import Image
 from PIL import ImageChops
 from PIL import ImageEnhance
 import numpy as np
-import random
-import sys, os, cv2, code
+import random, os, cv2, code, uuid
 
 print("Averaging and signing 💁🏻‍♀️")
-path = os.environ['RENDER_PATH']
-files = sys.argv[1:]
+files = RENDER_OUTPUT_PATHS
+print("Will average the following files: " + str(files))
 average_image = None
 old_image = None
 
@@ -35,9 +34,8 @@ for file in files:
     if random.randint(0,1) == 1:
       image = Image.fromarray(cv2.bitwise_not(np.asarray(current_image)))
 
-# add signatures
-for i in range(0,5):
-  font = random.choice(range(0, 7))
-  average_image = Image.fromarray(cv2.putText(np.asarray(average_image), random.choice(["PSKL"]), (random.choice(range(0, average_image.size[0])), random.choice(range(0, average_image.size[1]))), font, random.uniform(0.8, 3), random.choice([(255, 255, 255), (0,0,0)]), random.choice(range(1, 3)), random.choice(range(1,8))))
+# add signature
+font = random.choice(range(0, 7))
+average_image = Image.fromarray(cv2.putText(np.asarray(average_image), random.choice(["PSKL"]), (random.choice(range(0, average_image.size[0])), random.choice(range(0, average_image.size[1]))), font, random.uniform(0.8, 3), random.choice([(255, 255, 255), (0,0,0)]), random.choice(range(1, 3)), random.choice(range(1,8))))
 
-average_image.save(path + "average.png")
+average_image.save(os.environ['RENDER_PATH'] + "average_" + str(uuid.uuid1()) + ".png")

data/lib/glitch3d/bpy/post-processing/mosaic.py

@@ -3,7 +3,7 @@ import os, sys
 from PIL import Image
 
 path = os.environ['RENDER_PATH']
-files = [path + f for f in os.listdir(path) if (os.path.isfile(os.path.join(path, f)) and os.path.join(path, f).endswith(".png"))]
+files = RENDER_OUTPUT_PATHS
 images = list(map(Image.open, files))
 widths, heights = zip(*(i.size for i in images))
 

data/lib/glitch3d/bpy/post-processing/optimize.py

@@ -5,12 +5,9 @@ from PIL import Image
 
 print("Optimizing size of files")
 
-path = os.environ['RENDER_PATH']
-
-res_x = int(sys.argv[1])
-res_y = int(sys.argv[2])
-files = sys.argv[3:]
-
+res_x = bpy.context.scene.render.resolution_x
+res_y = bpy.context.scene.render.resolution_y
+files = RENDER_OUTPUT_PATHS
 for img in files:
   print("file being optimized -> " + img)
   image = Image.open(img)

data/lib/glitch3d/bpy/post-processing/palette.py

@@ -6,14 +6,13 @@ from PIL import Image
 from PIL import ImageDraw
 from PIL import ImageFont
 
-COLORS = sys.argv[1: -2]
 SLOT_WIDTH = 400
 img = Image.new('RGBA', (len(COLORS) * SLOT_WIDTH, SLOT_WIDTH), (255,255,255,255))
 draw_context = ImageDraw.Draw(img)
-font =  ImageFont.truetype(sys.argv[-1], 20)
+font =  ImageFont.truetype(FONT_FOLDER_PATH + 'helvetica_neue.ttf', 20)
 
-for idx, color in enumerate(COLORS):
-  actual_color = list((map(lambda x: int(x * 255), make_tuple(color))))
+for idx, color in enumerate(map(tuple, COLORS)):
+  actual_color = list((map(lambda x: int(x * 255), color)))
   draw_context.rectangle((((SLOT_WIDTH * idx), 0), (SLOT_WIDTH * idx + SLOT_WIDTH, SLOT_WIDTH)), fill=tuple(actual_color), outline=None)
   draw_context.text((SLOT_WIDTH * idx, 10), str(actual_color), font=font, fill=(255,255,255,255))
 

data/lib/glitch3d/bpy/render_settings.py

@@ -41,25 +41,35 @@ def isometric_camera():
     FIXED_CAMERA = True
 
 # Split rendering into 3 rendering layers
-def split_into_render_layers():
-    bpy.context.scene.render.layers[0].use = False
-    chunks = chunk_it(bpy.data.objects, 3)
-    for chunk_index in range(len(chunks)):
-        for obj in chunks[chunk_index]:
-            obj.layers[chunk_index + 1] = True
-            obj.layers[0] = False
-    for l in bpy.context.scene.render.layers[1:4]:
-        l.use = True
-    for obj in bpy.data.objects:
-        assert obj.layers[0] == False
-        assert len([i for i, x in enumerate(list(obj.layers)) if x]) == 1 # Only 1 layer activated
-    assert bpy.context.scene.render.layers[0].use == False
-    assert bpy.context.scene.render.layers[1].use == True
-    bpy.context.scene.layers[1] = True
-    bpy.context.scene.layers[2] = True
-    bpy.context.scene.layers[3] = True
+def split_into_render_layers(debug=False):
+    if debug:
+      bpy.context.scene.render.layers[0].use = False
+      bpy.context.scene.render.layers[1].use = True
+      bpy.context.scene.render.layers[2].use = False
+      bpy.context.scene.render.layers[3].use = False
+      for obj in bpy.data.objects:
+        obj.layers[0] = False
+        obj.layers[1] = True
+      return None
+    else:
+      bpy.context.scene.render.layers[0].use = False
+      chunks = chunk_it(bpy.data.objects, 3)
+      for chunk_index in range(len(chunks)):
+          for obj in chunks[chunk_index]:
+              obj.layers[chunk_index + 1] = True
+              obj.layers[0] = False
+      for l in bpy.context.scene.render.layers[1:4]:
+          l.use = True
+      for obj in bpy.data.objects:
+          assert obj.layers[0] == False
+          assert len([i for i, x in enumerate(list(obj.layers)) if x]) == 1 # Only 1 layer activated
+      assert bpy.context.scene.render.layers[0].use == False
+      assert bpy.context.scene.render.layers[1].use == True
+      bpy.context.scene.layers[1] = True
+      bpy.context.scene.layers[2] = True
+      bpy.context.scene.layers[3] = True
 
-def render_settings(animate, mode, normals, width, height):
+def render_settings(animate, mode, normals, width, height, debug):
     for layer in bpy.context.scene.render.layers:
       layer.use_pass_ambient_occlusion = True
     bpy.context.scene.render.resolution_x = width
@@ -69,24 +79,26 @@ def render_settings(animate, mode, normals, width, height):
     bpy.context.scene.cycles.samples = 20
     bpy.context.scene.cycles.max_bounces = 1
     CAMERA.data.dof_distance = (SUBJECT.location - CAMERA.location).length
+    CAMERA.data.dof_object = SUBJECT
     bpy.context.scene.cycles.shading_system = OSL_ENABLED
     bpy.context.scene.cycles.min_bounces = 1
     bpy.context.scene.cycles.caustics_reflective = False
     bpy.context.scene.cycles.caustics_refractive = False
     bpy.context.scene.cycles.film_transparent = True
     bpy.context.scene.render.image_settings.color_mode ='RGBA'
-    # if debug == False:
-    #   for l in bpy.context.scene.render.layers:
-    #     l.cyles.use_denoising = True
+    if not debug:
+      bpy.context.scene.render.layers[1].cycles.use_denoising = True
+      bpy.context.scene.render.layers[2].cycles.use_denoising = True
+      bpy.context.scene.render.layers[3].cycles.use_denoising = True
     bpy.context.scene.view_settings.view_transform = "Filmic"
     bpy.context.scene.view_settings.look = "Filmic - High Contrast"
-    tile_size = int(width / 50)
+    tile_size = int(width / 30)
     bpy.context.scene.render.tile_x = tile_size
     bpy.context.scene.render.tile_y = tile_size
     if normals:
         render_normals() # 1 render layer
     else:
-      split_into_render_layers()
+      split_into_render_layers(debug)
     if animate:
         bpy.context.scene.render.image_settings.file_format='AVI_RAW'
     else:

data/lib/glitch3d/objects/vertex.rb

@@ -50,7 +50,7 @@ class Vertex
   # Pass functions like :negative? or :positive?
   def self.subset(x:, y:, z:, vertex_list:)
     vertex_list.select do |vertex|
-      vertex.x.send(x) && vertex.y.send(y) && vertex.y.send(z)
+      vertex.x.send(x) || vertex.y.send(y) || vertex.y.send(z)
     end
   end
 end

data/lib/glitch3d/strategies/default.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 module Glitch3d
-  module Default
-    def alter_vertices(vertices_objects_array)
-      (VERTEX_GLITCH_ITERATION_RATIO * vertices_objects_array.size).to_i.times do |_|
-        random_element(vertices_objects_array).fuck
+  class Default
+    class << self
+      def alter_vertices(vertices_objects_array)
+        (VERTEX_GLITCH_ITERATION_RATIO * vertices_objects_array.size).to_i.times do |_|
+          vertices_objects_array.sample.fuck
+        end
+        vertices_objects_array
       end
-      vertices_objects_array
-    end
 
-    def alter_faces(faces_objects_array, vertex_objects_array)
-      faces_objects_array
+      def alter_faces(faces_objects_array, vertex_objects_array)
+        faces_objects_array
+      end
     end
   end
 end

data/lib/glitch3d/strategies/duplication.rb

@@ -1,21 +1,23 @@
 # frozen_string_literal: true
 module Glitch3d
   module Duplication
-    def alter_vertices(vertices_objects_array)
-      shuffle_vertices(vertices_objects_array)
-    end
+    class << self
+      def alter_vertices(vertices_objects_array)
+        shuffle_vertices(vertices_objects_array)
+      end
 
-    def alter_faces(faces_objects_array, vertex_objects_array)
-      faces_objects_array
-    end
+      def alter_faces(faces_objects_array, vertex_objects_array)
+        faces_objects_array
+      end
 
-    def shuffle_vertices(array)
-      rand(3).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]
+      def shuffle_vertices(array)
+        rand(3..10).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
-      array
     end
   end
 end

data/lib/glitch3d/strategies/find_and_replace.rb

@@ -1,26 +1,29 @@
 # frozen_string_literal: true
 module Glitch3d
   module FindAndReplace
-    def alter_vertices(vertices_objects_array)
-      @target = rand(9).to_s
-      @replacement = rand(9).to_s
-      vertices_objects_array.each do |v|
-        find_and_replace(v)
+    class << self
+      def alter_vertices(vertices_objects_array)
+        @target = rand(9).to_s
+        @replacement = rand(9).to_s
+        vertices_objects_array.each do |v|
+          find_and_replace(v)
+        end
+        vertices_objects_array
       end
-      vertices_objects_array
-    end
 
-    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)
+      def alter_faces(faces_objects_array, vertices_objects_array)
+        (FACE_GLITCH_ITERATION_RATIO * faces_objects_array.count)
+        faces_objects_array.sample(3) do |face|
+          face.v1 = rand(0..vertices_objects_array.size - 1)
+        end
+        faces_objects_array
       end
-      faces_objects_array
-    end
 
-    def find_and_replace(vertex)
-      vertex.x = vertex.x.to_s.tr(@target, @replacement).to_f
-      vertex.y = vertex.y.to_s.tr(@target, @replacement).to_f
-      vertex.z = vertex.z.to_s.tr(@target, @replacement).to_f
+      def find_and_replace(vertex)
+        vertex.x = vertex.x.to_s.tr(@target, @replacement).to_f
+        vertex.y = vertex.y.to_s.tr(@target, @replacement).to_f
+        vertex.z = vertex.z.to_s.tr(@target, @replacement).to_f
+      end
     end
   end
 end

data/lib/glitch3d/strategies/localized.rb

@@ -1,30 +1,40 @@
 # frozen_string_literal: true
 module Glitch3d
   module Localized
-    def alter_vertices(vertices_objects_array)
-      sorted_array = vertices_objects_array.sort do |v1, v2| 
-        rand_attr = v1.rand_attr
-        v1.send(rand_attr) <=> v2.send(rand_attr)
+    class NilSubSetError < StandardError; end
+
+    class << self
+      def alter_vertices(vertices_objects_array)
+        sorted_array = vertices_objects_array.sort do |v1, v2|
+          rand_attr = v1.rand_attr
+          v1.send(rand_attr) <=> v2.send(rand_attr)
+        end
+        (VERTEX_GLITCH_ITERATION_RATIO * sorted_array.size).to_i.times do |_|
+          target(sorted_array).sample.fuck
+        end
+        sorted_array
       end
-      (VERTEX_GLITCH_ITERATION_RATIO * sorted_array.size).to_i.times do |_|
-        random_element(target(sorted_array)).fuck
+
+      def alter_faces(faces_objects_array, vertices_objects_array)
+        (FACE_GLITCH_ITERATION_RATIO * faces_objects_array.count).to_i.times do |_|
+          faces_objects_array.sample.fuck(target(vertices_objects_array).sample)
+        end
+        faces_objects_array
       end
-      sorted_array
-    end
 
-    def alter_faces(faces_objects_array, vertices_objects_array)
-      (FACE_GLITCH_ITERATION_RATIO * faces_objects_array.count).to_i.times do |_|
-        random_element(faces_objects_array).fuck(random_element(target(vertices_objects_array)))
+      def selected_area(vertices_objects_array)
+        area = Vertex.subset(x: random_particularity, y: random_particularity, z: random_particularity, vertex_list: vertices_objects_array)
+        raise NilSubSetError if area.nil? || area.empty?
+        area
       end
-      faces_objects_array
-    end
 
-    def selected_area(vertices_objects_array)
-      Vertex.subset(x: :positive?, y: :positive?, z: :positive?, vertex_list: vertices_objects_array)
-    end
+      def random_particularity
+        [:positive?, :negative?].sample
+      end
 
-    def target(vertices_objects_array)
-      @target ||= selected_area(vertices_objects_array)
+      def target(vertices_objects_array)
+        selected_area(vertices_objects_array)
+      end
     end
   end
 end

data/lib/glitch3d/strategies/none.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 module Glitch3d
   module None
-    def alter_vertices(vertices_objects_array)
-      vertices_objects_array
-    end
+    class << self
+      def alter_vertices(vertices_objects_array)
+        vertices_objects_array
+      end
 
-    def alter_faces(faces_objects_array, _)
-      faces_objects_array
+      def alter_faces(faces_objects_array, _)
+        faces_objects_array
+      end
     end
   end
 end

data/lib/glitch3d/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitch3d
 version: !ruby/object:Gem::Version
-  version: 0.5.0.0
+  version: 0.5.0.1
 platform: ruby
 authors:
 - pskl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,12 +80,12 @@ files:
 - fixtures/models/polyhedron.obj
 - fixtures/models/skull.obj
 - fixtures/models/woman_body.obj
-- fixtures/osl-shaders/glass.osl
-- fixtures/osl-shaders/gold.osl
-- fixtures/osl-shaders/green_marble.osl
-- fixtures/osl-shaders/turbulent.osl
-- fixtures/osl-shaders/veined_marble.osl
-- fixtures/text/strings.txt
+- fixtures/osl_shaders/glass.osl
+- fixtures/osl_shaders/gold.osl
+- fixtures/osl_shaders/green_marble.osl
+- fixtures/osl_shaders/turbulent.osl
+- fixtures/osl_shaders/veined_marble.osl
+- fixtures/texts/strings.txt
 - fixtures/textures/checkered_texture.jpg
 - glitch3d.gemspec
 - lib/glitch3d.rb
@@ -94,11 +94,11 @@ files:
 - lib/glitch3d/bpy/canvas/aether.py
 - lib/glitch3d/bpy/canvas/canvas.py
 - lib/glitch3d/bpy/canvas/dreamatorium.py
+- lib/glitch3d/bpy/canvas/empty.py
 - lib/glitch3d/bpy/canvas/fernandez.py
 - lib/glitch3d/bpy/canvas/frame.py
 - lib/glitch3d/bpy/canvas/lyfe.py
 - lib/glitch3d/bpy/canvas/metaballs.py
-- lib/glitch3d/bpy/canvas/particles.py
 - lib/glitch3d/bpy/canvas/sphere.py
 - lib/glitch3d/bpy/canvas/waves.py
 - lib/glitch3d/bpy/helpers.py

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

@@ -1,33 +0,0 @@
-import bpy, sys, code, random, os, math, canvas, operator, mathutils
-
-sys.path.append(os.path.dirname(os.path.dirname(__file__)))
-import helpers
-
-class Particles(canvas.Canvas):
-  def render(self):
-    bpy.ops.mesh.primitive_cube_add(location=(0, 0, 100),radius=1)
-    cube = bpy.context.object
-    helpers.assign_material(cube, helpers.random_material(self.MATERIALS_NAMES))
-    self.spawn_particles_system(self.SUBJECT, cube)
-
-    for f in range(self.NUMBER_OF_FRAMES):
-      bpy.context.scene.frame_set(f)
-      self.SUBJECT.particle_systems["ParticleSystem"].seed += 1
-      self.SUBJECT.scale += mathutils.Vector((0.1,0.1,0.1))
-      helpers.add_frame([self.SUBJECT], ['particle_systems["ParticleSystem"].seed', 'scale'])
-
-  def spawn_particles_system(self, base, obj):
-    base.modifiers.new("Particles", type='PARTICLE_SYSTEM')
-    settings = bpy.data.particles[-1]
-    settings.emit_from = 'VERT'
-    settings.physics_type = 'NO'
-    settings.count = 2000 # default 1000
-    settings.particle_size = 0.01
-    settings.render_type = 'OBJECT'
-    settings.dupli_object = obj
-    settings.show_unborn = True
-    settings.use_dead = True
-    settings.size_random = 0.5
-    bpy.ops.object.duplicates_make_real()
-
-