glitch3d 0.2.2.5 → 0.2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a15b6ba339b081828a44dfb59587d73745cecfbc
-  data.tar.gz: 4b7d71946ca52bf70a562a9ec457b9a72cbdded8
+  metadata.gz: 7868c484686bc50595abbf027cc494d1219f8469
+  data.tar.gz: 3cedc59d39b7eeb4667fa786e45621089e2897c3
 SHA512:
-  metadata.gz: c5c5fd02a892349daf3b9fa218d9782a79804e1b8feb26d92a56903bb4a821d2aaef940d5c304ed35df34adcca3fde11708898c37f99b71b8a277cc5b77402a5
-  data.tar.gz: 6fa00d4f1fd9ada772c01a6a145e42348ca23717c4497c74539d3d9766895284240acc52bdb6768316d743a9e445ea40e40c51eb48fd3471a30bfcf5ebec3aa7
+  metadata.gz: f1b3e77e1adb9f7bbbf34e84703f00c736a9f2a945ba8b1405f7bff630d16e5f680c330bc15f6f4e62f75499d42cdf150380640eb3e52848099ab4bbb1d721e5
+  data.tar.gz: 96304f191ac1b70089237ff4beb99d1fde0a904ef64003f5335e6fb41efba0fc1e54a012c8742e81720f3d64688df1c2ebc978a23d7b25cc5dd8cbb4aabff5ee

data/COPYING

@@ -0,0 +1,4 @@
+Copyright © 2017 PSKL <hello@pascal.cc>
+This work is free. You can redistribute it and/or modify it under the
+terms of the Do What The Fuck You Want To Public License, Version 2,
+as published by Sam Hocevar. See http://www.wtfpl.net/ for more details.

data/README.md

@@ -30,10 +30,13 @@ Or install it yourself as:
 
 - `glitch3d file.obj`
 
+will
 Options:
-- `mode` : (localized|default|none)
-- `shots-number` : integer representing the number of - images desired
-- `quality` : (high|low)
+- `mode` : (localized|default|none) => glitching strategy
+- `shots-number` : integer representing the number of - images desired (with animate: false)
+- `quality` : (high: 2000 x 2000|low 200 x 200) default: low => size of the render
+- `animate` : (true) default: false => Render .avi file
+- `frame_numbers` : (default: 200) => number of frames
 
 ## Development
 
@@ -48,7 +51,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/pskl/g
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
-## TODO
-- write specs
+Copyright © 217 PSKL <hello@pascal.cc>
+This work is free. You can redistribute it and/or modify it under the
+terms of the Do What The Fuck You Want To Public License, Version 2,
+as published by Sam Hocevar. See the COPYING file for more details.

data/lib/glitch3d/bpy/helpers.py

@@ -9,7 +9,7 @@ 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 = 400
+NUMBER_OF_FRAMES = 200
 SCATTER_INTENSITY = 0.015
 ABSORPTION_INTENSITY = 0.25
 DISPLAY_SCALE = (2, 2, 2)
@@ -39,15 +39,11 @@ def empty_materials():
     for material in bpy.data.materials.keys():
         bpy.data.materials.remove(object.data.materials[material])
 
-def shoot(model_object, filepath):
-    directory = os.path.dirname('./renders')
-    if not os.path.exists(directory):
-      os.makedirs(directory)
-    look_at(model_object)
+def shoot(filepath):
     print('Camera now at location: ' + camera_location_string(CAMERA) + ' / rotation: ' + camera_rotation_string(CAMERA))
     bpy.context.scene.render.filepath = filepath
     if animate:
-        return bpy.ops.render.render(animation=animate)
+        return bpy.ops.render.render(animation=animate, write_still=True)
     bpy.ops.render.render(write_still=True)
 
 def output_name(index, model_path):
@@ -56,8 +52,8 @@ def output_name(index, model_path):
     else:
         return './renders/' + os.path.splitext(model_path)[0].split('/')[-1] + '_' + str(index) + '_' + str(datetime.date.today()) + '_' + str(mode) + '.png'
 
-def rotate(model_object, index):
-    model_object.rotation_euler[2] = math.radians(index * (360.0 / shots_number))
+def rotate(SUBJECT, index):
+    SUBJECT.rotation_euler[2] = math.radians(index * (360.0 / shots_number))
 
 # RGB 0 -> 1
 def rand_color_value():
@@ -102,8 +98,8 @@ def camera_rotation_string(camera):
 def camera_location_string(camera):
     return str(int(camera.location.x)) + ' ' + str(int(camera.location.y)) + ' ' + str(int(camera.location.z))
 
-def assign_material(model_object, material):
-    model_object.data.materials.append(material)
+def assign_material(SUBJECT, material):
+    SUBJECT.data.materials.append(material)
 
 # Returns a new Cycles material with default DiffuseBsdf node linked to output
 def create_cycles_material():
@@ -241,7 +237,7 @@ def shuffle(obj):
     obj.rotation_euler = rand_rotation()
 
 def series(length):
-    return list(map(lambda x: (0, x, math.cos(x)), numpy.arange(0.0, length, 0.1)))
+    return list(map(lambda x: (0, x, math.cos(x)), pitched_array(0.0, length, 0.1)))
 
 def randomize_reflectors_colors():
     for r in bpy.data.groups['Plane'].objects:
@@ -300,14 +296,17 @@ def displace_vector(vector):
     return mathutils.Vector((vector.x + random.uniform(-DISPLACEMENT_AMPLITUDE, DISPLACEMENT_AMPLITUDE), vector.y + random.uniform(-DISPLACEMENT_AMPLITUDE, DISPLACEMENT_AMPLITUDE), vector.z + random.uniform(-DISPLACEMENT_AMPLITUDE, DISPLACEMENT_AMPLITUDE)))
 
 # Replace vertex coordinate everywhere
-def find_and_replace(vector, target = random.uniform(0,9), replacement = random.uniform(0,9)):
+def find_and_replace(vector, target, replacement):
     return mathutils.Vector((float(str(vector.x).replace(target, replacement)), float(str(vector.y).replace(target, replacement)), float(str(vector.z).replace(target, replacement))))
 
 def glitch(object):
     bpy.ops.object.mode_set(mode='OBJECT')
     assert object.type == 'MESH'
+    ints = list(range(10))
+    target = str(ints.pop(int(random.uniform(0, len(ints) - 1))))
+    replacement = str(ints.pop(int(random.uniform(0, len(ints)))))
     for vertex in object.data.vertices:
-        vertex.co = find_and_replace(vertex.co)
+        vertex.co = find_and_replace(vertex.co, target, replacement)
 
 def displace(object):
     bpy.ops.object.mode_set(mode='OBJECT')
@@ -391,27 +390,30 @@ def move_ocean(ocean):
     ocean.modifiers['Ocean'].random_seed = round(random.uniform(0, 100))
     ocean.modifers['Ocean'].choppiness += 0.3
 
-def camera_path(pitch):
+def camera_path(pitch = 0.0001):
     res = []
     initial_z = INITIAL_CAMERA_LOCATION[2]
     initial_x = INITIAL_CAMERA_LOCATION[0]
-    for y in numpy.arange(initial_x, -initial_x, pitch):
+    for y in pitched_array(initial_x, -initial_x, pitch):
         res.append((initial_x, y, initial_z))
-    for x in numpy.arange(initial_x, -initial_x, pitch):
+    for x in pitched_array(initial_x, -initial_x, pitch):
         res.append((x,-initial_x, initial_z))
-    for y in numpy.arange(-initial_x, initial_x, pitch):
+    for y in pitched_array(-initial_x, initial_x, pitch):
         res.append((-initial_x, y, initial_z))
-    for x in numpy.arange(-initial_x, initial_x, pitch):
+    for x in pitched_array(-initial_x, initial_x, pitch):
         res.append((x, initial_x, initial_z))
     return res
 
+def pitched_array(min, max, pitch):
+    return list(map(lambda x: (min + pitch * x), range(int((max - min) / pitch))))
+
 def still_routine():
     CAMERA.location.x = INITIAL_CAMERA_LOCATION[0] + round(random.uniform(-2, 2), 10)
     CAMERA.location.y = INITIAL_CAMERA_LOCATION[1] + round(random.uniform(-2, 2), 10)
     randomize_reflectors_colors()
     map(move_ocean, OCEAN)
     map(make_object_glossy, OCEAN)
-    rotate(model_object, index)
+    rotate(SUBJECT, index)
     for l in bpy.data.groups['Lines'].objects:
         rotation = rand_rotation()
         l.rotation_euler = rotation
@@ -428,11 +430,12 @@ def still_routine():
 def animation_routine(frame):
     assert len(camera_path) >= NUMBER_OF_FRAMES
     CAMERA.location = camera_path[frame]
+    look_at(SUBJECT)
     randomize_reflectors_colors()
     map(move_ocean, OCEAN)
     map(make_object_glossy, OCEAN)
-    glitch(model_object)
-    model_object.rotation_euler.z += math.radians(4)
+    glitch(SUBJECT)
+    SUBJECT.rotation_euler.z += math.radians(4)
     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

@@ -28,39 +28,20 @@ path = str(args.path)
 animate = (args.animate == 'True')
 shots_number = int(args.shots_number)
 
-import os
-import bpy
-import datetime
-import bmesh
-import random
-import math
-import mathutils
-import random
-import uuid
-import sys
-import logging
-import string
-import colorsys
-import numpy
-import code
-
-# DEBUG = True
-if DEBUG:
-    shots_number = 2
-    import os
-    mode = 'low'
-    animate = False
-    file = "/Users/pascal/dev/glitch3d/fixtures/skull.obj"
-    path = "/Users/pascal/dev/glitch3d/lib/"
+import os, bpy, datetime, bmesh, random, math, mathutils, random, uuid, sys, logging, string, colorsys, code
+
+# Create directory for renders
+directory = os.path.dirname('./renders')
+if not os.path.exists(directory):
+    os.makedirs(directory)
 
 exec(open(os.path.join(path + '/glitch3d/bpy', 'helpers.py')).read())
 exec(open(os.path.join(path + '/glitch3d/bpy', 'render_settings.py')).read())
 exec(open(os.path.join(path + '/glitch3d/bpy', 'lighting.py')).read())
 
-DEBUG = False
 FISHEYE = True
 COLORS = rand_color_palette(5)
-INITIAL_CAMERA_LOCATION = (4, 4, 1)
+INITIAL_CAMERA_LOCATION = (3, 3, 1)
 FIXTURES_FOLDER_PATH = path + '/../fixtures/'
 TEXTURE_FOLDER_PATH = FIXTURES_FOLDER_PATH + 'textures/'
 
@@ -96,12 +77,12 @@ for primitive in PRIMITIVES:
 # Load model
 model_path = os.path.join(file)
 bpy.ops.import_scene.obj(filepath = model_path, use_edges=True)
-model_object = bpy.data.objects[1]
-model_object.select = True
+SUBJECT = bpy.data.objects['glitch3d']
+SUBJECT.select = True
 bpy.ops.object.origin_set(type="ORIGIN_CENTER_OF_MASS")
-model_object.location = ORIGIN
-make_object_glossy(model_object, YELLOW, 0.1)
-voronoize(model_object)
+SUBJECT.location = ORIGIN
+make_object_glossy(SUBJECT, YELLOW, 0.1)
+voronoize(SUBJECT)
 
 let_there_be_light(context.scene)
 
@@ -122,14 +103,15 @@ if animate:
         for ob in context.scene.objects:
             ob.keyframe_insert(data_path="location", index=-1)
     bpy.ops.screen.frame_jump(end=False)
-    shoot(model_object, output_name(index, model_path))
+    shoot(output_name(index, model_path))
 
 else:
     print('STILL RENDERING BEGIN')
     for index in range(0, int(shots_number)):
         print("-------------------------- " + str(index) + " --------------------------")
         still_routine()
-        shoot(model_object, output_name(index, model_path))
+        look_at(SUBJECT)
+        shoot(output_name(index, model_path))
 
 
 print('FINISHED ¯\_(ツ)_/¯')

data/lib/glitch3d/version.rb

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

data/lib/glitch3d.rb

@@ -137,9 +137,10 @@ module Glitch3d
     boundaries = Vertex.boundaries(content_hash[:vertices])
     File.open(target_file, 'w') do |f|
       f.puts '# Data corrupted with glitch3D script'
+      f.puts model_name
       f.puts '# Boundaries: ' + boundaries.to_s
       f.puts ''
-      f.puts "g #{model_name}"
+      f.puts "g glitch3d"
       f.puts ''
       f.puts content_hash[:vertices].map(&:to_s)
       f.puts ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitch3d
 version: !ruby/object:Gem::Version
-  version: 0.2.2.5
+  version: 0.2.2.6
 platform: ruby
 authors:
 - pskl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
+- COPYING
 - Gemfile
 - LICENSE.txt
 - README.md