glitch3d 0.2.3.6 → 0.2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a221d591135c6764014bb2f568a8d97568dde6
-  data.tar.gz: a941e1d8f3ed02a05ac14b0ae0d2fb89b7020d54
+  metadata.gz: 20f5ab3ec12f63cb4c39a2a8f4b5a9d49968c4e3
+  data.tar.gz: c4a9d2cd5b3776335c357f5475da4b2fb17ef8ee
 SHA512:
-  metadata.gz: ba1e3e41b11f3c551809593346c880ec70d74f3d943da2aa0b921673b8be76a5cf960eced4abd78f3c23f13a818b6ecbddb5091bfa7ca67d7f93ab83bdf30f2a
-  data.tar.gz: 3a01ad67f7ba65c5d6cfd37531f0a41b481bc516096516f3bdceac7d58d5a53b26d7acaba545bd6deadae1e294ed80197831452a2faded9d0a5283398ce423cd
+  metadata.gz: 912b55785ce3b9c2155c13b91e3db396d1e49d8b5c55e67a01fb5d06a4f539f363ccbd4b48b4b7b6f516eacf0b6bb83931512b7e9f23c279239bcff79bf9599f
+  data.tar.gz: d204670ff1ff5e430caaf19a82f661cf20fe7a5506dae6380e48d24b8d0e1857941aed571931f6f5a6fbe7c601a8534a8dd08504dbe7854354b9e85afae81211

data/README.md

@@ -1,9 +1,10 @@
 # Glitch3d
 
-Glitch3d is an automated render library that uses glitching techniques applied to 3D meshes.
+Glitch3d is an automated render library that uses glitching techniques applied to 3D meshes. The original intent was to focus on 3D glitching techniques and morphed into a render bot.
 
-# TODO : add image
-<!-- <img src="https://raw.githubusercontent.com/pskl/glitch3d/master/fixtures/demo.png" width="400"> -->
+You can read a bit more about where it come from [here](http://pascal.cc/blog/glitches) and see it living [there](https://twitter.com/glitchdemon).
+
+<img src="https://raw.githubusercontent.com/pskl/glitch3d/master/fixtures/examples/demo.jpg" width="400">
 
 This gem uses the Blender Python API to produces renders headlessly.
 
@@ -39,6 +40,8 @@ Options:
 - `animate` : (true) default: false => Render .avi file
 - `frame_numbers` : (default: 200) => number of frames
 
+Renders (wether it is video or an image) will be output to `./renders` along with an export of the `.scene` file so that you can potentially fiddle with the existing setup.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -49,7 +52,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/pskl/glitch3d. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-
 ## License
 
 Copyright © 217 PSKL <hello@pascal.cc>

data/bin/glitch3d

@@ -2,9 +2,12 @@
 # frozen_string_literal: true
 
 require 'glitch3d'
+require 'pry' if ENV['RACK_ENV'] == 'development'
+
 include Glitch3d
 
 args = Hash[ARGV.join(' ').scan(/--?([^=\s]+)(?:=(\S+))?/)] if args.nil?
+args.default = false
 
 if ARGV[0] && !ARGV[0].start_with?('--')
  source_file = ARGV[0]

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

@@ -46,6 +46,7 @@ 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/helpers.py

@@ -389,26 +389,18 @@ 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 move_ocean(ocean):
-    if animate:
-        ocean.modifiers['Ocean'].time += 0.01
-    else:
-        ocean.modifiers['Ocean'].time += 2
-    ocean.modifiers['Ocean'].random_seed = round(random.uniform(0, 100))
-    ocean.modifers['Ocean'].choppiness += random.uniform(0, 1.15)
-
 def camera_path(pitch = 0.01):
     res = []
     initial_z = INITIAL_CAMERA_LOCATION[2]
     initial_x = INITIAL_CAMERA_LOCATION[0]
     for y in pitched_array(initial_x, -initial_x, pitch):
-        res.append((initial_x, y, initial_z))
+        res.append((initial_x, y, math.sin(0.5*y) + 0.5))
     for x in pitched_array(initial_x, -initial_x, pitch):
-        res.append((x,-initial_x, initial_z))
+        res.append((x,-initial_x, math.sin(0.5*x) + 0.5))
     for y in pitched_array(-initial_x, initial_x, pitch):
-        res.append((-initial_x, y, initial_z))
+        res.append((-initial_x, y, math.sin(0.5*y) + 0.5))
     for x in pitched_array(-initial_x, initial_x, pitch):
-        res.append((x, initial_x, initial_z))
+        res.append((x, initial_x, math.sin(0.5*x) + 0.5))
     return res
 
 def pitched_array(minimum, maximum, pitch):
@@ -417,10 +409,12 @@ def pitched_array(minimum, maximum, pitch):
 def still_routine(index = 1):
     CAMERA.location = mathutils.Vector(INITIAL_CAMERA_LOCATION) + mathutils.Vector((round(random.uniform(-3, 3), 10),round(random.uniform(-3, 3), 10),round(random.uniform(-1, 1), 10)))
     randomize_reflectors_colors()
-    map(move_ocean, OCEAN)
-    map(make_object_glossy, OCEAN)
+    make_object_glossy(OCEAN[0])
     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, 1)
     if bpy.data.groups['Lines'].objects:
         for l in bpy.data.groups['Lines'].objects:
             rotation = rand_rotation()
@@ -444,10 +438,10 @@ def animation_routine(frame):
     look_at(SUBJECT)
     randomize_reflectors_colors()
     displace(SUBJECT)
-    if OCEAN:
-        map(move_ocean, OCEAN)
-        map(make_object_glossy, OCEAN)
-    SUBJECT.rotation_euler.z += math.radians(4)
+    for ocean in OCEAN:
+        ocean.modifiers['Ocean'].time += 0.5
+    make_object_glossy(OCEAN[0])
+    SUBJECT.rotation_euler.z += math.radians(1)
     for l in bpy.data.groups['Lines'].objects:
         l.rotation_euler.x += math.radians(5)
         l.rotation_euler.z += math.radians(5)

data/lib/glitch3d/bpy/main.py

@@ -33,6 +33,7 @@ shots_number = int(args.shots_number)
 #####################################
 
 import os, bpy, datetime, random, math, mathutils, random, uuid, sys, logging, string, colorsys, code
+from subprocess import call
 
 # Create directory for renders
 directory = os.path.dirname('./renders')
@@ -134,4 +135,8 @@ bpy.ops.wm.save_as_mainfile(filepath=output_name(model_path) + '.blend')
 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')])
+
 print('FINISHED ¯\_(ツ)_/¯')

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

@@ -3,8 +3,8 @@ import os, sys
 from PIL import Image
 
 print("Mosaicing")
-path = './renders/'
-files = [path + f for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
+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"))]
 images = map(Image.open, files)
 widths, heights = zip(*(i.size for i in images))
 
@@ -27,4 +27,4 @@ for file in files:
       y_offset += image.size[1]
       x_offset = 0
 
-res.save('./mosaic.png')
+res.save(path + 'mosaic.png')

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

@@ -0,0 +1,15 @@
+# Resize and compress high quality renders to be able to send it around
+import os, sys
+from PIL import Image
+
+print("Optimizing size of files")
+
+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"))]
+
+for img in files:
+  print("file being optimized -> " + img)
+  image = Image.open(img)
+  image = image.resize((2000,2000),Image.ANTIALIAS)
+  image.save(img, quality=95)
+  image.save(img, optimize=True, quality=65)

data/lib/glitch3d/strategies/duplication.rb

@@ -2,12 +2,6 @@
 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
       shuffle_vertices(vertices_objects_array)
     end
 
@@ -16,22 +10,12 @@ module Glitch3d
     end
 
     def shuffle_vertices(array)
-      2.times do
+      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]
       end
       array
     end
-
-    def copy_random_element(collection, iteration_number, chunk_size)
-      new_array = collection
-      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]
-      end
-      new_array
-    end
   end
 end

data/lib/glitch3d/version.rb

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

data/lib/glitch3d.rb

@@ -31,24 +31,7 @@ module Glitch3d
     raise 'Make sure Blender is correctly installed' if BLENDER_EXECUTABLE_PATH.nil?
     return clean_model(source_file) if args['clean']
     source_file = random_fixture if source_file.nil?
-
-    if args.has_key?('version')
-      puts Glitch3d::VERSION
-      return nil
-    end
-
-    if args.has_key?('animate')
-      args['animate'] = 'true'
-    else
-      args['animate'] = 'false'
-    end
-
-    if args.has_key?('debug')
-      args['debug'] = 'true'
-    else
-      args['debug'] = 'false'
-    end
-
+    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')
     @quality = args['quality'] || 'low'
@@ -60,6 +43,11 @@ module Glitch3d
     render(args, target_file, args['shots-number'] || 6) unless args['no-render']
   end
 
+  def print_version
+    puts Glitch3d::VERSION
+    return nil
+  end
+
   def random_fixture
     @fixtures_path = File.dirname(__FILE__) + '/../fixtures'
     fixtures = []
@@ -159,7 +147,6 @@ module Glitch3d
   end
 
   def render(initial_args, file_path, shots_number)
-    raise 'Animation arg not boolean' unless eval(initial_args['animate']).is_a?(FalseClass) || eval(initial_args['animate']).is_a?(TrueClass)
     args = [
       BLENDER_EXECUTABLE_PATH,
       '-b',
@@ -175,9 +162,9 @@ module Glitch3d
       '-p',
       File.dirname(__FILE__).to_s,
       '-a',
-      initial_args['animate'].capitalize,
+      initial_args['animate'].to_s.capitalize,
       '-d',
-      initial_args['debug'].capitalize
+      initial_args['debug'].to_s.capitalize
     ]
     system(*args)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitch3d
 version: !ruby/object:Gem::Version
-  version: 0.2.3.6
+  version: 0.2.3.7
 platform: ruby
 authors:
 - pskl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - bin/setup
 - fixtures/brain.obj
 - fixtures/cube.obj
+- fixtures/examples/demo.jpg
 - fixtures/face.obj
 - fixtures/hand.obj
 - fixtures/m4a1.obj
@@ -108,6 +109,7 @@ files:
 - fixtures/textures/kago.jpg
 - fixtures/textures/kawai.jpg
 - fixtures/textures/mario.jpg
+- fixtures/textures/nice_glasses.jpg
 - fixtures/textures/rug.jpg
 - fixtures/textures/slavs.jpg
 - fixtures/textures/spiral.jpg
@@ -123,6 +125,7 @@ files:
 - lib/glitch3d/bpy/lighting.py
 - lib/glitch3d/bpy/main.py
 - lib/glitch3d/bpy/post-processing/mosaic.py
+- lib/glitch3d/bpy/post-processing/optimize.py
 - lib/glitch3d/bpy/render_settings.py
 - lib/glitch3d/objects/face.rb
 - lib/glitch3d/objects/vertex.rb