vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Daniel Collin 2012-10-29 19:12:34 +01:00
commit acd901e271
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ogl_editor/src/Editor.c
View File

@ -2,6 +2,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <Emgui.h> #include <Emgui.h>
#include <stdio.h> #include <stdio.h>
#include <math.h>
#include "Dialog.h" #include "Dialog.h"
#include "Editor.h" #include "Editor.h"
#include "LoadSave.h" #include "LoadSave.h"
@ -35,6 +36,34 @@ static EditorData s_editorData;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static inline struct sync_track** getTracks()
{
return s_editorData.trackData.syncData.tracks;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static inline void setActiveTrack(int track)
{
s_editorData.trackData.activeTrack = track;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static inline int getActiveTrack()
{
return s_editorData.trackData.activeTrack;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static inline int getTrackCount()
{
return s_editorData.trackData.syncData.num_tracks;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//static uint64_t fontIds[2]; //static uint64_t fontIds[2];
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -62,12 +91,13 @@ void Editor_init()
static void drawStatus() static void drawStatus()
{ {
char temp[256]; char temp[256];
struct sync_track** tracks = getTracks();
if (!s_editorData.trackData.syncData.tracks) if (!tracks)
return; return;
int active_track = s_editorData.trackData.activeTrack; int active_track = getActiveTrack();
const struct sync_track* track = s_editorData.trackData.syncData.tracks[active_track]; const struct sync_track* track = tracks[active_track];
int row = s_editorData.trackViewInfo.rowPos; int row = s_editorData.trackViewInfo.rowPos;
int idx = key_idx_floor(track, row); int idx = key_idx_floor(track, row);
const char *str = "---"; const char *str = "---";
@ -153,10 +183,8 @@ bool Editor_keyDown(int key, int modifiers)
{ {
if (paused) if (paused)
{ {
--s_editorData.trackData.activeTrack; int track = getActiveTrack(); track--;
setActiveTrack(track < 0 ? 0 : track);
if (s_editorData.trackData.activeTrack < 0)
s_editorData.trackData.activeTrack = 0;
handled_key = true; handled_key = true;
} }
@ -168,10 +196,12 @@ bool Editor_keyDown(int key, int modifiers)
{ {
if (paused) if (paused)
{ {
++s_editorData.trackData.activeTrack; int track = getActiveTrack(); track++;
if (s_editorData.trackData.activeTrack >= s_editorData.trackData.syncData.num_tracks-1) if (track >= getTrackCount())
s_editorData.trackData.activeTrack = s_editorData.trackData.syncData.num_tracks - 1; track = getTrackCount() - 1;
setActiveTrack(track);
handled_key = true; handled_key = true;
} }