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

Fixed compile errors

Browse Source
This commit is contained in:
Daniel Collin 2012-11-12 08:55:50 +01:00
parent 324d3dbd84
commit 65b6b3a3e9
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ogl_editor/src/TrackData.c
View File

@ -10,6 +10,7 @@ int TrackData_createGetTrack(TrackData* trackData, const char* name)
{ {
index = sync_create_track(&trackData->syncData, name); index = sync_create_track(&trackData->syncData, name);
memset(&trackData->tracks[index], 0, sizeof(Track)); memset(&trackData->tracks[index], 0, sizeof(Track));
trackData->tracks[index].index = index;
trackData->tracks[index].color = TrackData_getNextColor(trackData); trackData->tracks[index].color = TrackData_getNextColor(trackData);
} }

1
ogl_editor/src/TrackData.h
View File

@ -22,6 +22,7 @@ enum GroupType
typedef struct Track typedef struct Track
{ {
uint32_t index;
uint32_t color; uint32_t color;
bool hidden; bool hidden;
bool folded; bool folded;

30
ogl_editor/src/TrackView.c
View File

@ -196,7 +196,7 @@ static int renderChannel(struct TrackInfo* info, int startX, int editRow, Track*
folded = trackData->folded; folded = trackData->folded;
if (info->trackData->syncData.tracks) if (info->trackData->syncData.tracks)
track = info->trackData->syncData.tracks[trackIndex]; track = info->trackData->syncData.tracks[trackData->index];
size = renderTrackName(info, track, startX, folded); size = renderTrackName(info, track, startX, folded);
@ -240,7 +240,7 @@ static int renderChannel(struct TrackInfo* info, int startX, int editRow, Track*
{ {
int idx = -1; int idx = -1;
int offset = startX + 6; int offset = startX + 6;
bool selected; // bool selected;
if (track) if (track)
idx = sync_find_key(track, y); idx = sync_find_key(track, y);
@ -248,11 +248,11 @@ static int renderChannel(struct TrackInfo* info, int startX, int editRow, Track*
renderInterpolation(info, track, size, idx, offset, y_offset, folded); renderInterpolation(info, track, size, idx, offset, y_offset, folded);
renderText(info, track, y, idx, offset, y_offset, y == editRow, folded); renderText(info, track, y, idx, offset, y_offset, y == editRow, folded);
selected = (trackIndex >= info->selectLeft && trackIndex <= info->selectRight) && //selected = (trackIndex >= info->selectLeft && trackIndex <= info->selectRight) &&
(y >= info->selectTop && y < info->selectBottom); // (y >= info->selectTop && y < info->selectBottom);
if (selected) //if (selected)
Emgui_fill(Emgui_color32(0x4f, 0x4f, 0x4f, 0x3f), startX, y_offset - font_size_half, size, font_size); // Emgui_fill(Emgui_color32(0x4f, 0x4f, 0x4f, 0x3f), startX, y_offset - font_size_half, size, font_size);
y_offset += font_size; y_offset += font_size;
@ -268,11 +268,11 @@ static int renderChannel(struct TrackInfo* info, int startX, int editRow, Track*
void renderGroups(TrackViewInfo* viewInfo, TrackData* trackData) void renderGroups(TrackViewInfo* viewInfo, TrackData* trackData)
{ {
struct TrackInfo info; struct TrackInfo info;
Group* groups = &trackData->groups; Group* groups = trackData->groups;
const int sel_track = trackData->activeTrack; //const int sel_track = trackData->activeTrack;
int start_track = viewInfo->startTrack; int start_track = 0; //viewInfo->startTrack;
int x_pos = 40; int x_pos = 40;
int end_track = 0; //int end_track = 0;
int i = 0; int i = 0;
int adjust_top_size; int adjust_top_size;
int mid_screen_y ; int mid_screen_y ;
@ -304,23 +304,25 @@ void renderGroups(TrackViewInfo* viewInfo, TrackData* trackData)
info.endPos = y_pos_row + end_row; info.endPos = y_pos_row + end_row;
info.endSizeY = y_end_border; info.endSizeY = y_end_border;
if (syncData->num_tracks == 0) if (trackData->groupCount == 0)
{ {
uint32_t color = Emgui_color32(127, 127, 127, 56); uint32_t color = Emgui_color32(127, 127, 127, 56);
renderChannel(&info, x_pos, 0, 0); //renderChannel(&info, x_pos, 0, 0);
Emgui_fill(color, 0, mid_screen_y + adjust_top_size, viewInfo->windowSizeX, font_size + 2); Emgui_fill(color, 0, mid_screen_y + adjust_top_size, viewInfo->windowSizeX, font_size + 2);
return; return;
} }
for (i = 0; i < groups->groupCount; ++i) for (i = start_track; i < trackData->groupCount; ++i)
{ {
int size;
Group* group = &groups[i]; Group* group = &groups[i];
// //
if (group->trackCount == 1) if (group->trackCount == 1)
{ {
size = renderChannel(&info, x_pos, editRow, i); size = renderChannel(&info, x_pos, -1, group->t.track);
} }
else else
{ {