From d2fce970d603091fa5b1b975487d6fe8200f264c Mon Sep 17 00:00:00 2001 From: devZoGok Date: Sat, 6 Mar 2021 20:04:09 +0200 Subject: [PATCH] material animation --- keyframeChannel.h | 20 +------------------- texture.cpp | 8 ++++++++ texture.h | 1 + 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/keyframeChannel.h b/keyframeChannel.h index bf23291..ca20502 100644 --- a/keyframeChannel.h +++ b/keyframeChannel.h @@ -30,25 +30,7 @@ namespace vb01{ SPECULAR_COLOR_X, SPECULAR_COLOR_Y, SPECULAR_COLOR_Z, - TEXTURE_FRAME_A, - TEXTURE_FRAME_B, - TEXTURE_MIX_RATIO, - PARTICLE_EMITTER_SPEED, - PARTICLE_EMITTER_SPREAD, - PARTICLE_EMITTER_START_COLOR_W, - PARTICLE_EMITTER_START_COLOR_X, - PARTICLE_EMITTER_START_COLOR_Y, - PARTICLE_EMITTER_START_COLOR_Z, - PARTICLE_EMITTER_END_COLOR_W, - PARTICLE_EMITTER_END_COLOR_X, - PARTICLE_EMITTER_END_COLOR_Y, - PARTICLE_EMITTER_END_COLOR_Z, - PARTICLE_EMITTER_START_SIZE_X, - PARTICLE_EMITTER_START_SIZE_Y, - PARTICLE_EMITTER_END_SIZE_X, - PARTICLE_EMITTER_END_SIZE_Y, - PARTICLE_EMITTER_LOW_LIFE, - PARTICLE_EMITTER_HIGH_LIFE + TEXTURE_MIX_RATIO }; struct Keyframe{ enum Interpolation{CONSTANT, LINEAR, BEZIER}; diff --git a/texture.cpp b/texture.cpp index 73f8894..298b40a 100755 --- a/texture.cpp +++ b/texture.cpp @@ -148,6 +148,14 @@ namespace vb01{ } } + void Texture::animate(float value, KeyframeChannel keyframeChannel){ + switch(keyframeChannel.type){ + case KeyframeChannel::TEXTURE_MIX_RATIO: + mixRatio = value; + break; + } + } + void Texture::update(int id){ //updateFrame(); select(id); diff --git a/texture.h b/texture.h index a99e8fe..ceba485 100755 --- a/texture.h +++ b/texture.h @@ -4,6 +4,7 @@ #include #include #include "util.h" +#include "animatable.h" #include FT_FREETYPE_H namespace vb01{