diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 19:49:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 19:50:14 +0300 |
commit | da53c3f02006b87e80ae898d1927a215b97cc934 (patch) | |
tree | f6c00c72822ad164586540a3602a20a3d4f9b6fb /intern/ghost/test | |
parent | c8af234f855ccd29d042f5298f7dea05922a350e (diff) | |
parent | 58e8c71cbd91931f97607ab8b028624b3e90455e (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/ghost/test')
-rw-r--r-- | intern/ghost/test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | intern/ghost/test/gears/GHOST_C-Test.c | 68 | ||||
-rw-r--r-- | intern/ghost/test/gears/GHOST_Test.cpp | 4 | ||||
-rw-r--r-- | intern/ghost/test/multitest/Basic.h | 8 | ||||
-rw-r--r-- | intern/ghost/test/multitest/EventToBuf.c | 4 | ||||
-rw-r--r-- | intern/ghost/test/multitest/MultiTest.c | 168 | ||||
-rw-r--r-- | intern/ghost/test/multitest/ScrollBar.c | 8 | ||||
-rw-r--r-- | intern/ghost/test/multitest/ScrollBar.h | 2 | ||||
-rw-r--r-- | intern/ghost/test/multitest/Util.c | 10 | ||||
-rw-r--r-- | intern/ghost/test/multitest/WindowData.c | 2 | ||||
-rw-r--r-- | intern/ghost/test/multitest/WindowData.h | 4 |
11 files changed, 141 insertions, 141 deletions
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index 0cec217630c..9f714ae4fba 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -103,7 +103,7 @@ suffix_relpaths(SRC_NEW "${SRC}" "../../guardedalloc/") include_directories(${INC_NEW}) add_library(guardedalloc_lib ${SRC_NEW}) -# blenfont +# blenfont include(${CMAKE_SOURCE_DIR}/../../../source/blender/blenfont/CMakeLists.txt) suffix_relpaths(INC_NEW "${INC}" "../../../source/blender/blenfont/") suffix_relpaths(SRC_NEW "${SRC}" "../../../source/blender/blenfont/") @@ -128,7 +128,7 @@ add_library(glewmx_lib ${SRC_NEW}) include_directories( "../../../source/blender/blenlib" ) -add_library(bli_lib +add_library(bli_lib "../../../source/blender/blenlib/intern/fileops.c" "../../../source/blender/blenlib/intern/gsqueue.c" "../../../source/blender/blenlib/intern/rct.c" diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c index c635ab9be5b..abaa6258122 100644 --- a/intern/ghost/test/gears/GHOST_C-Test.c +++ b/intern/ghost/test/gears/GHOST_C-Test.c @@ -84,16 +84,16 @@ static void gearGL(GLfloat inner_radius, GLfloat outer_radius, GLfloat width, GL GLfloat angle, da; GLfloat u, v, len; const double pi = 3.14159264; - + r0 = inner_radius; r1 = (float)(outer_radius - tooth_depth / 2.0); r2 = (float)(outer_radius + tooth_depth / 2.0); - + da = (float)(2.0 * pi / teeth / 4.0); - + glShadeModel(GL_FLAT); glNormal3f(0.0, 0.0, 1.0); - + /* draw front face */ glBegin(GL_QUAD_STRIP); for (i = 0; i <= teeth; i++) { @@ -104,7 +104,7 @@ static void gearGL(GLfloat inner_radius, GLfloat outer_radius, GLfloat width, GL glVertex3f((float)(r1 * cos(angle + 3 * da)), (float)(r1 * sin(angle + 3 * da)), (float)(width * 0.5)); } glEnd(); - + /* draw front sides of teeth */ glBegin(GL_QUADS); da = (float)(2.0 * pi / teeth / 4.0); @@ -116,9 +116,9 @@ static void gearGL(GLfloat inner_radius, GLfloat outer_radius, GLfloat width, GL glVertex3f((float)(r1 * cos(angle + 3 * da)), (float)(r1 * sin(angle + 3 * da)), (float)(width * 0.5)); } glEnd(); - + glNormal3f(0.0, 0.0, -1.0); - + /* draw back face */ glBegin(GL_QUAD_STRIP); for (i = 0; i <= teeth; i++) { @@ -129,7 +129,7 @@ static void gearGL(GLfloat inner_radius, GLfloat outer_radius, GLfloat width, GL glVertex3f((float)(r0 * cos(angle)), (float)(r0 * sin(angle)), (float)(-width * 0.5)); } glEnd(); - + /* draw back sides of teeth */ glBegin(GL_QUADS); da = (float)(2.0 * pi / teeth / 4.0); @@ -141,7 +141,7 @@ static void gearGL(GLfloat inner_radius, GLfloat outer_radius, GLfloat width, GL glVertex3f((float)(r1 * cos(angle)), (float)(r1 * sin(angle)), (float)(-width * 0.5)); } glEnd(); - + /* draw outward faces of teeth */ glBegin(GL_QUAD_STRIP); for (i = 0; i < teeth; i++) { @@ -169,9 +169,9 @@ static void gearGL(GLfloat inner_radius, GLfloat outer_radius, GLfloat width, GL glVertex3f((float)(r1 * cos(0.0)), (float)(r1 * sin(0.0)), (float)(width * 0.5)); glVertex3f((float)(r1 * cos(0.0)), (float)(r1 * sin(0.0)), (float)(-width * 0.5)); glEnd(); - + glShadeModel(GL_SMOOTH); - + /* draw inside radius cylinder */ glBegin(GL_QUAD_STRIP); for (i = 0; i <= teeth; i++) { @@ -191,13 +191,13 @@ static void drawGearGL(int id) static GLfloat ared[4] = { 0.8f, 0.1f, 0.0f, 1.0f }; static GLfloat agreen[4] = { 0.0f, 0.8f, 0.2f, 1.0f }; static GLfloat ablue[4] = { 0.2f, 0.2f, 1.0f, 1.0f }; - + glLightfv(GL_LIGHT0, GL_POSITION, pos); glEnable(GL_CULL_FACE); glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); glEnable(GL_DEPTH_TEST); - + switch (id) { case 1: @@ -222,32 +222,32 @@ static void drawGearGL(int id) static void drawGL(void) { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - + glPushMatrix(); - + glRotatef(view_rotx, 1.0, 0.0, 0.0); glRotatef(view_roty, 0.0, 1.0, 0.0); glRotatef(view_rotz, 0.0, 0.0, 1.0); - + glPushMatrix(); glTranslatef(-3.0, -2.0, 0.0); glRotatef(fAngle, 0.0, 0.0, 1.0); drawGearGL(1); glPopMatrix(); - + glPushMatrix(); glTranslatef(3.1f, -2.0f, 0.0f); glRotatef((float)(-2.0 * fAngle - 9.0), 0.0, 0.0, 1.0); drawGearGL(2); glPopMatrix(); - + glPushMatrix(); glTranslatef(-3.1f, 2.2f, -1.8f); glRotatef(90.0f, 1.0f, 0.0f, 0.0f); glRotatef((float)(2.0 * fAngle - 2.0), 0.0, 0.0, 1.0); drawGearGL(3); glPopMatrix(); - + glPopMatrix(); } @@ -256,13 +256,13 @@ static void setViewPortGL(GHOST_WindowHandle hWindow) { GHOST_RectangleHandle hRect = NULL; GLfloat w, h; - + GHOST_ActivateWindowDrawingContext(hWindow); hRect = GHOST_GetClientBounds(hWindow); - + w = (float)GHOST_GetWidthRectangle(hRect) / (float)GHOST_GetHeightRectangle(hRect); h = 1.0; - + glViewport(0, 0, GHOST_GetWidthRectangle(hRect), GHOST_GetHeightRectangle(hRect)); glMatrixMode(GL_PROJECTION); @@ -272,7 +272,7 @@ static void setViewPortGL(GHOST_WindowHandle hWindow) glMatrixMode(GL_MODELVIEW); glLoadIdentity(); glTranslatef(0.0, 0.0, -40.0); - + glClearColor(.2f, 0.0f, 0.0f, 0.0f); glClear(GL_COLOR_BUFFER_BIT); @@ -290,7 +290,7 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData) GHOST_TEventWheelData *wheelData = NULL; GHOST_DisplaySetting setting; GHOST_WindowHandle window = GHOST_GetEventWindow(hEvent); - + switch (GHOST_GetEventType(hEvent)) { #if 0 @@ -316,7 +316,7 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData) case GHOST_kEventKeyUp: break; - + case GHOST_kEventKeyDown: { keyData = (GHOST_TEventKeyData *)GHOST_GetEventData(hEvent); @@ -391,7 +391,7 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData) sprintf(ntitle, "%s-", title); GHOST_SetTitle(sMainWindow, ntitle); - + free(ntitle); free(title); } @@ -402,7 +402,7 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData) } } break; - + case GHOST_kEventWindowClose: { GHOST_WindowHandle window2 = GHOST_GetEventWindow(hEvent); @@ -420,7 +420,7 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData) } } break; - + case GHOST_kEventWindowActivate: handled = 0; break; @@ -437,7 +437,7 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData) GHOST_SwapWindowBuffers(window2); } break; - + default: handled = 0; break; @@ -456,7 +456,7 @@ int main(int argc, char **argv) /* Create the system */ shSystem = GHOST_CreateSystem(); GHOST_AddEventConsumer(shSystem, consumer); - + if (shSystem) { /* Create the main window */ @@ -471,7 +471,7 @@ int main(int argc, char **argv) printf("could not create main window\n"); exit(-1); } - + /* Create a secondary window */ sSecondaryWindow = GHOST_CreateWindow( shSystem, @@ -485,7 +485,7 @@ int main(int argc, char **argv) printf("could not create secondary window\n"); exit(-1); } - + /* Install a timer to have the gears running */ sGearsTimer = GHOST_InstallTimer(shSystem, 0, @@ -496,7 +496,7 @@ int main(int argc, char **argv) /* Enter main loop */ while (!sExitRequested) { - if (!GHOST_ProcessEvents(shSystem, 0)) + if (!GHOST_ProcessEvents(shSystem, 0)) { #ifdef WIN32 /* If there were no events, be nice to other applications */ @@ -519,7 +519,7 @@ int main(int argc, char **argv) /* Dispose the system */ GHOST_DisposeSystem(shSystem); - + return 0; } diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp index f58a220055f..8c4d93fcbc4 100644 --- a/intern/ghost/test/gears/GHOST_Test.cpp +++ b/intern/ghost/test/gears/GHOST_Test.cpp @@ -273,7 +273,7 @@ static void View(GHOST_IWindow *window, bool stereo, int eye = 0) if (stereo) { if (nVidiaWindows) - { + { // handled by nVidia driver so act as normal (explicitly put here since // it -is- stereo) glViewport(0, 0, bnds.getWidth(), bnds.getHeight()); @@ -666,7 +666,7 @@ bool Application::processEvent(GHOST_IEvent *event) window2->swapBuffers(); } break; - + default: handled = false; break; diff --git a/intern/ghost/test/multitest/Basic.h b/intern/ghost/test/multitest/Basic.h index c8f61d40c57..86d68ef06cb 100644 --- a/intern/ghost/test/multitest/Basic.h +++ b/intern/ghost/test/multitest/Basic.h @@ -28,11 +28,11 @@ int min_i (int a, int b); int max_i (int a, int b); -int clamp_i (int val, int min, int max); +int clamp_i (int val, int min, int max); -float min_f (float a, float b); -float max_f (float a, float b); -float clamp_f (float val, float min, float max); +float min_f (float a, float b); +float max_f (float a, float b); +float clamp_f (float val, float min, float max); void rect_copy (int dst[2][2], int src[2][2]); int rect_contains_pt (int rect[2][2], int pt[2]); diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c index 49255de5e64..7401ab83dbf 100644 --- a/intern/ghost/test/multitest/EventToBuf.c +++ b/intern/ghost/test/multitest/EventToBuf.c @@ -47,7 +47,7 @@ char *eventtype_to_string(GHOST_TEventType type) case GHOST_kEventQuit: return "Quit"; case GHOST_kEventWindowClose: return "WindowClose"; - case GHOST_kEventWindowActivate: return "WindowActivate"; + case GHOST_kEventWindowActivate: return "WindowActivate"; case GHOST_kEventWindowDeactivate: return "WindowDeactivate"; case GHOST_kEventWindowUpdate: return "WindowUpdate"; case GHOST_kEventWindowSize: return "WindowSize"; @@ -188,7 +188,7 @@ static char *keytype_to_string(GHOST_TKey key) K(KeyF22); K(KeyF23); K(KeyF24); - + default: return "KeyUnknown"; } diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c index 833b5c720a1..8cd31c3137e 100644 --- a/intern/ghost/test/multitest/MultiTest.c +++ b/intern/ghost/test/multitest/MultiTest.c @@ -79,7 +79,7 @@ void rect_bevel_side(int rect[2][2], int side, float *lt, float *dk, const float int ltidx = (side / 2) % 4; int dkidx = (ltidx + 1 + (side & 1)) % 4; int i, corner; - + glBegin(GL_LINES); for (i = 0; i < width; i++) { float ltf = pow(lt[i], 1.0 / 2.2), dkf = pow(dk[i], 1.0 / 2.2); @@ -102,7 +102,7 @@ void rect_bevel_side(int rect[2][2], int side, float *lt, float *dk, const float } } glEnd(); - + glColor3fv(col); glRecti(rect[0][0] + width, rect[0][1] + width, rect[1][0] - width, rect[1][1] - width); } @@ -113,17 +113,17 @@ void rect_bevel_smooth(int rect[2][2], int width) float *dk = malloc(sizeof(*dk) * width); float col[4]; int i; - + for (i = 0; i < width; i++) { float v = width - 1 ? ((float) i / (width - 1)) : 0; lt[i] = 1.2 + (1.0 - 1.2) * v; dk[i] = 0.2 + (1.0 - 0.2) * v; } - + glGetFloatv(GL_CURRENT_COLOR, col); - + rect_bevel_side(rect, 3, lt, dk, col, width); - + free(lt); free(dk); } @@ -136,11 +136,11 @@ typedef struct { MultiTestApp *app; GHOST_WindowHandle win; - + int size[2]; - + int lmouse[2], lmbut[3]; - + int tmouse[2]; } MainWindow; @@ -152,18 +152,18 @@ static void mainwindow_log(MainWindow *mw, char *str) static void mainwindow_do_draw(MainWindow *mw) { GHOST_ActivateWindowDrawingContext(mw->win); - + if (mw->lmbut[0]) { glClearColor(0.5, 0.5, 0.5, 1); } else { glClearColor(1, 1, 1, 1); - } + } glClear(GL_COLOR_BUFFER_BIT); - + glColor3f(0.5, 0.6, 0.8); glRecti(mw->tmouse[0] - 5, mw->tmouse[1] - 5, mw->tmouse[0] + 5, mw->tmouse[1] + 5); - + GHOST_SwapWindowBuffers(mw->win); } @@ -175,7 +175,7 @@ static void mainwindow_do_reshape(MainWindow *mw) mw->size[0] = GHOST_GetWidthRectangle(bounds); mw->size[1] = GHOST_GetHeightRectangle(bounds); - + glViewport(0, 0, mw->size[0], mw->size[1]); glMatrixMode(GL_PROJECTION); @@ -234,7 +234,7 @@ static void mainwindow_do_key(MainWindow *mw, GHOST_TKey key, int press) static void mainwindow_do_move(MainWindow *mw, int x, int y) { mw->lmouse[0] = x, mw->lmouse[1] = y; - + if (mw->lmbut[0]) { mw->tmouse[0] = x, mw->tmouse[1] = y; GHOST_InvalidateWindow(mw->win); @@ -261,10 +261,10 @@ static void mainwindow_handle(void *priv, GHOST_EventHandle evt) MainWindow *mw = priv; GHOST_TEventType type = GHOST_GetEventType(evt); char buf[256]; - + event_to_buf(evt, buf); mainwindow_log(mw, buf); - + switch (type) { case GHOST_kEventCursorMove: { @@ -304,7 +304,7 @@ static void mainwindow_timer_proc(GHOST_TimerTaskHandle task, GHOST_TUns64 time) { MainWindow *mw = GHOST_GetTimerTaskUserData(task); char buf[64]; - + sprintf(buf, "timer: %6.2f", (double) ((GHOST_TInt64) time) / 1000); mainwindow_log(mw, buf); } @@ -314,23 +314,23 @@ MainWindow *mainwindow_new(MultiTestApp *app) GHOST_SystemHandle sys = multitestapp_get_system(app); GHOST_WindowHandle win; GHOST_GLSettings glSettings = {0}; - + win = GHOST_CreateWindow( sys, "MultiTest:Main", 40, 40, 400, 400, GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL, glSettings); - + if (win) { MainWindow *mw = MEM_callocN(sizeof(*mw), "mainwindow_new"); mw->app = app; mw->win = win; - + GHOST_SetWindowUserData(mw->win, windowdata_new(mw, mainwindow_handle)); - + GHOST_InstallTimer(sys, 1000, 10000, mainwindow_timer_proc, mw); - + return mw; } else { @@ -356,23 +356,23 @@ struct _LoggerWindow { GHOST_WindowHandle win; -#ifdef USE_BMF +#ifdef USE_BMF BMF_Font *font; #else int font; #endif int fonttexid; int fontheight; - + int size[2]; - + int ndisplines; int textarea[2][2]; ScrollBar *scroll; - + char **loglines; int nloglines, logsize; - + int lmbut[3]; int lmouse[2]; }; @@ -383,7 +383,7 @@ struct _LoggerWindow { static void loggerwindow_recalc_regions(LoggerWindow *lw) { int nscroll[2][2]; - + nscroll[0][0] = SCROLLBAR_PAD; nscroll[0][1] = SCROLLBAR_PAD; nscroll[1][0] = nscroll[0][0] + SCROLLBAR_WIDTH; @@ -418,10 +418,10 @@ static void loggerwindow_do_reshape(LoggerWindow *lw) GHOST_RectangleHandle bounds = GHOST_GetClientBounds(lw->win); GHOST_ActivateWindowDrawingContext(lw->win); - + lw->size[0] = GHOST_GetWidthRectangle(bounds); lw->size[1] = GHOST_GetHeightRectangle(bounds); - + loggerwindow_recalc_regions(lw); loggerwindow_setup_window_gl(lw); } @@ -430,21 +430,21 @@ static void loggerwindow_do_draw(LoggerWindow *lw) { int i, ndisplines, startline; int sb_rect[2][2], sb_thumb[2][2]; - + GHOST_ActivateWindowDrawingContext(lw->win); - + glClearColor(1, 1, 1, 1); glClear(GL_COLOR_BUFFER_BIT); glColor3f(0.8, 0.8, 0.8); rect_bevel_smooth(lw->textarea, 4); - + scrollbar_get_rect(lw->scroll, sb_rect); scrollbar_get_thumb(lw->scroll, sb_thumb); - + glColor3f(0.6, 0.6, 0.6); rect_bevel_smooth(sb_rect, 1); - + if (scrollbar_is_scrolling(lw->scroll)) { glColor3f(0.6, 0.7, 0.5); } @@ -452,16 +452,16 @@ static void loggerwindow_do_draw(LoggerWindow *lw) glColor3f(0.9, 0.9, 0.92); } rect_bevel_smooth(sb_thumb, 1); - + startline = scrollbar_get_thumbpos(lw->scroll) * (lw->nloglines - 1); ndisplines = min_i(lw->ndisplines, lw->nloglines - startline); if (lw->fonttexid != -1) { glBindTexture(GL_TEXTURE_2D, lw->fonttexid); - + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_BLEND); - glEnable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); } glColor3f(0, 0, 0); for (i = 0; i < ndisplines; i++) { @@ -470,7 +470,7 @@ static void loggerwindow_do_draw(LoggerWindow *lw) int x_pos = lw->textarea[0][0] + 4; int y_pos = lw->textarea[0][1] + 4 + i * lw->fontheight; -#ifdef USE_BMF +#ifdef USE_BMF if (lw->fonttexid == -1) { glRasterPos2i(x_pos, y_pos); BMF_DrawString(lw->font, line); @@ -486,7 +486,7 @@ static void loggerwindow_do_draw(LoggerWindow *lw) #ifdef USE_BMF if (lw->fonttexid != -1) { - glDisable(GL_TEXTURE_2D); + glDisable(GL_TEXTURE_2D); glDisable(GL_BLEND); } #endif @@ -497,7 +497,7 @@ static void loggerwindow_do_draw(LoggerWindow *lw) static void loggerwindow_do_move(LoggerWindow *lw, int x, int y) { lw->lmouse[0] = x, lw->lmouse[1] = y; - + if (scrollbar_is_scrolling(lw->scroll)) { scrollbar_keep_scrolling(lw->scroll, y); GHOST_InvalidateWindow(lw->win); @@ -508,10 +508,10 @@ static void loggerwindow_do_button(LoggerWindow *lw, int which, int press) { if (which == GHOST_kButtonMaskLeft) { lw->lmbut[0] = press; - + if (press) { if (scrollbar_contains_pt(lw->scroll, lw->lmouse)) { - scrollbar_start_scrolling(lw->scroll, lw->lmouse[1]); + scrollbar_start_scrolling(lw->scroll, lw->lmouse[1]); GHOST_SetCursorShape(lw->win, GHOST_kStandardCursorUpDown); GHOST_InvalidateWindow(lw->win); } @@ -546,7 +546,7 @@ static void loggerwindow_handle(void *priv, GHOST_EventHandle evt) { LoggerWindow *lw = priv; GHOST_TEventType type = GHOST_GetEventType(evt); - + switch (type) { case GHOST_kEventCursorMove: { @@ -588,7 +588,7 @@ LoggerWindow *loggerwindow_new(MultiTestApp *app) GHOST_SystemHandle sys = multitestapp_get_system(app); GHOST_TUns32 screensize[2]; GHOST_WindowHandle win; - + GHOST_GetMainDisplayDimensions(sys, &screensize[0], &screensize[1]); win = GHOST_CreateWindow( sys, "MultiTest:Logger", @@ -596,7 +596,7 @@ LoggerWindow *loggerwindow_new(MultiTestApp *app) GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL, glSettings); - + if (win) { LoggerWindow *lw = MEM_callocN(sizeof(*lw), "loggerwindow_new"); int bbox[2][2]; @@ -614,12 +614,12 @@ LoggerWindow *loggerwindow_new(MultiTestApp *app) BLF_size(lw->font, 11, 72); lw->fontheight = BLF_height(lw->font, "A_", 2); #endif - + lw->nloglines = lw->logsize = 0; lw->loglines = MEM_mallocN(sizeof(*lw->loglines) * lw->nloglines, "loglines"); - + lw->scroll = scrollbar_new(2, 40); - + GHOST_SetWindowUserData(lw->win, windowdata_new(lw, loggerwindow_handle)); loggerwindow_do_reshape(lw); @@ -636,10 +636,10 @@ void loggerwindow_log(LoggerWindow *lw, char *line) if (lw->nloglines == lw->logsize) { lw->loglines = memdbl(lw->loglines, &lw->logsize, sizeof(*lw->loglines)); } - + lw->loglines[lw->nloglines++] = string_dup(line); scrollbar_set_thumbpct(lw->scroll, (float) lw->ndisplines / lw->nloglines); - + GHOST_InvalidateWindow(lw->win); } @@ -652,7 +652,7 @@ void loggerwindow_free(LoggerWindow *lw) MEM_freeN(lw->loglines[i]); } MEM_freeN(lw->loglines); - + windowdata_free(GHOST_GetWindowUserData(lw->win)); GHOST_DisposeWindow(sys, lw->win); MEM_freeN(lw); @@ -667,7 +667,7 @@ typedef struct { MultiTestApp *app; GHOST_WindowHandle win; - + int size[2]; } ExtraWindow; @@ -677,10 +677,10 @@ static void extrawindow_do_draw(ExtraWindow *ew) glClearColor(1, 1, 1, 1); glClear(GL_COLOR_BUFFER_BIT); - + glColor3f(0.8, 0.8, 0.8); glRecti(10, 10, ew->size[0] - 10, ew->size[1] - 10); - + GHOST_SwapWindowBuffers(ew->win); } @@ -692,7 +692,7 @@ static void extrawindow_do_reshape(ExtraWindow *ew) ew->size[0] = GHOST_GetWidthRectangle(bounds); ew->size[1] = GHOST_GetHeightRectangle(bounds); - + glViewport(0, 0, ew->size[0], ew->size[1]); glMatrixMode(GL_PROJECTION); @@ -721,15 +721,15 @@ static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time) double ftime = (double) ((GHOST_TInt64) time) / 1000; float angle = fmod(ftime, 1.0) * 3.1415 * 2; int i; - + memset(&bitmap, 0, sizeof(bitmap)); memset(&mask, 0, sizeof(mask)); - + bitmap[0][0] |= mask[0][0] |= 0xF; bitmap[1][0] |= mask[1][0] |= 0xF; bitmap[2][0] |= mask[2][0] |= 0xF; bitmap[3][0] |= mask[3][0] |= 0xF; - + for (i = 0; i < 7; i++) { int x = 7 + cos(angle) * i; int y = 7 + sin(angle) * i; @@ -740,10 +740,10 @@ static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time) float v = (i / 63.0) * 3.1415 * 2; int x = 7 + cos(v) * 7; int y = 7 + sin(v) * 7; - + mask[y][x / 8] |= (1 << (x % 8)); } - + GHOST_SetCustomCursorShape(ew->win, bitmap, mask, 0, 0); } @@ -752,10 +752,10 @@ static void extrawindow_handle(void *priv, GHOST_EventHandle evt) ExtraWindow *ew = priv; GHOST_TEventType type = GHOST_GetEventType(evt); char buf[256]; - + event_to_buf(evt, buf); loggerwindow_log(multitestapp_get_logger(ew->app), buf); - + switch (type) { case GHOST_kEventKeyDown: case GHOST_kEventKeyUp: @@ -790,21 +790,21 @@ ExtraWindow *extrawindow_new(MultiTestApp *app) GHOST_GLSettings glSettings = {0}; GHOST_SystemHandle sys = multitestapp_get_system(app); GHOST_WindowHandle win; - + win = GHOST_CreateWindow( sys, "MultiTest:Extra", 500, 40, 400, 400, GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL, glSettings); - + if (win) { ExtraWindow *ew = MEM_callocN(sizeof(*ew), "mainwindow_new"); ew->app = app; ew->win = win; - + GHOST_SetWindowUserData(ew->win, windowdata_new(ew, extrawindow_handle)); - + return ew; } else { @@ -824,13 +824,13 @@ void extrawindow_free(ExtraWindow *ew) /* * MultiTestApp */ - + struct _MultiTestApp { GHOST_SystemHandle sys; MainWindow *main; LoggerWindow *logger; ExtraWindow *extra; - + int exit; }; @@ -838,21 +838,21 @@ static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr dat { MultiTestApp *app = data; GHOST_WindowHandle win; - + win = GHOST_GetEventWindow(evt); if (win && !GHOST_ValidWindow(app->sys, win)) { loggerwindow_log(app->logger, "WARNING: bad event, non-valid window\n"); return 1; } - + if (win) { WindowData *wb = GHOST_GetWindowUserData(win); - + windowdata_handle(wb, evt); } else { GHOST_TEventType type = GHOST_GetEventType(evt); - + /* GHOST_kEventQuit are the only 'system' events, * that is, events without a window. */ @@ -866,7 +866,7 @@ static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr dat break; } } - + return 1; } @@ -880,25 +880,25 @@ MultiTestApp *multitestapp_new(void) { if (!app->sys) fatal("Unable to create ghost system"); - if (!GHOST_AddEventConsumer(app->sys, consumer)) + if (!GHOST_AddEventConsumer(app->sys, consumer)) fatal("Unable to add multitest event consumer "); - + app->main = mainwindow_new(app); - if (!app->main) + if (!app->main) fatal("Unable to create main window"); - + app->logger = loggerwindow_new(app); if (!app->logger) fatal("Unable to create logger window"); app->extra = NULL; app->exit = 0; - + return app; } LoggerWindow *multitestapp_get_logger(MultiTestApp *app) { - return app->logger; + return app->logger; } GHOST_SystemHandle multitestapp_get_system(MultiTestApp *app) { @@ -943,7 +943,7 @@ void multitestapp_free(MultiTestApp *app) } /***/ - + int main(int argc, char **argv) { MultiTestApp *app; @@ -953,9 +953,9 @@ int main(int argc, char **argv) #endif app = multitestapp_new(); - + multitestapp_run(app); multitestapp_free(app); - + return 0; } diff --git a/intern/ghost/test/multitest/ScrollBar.c b/intern/ghost/test/multitest/ScrollBar.c index 8964d304920..2a363f3ce5d 100644 --- a/intern/ghost/test/multitest/ScrollBar.c +++ b/intern/ghost/test/multitest/ScrollBar.c @@ -37,7 +37,7 @@ struct _ScrollBar { int rect[2][2]; float thumbpos, thumbpct; - + int inset; int minthumb; @@ -48,7 +48,7 @@ struct _ScrollBar { static int scrollbar_get_thumbH(ScrollBar *sb) { int scrollable_h = rect_height(sb->rect) - 2 * sb->inset; - + return clamp_i(sb->thumbpct * scrollable_h, sb->minthumb, scrollable_h); } @@ -56,7 +56,7 @@ static int scrollbar_get_thumbableH(ScrollBar *sb) { int scrollable_h = rect_height(sb->rect) - 2 * sb->inset; int thumb_h = scrollbar_get_thumbH(sb); - + return scrollable_h - thumb_h; } @@ -76,7 +76,7 @@ ScrollBar *scrollbar_new(int inset, int minthumb) ScrollBar *sb = MEM_callocN(sizeof(*sb), "scrollbar_new"); sb->inset = inset; sb->minthumb = minthumb; - + return sb; } diff --git a/intern/ghost/test/multitest/ScrollBar.h b/intern/ghost/test/multitest/ScrollBar.h index 8c8d02d197e..dd737539bf2 100644 --- a/intern/ghost/test/multitest/ScrollBar.h +++ b/intern/ghost/test/multitest/ScrollBar.h @@ -29,7 +29,7 @@ typedef struct _ScrollBar ScrollBar; /***/ - + ScrollBar* scrollbar_new (int inset, int minthumb); int scrollbar_is_scrolling (ScrollBar *sb); diff --git a/intern/ghost/test/multitest/Util.c b/intern/ghost/test/multitest/Util.c index bacd0a313d4..9ac7ae0263d 100644 --- a/intern/ghost/test/multitest/Util.c +++ b/intern/ghost/test/multitest/Util.c @@ -40,10 +40,10 @@ void *memdbl(void *mem, int *size_pr, int item_size) int cur_size = *size_pr; int new_size = cur_size ? (cur_size * 2) : 1; void *nmem = MEM_mallocN(new_size * item_size, "memdbl"); - + memcpy(nmem, mem, cur_size * item_size); MEM_freeN(mem); - + *size_pr = new_size; return nmem; } @@ -54,19 +54,19 @@ char *string_dup(char *str) char *nstr = MEM_mallocN(len + 1, "string_dup"); memcpy(nstr, str, len + 1); - + return nstr; } void fatal(char *fmt, ...) { va_list ap; - + fprintf(stderr, "FATAL: "); va_start(ap, fmt); vfprintf(stderr, fmt, ap); va_end(ap); fprintf(stderr, "\n"); - + exit(1); } diff --git a/intern/ghost/test/multitest/WindowData.c b/intern/ghost/test/multitest/WindowData.c index de4992ab2a0..07078cd9238 100644 --- a/intern/ghost/test/multitest/WindowData.c +++ b/intern/ghost/test/multitest/WindowData.c @@ -43,7 +43,7 @@ WindowData *windowdata_new(void *data, WindowDataHandler handler) WindowData *wb = MEM_mallocN(sizeof(*wb), "windowdata_new"); wb->data = data; wb->handler = handler; - + return wb; } diff --git a/intern/ghost/test/multitest/WindowData.h b/intern/ghost/test/multitest/WindowData.h index f8198101b8d..0e6c7518843 100644 --- a/intern/ghost/test/multitest/WindowData.h +++ b/intern/ghost/test/multitest/WindowData.h @@ -27,9 +27,9 @@ typedef void (*WindowDataHandler)(void *priv, GHOST_EventHandle evt); typedef struct _WindowData WindowData; - + /***/ - + WindowData* windowdata_new (void *data, WindowDataHandler handler); void windowdata_handle (WindowData *wb, GHOST_EventHandle evt); void windowdata_free (WindowData *wb); |