Skip to content

Commit

Permalink
Remove timeline class.
Browse files Browse the repository at this point in the history
  • Loading branch information
cjhoward committed Jun 19, 2024
1 parent ec935cb commit b3d0a9b
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 238 deletions.
96 changes: 0 additions & 96 deletions src/engine/animation/timeline.cpp

This file was deleted.

116 changes: 0 additions & 116 deletions src/engine/animation/timeline.hpp

This file was deleted.

16 changes: 0 additions & 16 deletions src/game/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include <engine/animation/animator.hpp>
#include <engine/animation/ease.hpp>
#include <engine/animation/screen-transition.hpp>
#include <engine/animation/timeline.hpp>
#include <engine/color/color.hpp>
#include <engine/config.hpp>
#include <engine/debug/log.hpp>
Expand Down Expand Up @@ -715,10 +714,6 @@ void game::setup_scenes()

void game::setup_animation()
{
// Setup timeline system
timeline = std::make_unique<::timeline>();
timeline->set_autoremove(true);

// Setup animator
animator = std::make_unique<::animator>();
}
Expand Down Expand Up @@ -797,14 +792,6 @@ void game::setup_ui()
fade_transition->get_material()->set_variable("color", fade_transition_color);
fade_transition->get_billboard()->set_translation({0, 0, 98});

// Create inner radial transition
radial_transition_inner = std::make_unique<screen_transition>();
radial_transition_inner->get_material()->set_shader_template(resource_manager->load<gl::shader_template>("radial-transition-inner.glsl"));

// Create outer radial transition
radial_transition_outer = std::make_unique<screen_transition>();
radial_transition_outer->get_material()->set_shader_template(resource_manager->load<gl::shader_template>("radial-transition-outer.glsl"));

// Menu BG animations
{
auto menu_bg_frame_callback = [menu_bg_tint]([[maybe_unused]] int channel, const float& opacity)
Expand Down Expand Up @@ -1241,9 +1228,6 @@ void game::fixed_update(::frame_scheduler::duration_type fixed_update_time, ::fr
function_queue.pop();
}

// Advance timeline
//timeline->advance(dt);

// Update entity systems
animation_system->update(t, dt);

Expand Down
8 changes: 0 additions & 8 deletions src/game/game.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
class animator;
class resource_manager;
class screen_transition;
class timeline;
class shell;
class shell_buffer;

Expand Down Expand Up @@ -355,16 +354,9 @@ class game
scene::collection* active_scene;

// Animation
std::unique_ptr<timeline> timeline;
std::unique_ptr<animator> animator;
std::unique_ptr<animation<float>> radial_transition_in;
std::unique_ptr<animation<float>> radial_transition_out;
std::unique_ptr<screen_transition> fade_transition;
std::shared_ptr<render::matvar_fvec3> fade_transition_color;
std::unique_ptr<screen_transition> radial_transition_inner;
std::unique_ptr<screen_transition> radial_transition_outer;
std::unique_ptr<animation<float>> equip_tool_animation;
std::unique_ptr<animation<float>> unequip_tool_animation;

// Sound
std::unique_ptr<audio::sound_system> sound_system;
Expand Down
1 change: 0 additions & 1 deletion src/game/states/collection-menu-state.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class collection_menu_state: public game_state

std::shared_ptr<render::material> selection_material;
scene::billboard selection_billboard;
animation<float> selection_snap_animation;

std::shared_ptr<render::material> box_material;
scene::billboard box_billboard;
Expand Down
1 change: 0 additions & 1 deletion src/game/states/graphics-menu-state.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "game/fonts.hpp"
#include "game/menu.hpp"
#include "game/graphics.hpp"
#include <engine/animation/timeline.hpp>
#include "game/strings.hpp"
#include <engine/hash/fnv1a.hpp>

Expand Down

0 comments on commit b3d0a9b

Please sign in to comment.