This commit is contained in:
Mikulas Florek 2017-09-24 00:05:48 +02:00
parent 04e32383f0
commit a6f3c17320
6 changed files with 1202 additions and 1043 deletions

File diff suppressed because it is too large Load diff

View file

@ -5,9 +5,13 @@
#include "engine/iplugin.h"
struct lua_State;
namespace Lumix
{
struct IAllocator;
class OutputBlob;
class Path;
@ -20,6 +24,10 @@ class ControllerResource;
struct AnimationScene : public IScene
{
static AnimationScene* create(Engine& engine, IPlugin& plugin, Universe& universe, IAllocator& allocator);
static void destroy(AnimationScene& scene);
static void registerLuaAPI(lua_State* L);
virtual const OutputBlob& getEventStream() const = 0;
virtual class Animation* getAnimableAnimation(ComponentHandle cmp) = 0;
virtual Path getAnimation(ComponentHandle cmp) = 0;
@ -48,6 +56,7 @@ struct AnimationScene : public IScene
virtual void setControllerDefaultSet(ComponentHandle cmp, int set) = 0;
virtual int getControllerDefaultSet(ComponentHandle cmp) = 0;
virtual Anim::ControllerResource* getControllerResource(ComponentHandle cmp) = 0;
virtual float getAnimationLength(int animation_idx) = 0;
};

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
#include "state_machine_editor.h"
#include "animation/animation.h"
#include "animation/animation_system.h"
#include "animation/animation_scene.h"
#include "animation/controller.h"
#include "animation/editor/animation_editor.h"
#include "animation/events.h"

View file

@ -1,7 +1,7 @@
#pragma once
#include "animation/animation_system.h"
#include "animation/animation_scene.h"
#include "animation/state_machine.h"
#include "engine/array.h"
#include "imgui/imgui.h"

View file

@ -1,4 +1,4 @@
#include "animation/animation_system.h"
#include "animation/animation_scene.h"
#include "animation/editor/animation_editor.h"
#include "audio_device.h"
#include "audio_scene.h"