maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Pass anim frame time

Browse source
This commit is contained in:
Lubos Lenco 2017-03-20 02:21:13 +01:00
parent 2f80c4baf4
commit 6565a5b4de
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
blender/arm/exporter.py
View file

@ -2618,6 +2618,7 @@ class ArmoryExporter:
# Animation setup
if arm.utils.is_bone_animation_enabled(bobject) or arm.utils.is_object_animation_enabled(bobject):
x = {}
x['frame_time'] = 1 / self.scene.render.fps
if len(bobject.my_cliptraitlist) > 0:
# Edit clips enabled
x['names'] = []

7
blender/arm/material/functions.py
View file

@ -125,16 +125,15 @@ float tex_noise(const vec2 p) {
str_hsv_to_rgb = """
vec3 hsv_to_rgb(const vec3 c) {
vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
const vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
}
"""
str_rgb_to_hsv = """
vec3 rgb_to_hsv(const vec3 c)
{
vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
vec3 rgb_to_hsv(const vec3 c) {
const vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));