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

Current status

Browse Source
This commit is contained in:
Daniel Collin 2012-10-28 03:23:09 +01:00
parent 83500b8b86
commit 36bbcfda6d
3 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ogl_editor/src/Editor.c
View File

@ -45,7 +45,7 @@ static EditorData s_editorData;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static uint64_t fontIds[2]; //static uint64_t fontIds[2];
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -53,7 +53,8 @@ void Editor_create()
{ {
Emgui_create("foo"); Emgui_create("foo");
//fontIds[0] = Emgui_loadFont("/Users/daniel/Library/Fonts/MicroKnight_v1.0.ttf", 11.0f); //fontIds[0] = Emgui_loadFont("/Users/daniel/Library/Fonts/MicroKnight_v1.0.ttf", 11.0f);
fontIds[0] = Emgui_loadFont(FONT_PATH "Arial.ttf", 11.0f); //fontIds[0] = Emgui_loadFont(FONT_PATH "Arial.ttf", 11.0f);
Emgui_setDefaultFont();
memset(&s_editorData, 0, sizeof(s_editorData)); memset(&s_editorData, 0, sizeof(s_editorData));
@ -102,6 +103,13 @@ bool Editor_keyDown(int key)
if (paused) if (paused)
{ {
int row = --s_editorData.trackViewInfo.rowPos; int row = --s_editorData.trackViewInfo.rowPos;
if (s_editorData.trackViewInfo.rowPos < 0)
{
s_editorData.trackViewInfo.rowPos = 0;
row = 0;
}
RemoteConnection_sendSetRowCommand(row); RemoteConnection_sendSetRowCommand(row);
Editor_update(); Editor_update();
return true; return true;

2
ogl_editor/src/RemoteConnection.c
View File

@ -37,7 +37,7 @@
static int s_clientIndex; static int s_clientIndex;
int s_socket = INVALID_SOCKET; int s_socket = INVALID_SOCKET;
int s_serverSocket = INVALID_SOCKET; int s_serverSocket = INVALID_SOCKET;
static bool s_paused = false; static bool s_paused = true;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

37
ogl_editor/src/TrackView.c
View File

@ -7,8 +7,8 @@
#include "../../sync/data.h" #include "../../sync/data.h"
#include "../../sync/track.h" #include "../../sync/track.h"
const int font_size = 12; const int font_size = 8;
static int start_pos = -19; static int start_pos = -27;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -31,7 +31,8 @@ static void printRowNumbers(int x, int y, int rowCount, int rowOffset, int rowSp
for (i = 0; i < rowCount; ++i) for (i = 0; i < rowCount; ++i)
{ {
char rowText[16]; char rowText[16];
sprintf(rowText, "%04d\n", rowOffset); memset(rowText, 0, sizeof(rowText));
sprintf(rowText, "%04d", rowOffset);
if (rowOffset % maskBpm) if (rowOffset % maskBpm)
Emgui_drawText(rowText, x, y, Emgui_color32(0xa0, 0xa0, 0xa0, 0xff)); Emgui_drawText(rowText, x, y, Emgui_color32(0xa0, 0xa0, 0xa0, 0xff));
@ -50,28 +51,31 @@ static void renderChannel(struct sync_track* track, int startX, int startY, int
uint x, y; uint x, y;
uint32_t color = Emgui_color32(40, 40, 40, 255); uint32_t color = Emgui_color32(40, 40, 40, 255);
Emgui_drawBorder(color, color, startX, startY, 64, 600); Emgui_drawBorder(color, color, startX, startY - 20, 128, 600);
Emgui_drawText(track->name, startX + 2, startY + 2, Emgui_color32(0xff, 0xff, 0xff, 0xff));
int y_offset = (startY + font_size) + font_size/2; if (track)
Emgui_drawText(track->name, startX + 2, startY + 2, Emgui_color32(0xff, 0xff, 0xff, 0xff));
int y_offset = startY;// + font_size / 2;
if (startPos < 0) if (startPos < 0)
{ {
y_offset = ((startY + font_size * -startPos) + font_size) + font_size/2; y_offset = startY + (font_size * -startPos);
startPos = 0; startPos = 0;
endPos = 40; endPos = 40;
} }
//int count = 0; y_offset += font_size / 2;
//float values[40];
for (y = startPos; y < endPos; ++y) for (y = startPos; y < endPos; ++y)
{ {
int offset = startX + 6; int offset = startX + 6;
int idx = -1;
float value = 0.0f; float value = 0.0f;
int idx = sync_find_key(track, y);
if (track)
idx = sync_find_key(track, y);
if (idx >= 0) if (idx >= 0)
{ {
@ -130,18 +134,23 @@ void TrackView_render(const TrackViewInfo* viewInfo, struct sync_data* syncData)
printRowNumbers(2, 42, 40, start_pos + viewInfo->rowPos, font_size, 8); printRowNumbers(2, 42, 40, start_pos + viewInfo->rowPos, font_size, 8);
if (syncData->num_tracks == 0) if (syncData->num_tracks == 0)
{
renderChannel(0, 40 + (i * 64), 42,
(start_pos + viewInfo->rowPos),
(start_pos + viewInfo->rowPos + 40));
uint32_t color = Emgui_color32(127, 127, 127, 56);
Emgui_fill(color, 0, 257, 800, font_size + 2);
return; return;
}
int num_tracks = syncData->num_tracks; int num_tracks = syncData->num_tracks;
if (num_tracks > 4) if (num_tracks > 4)
num_tracks = 4; num_tracks = 4;
//i = 0;
for (i = 0; i < num_tracks; ++i) for (i = 0; i < num_tracks; ++i)
{ {
renderChannel(syncData->tracks[i], 40 + (i * 64), 20, renderChannel(syncData->tracks[i], 40 + (i * 128), 42,
(start_pos + viewInfo->rowPos), (start_pos + viewInfo->rowPos),
(start_pos + viewInfo->rowPos + 40)); (start_pos + viewInfo->rowPos + 40));
} }