bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Ghost: update tests for recent changes

Browse Source
This commit is contained in:
Campbell Barton 2015-04-04 17:20:17 +11:00
parent eca22d076c
commit e84b0e4c35
4 changed files with 65 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
intern/ghost/test/CMakeLists.txt
View File

@ -115,6 +115,13 @@ suffix_relpaths(SRC_NEW "${SRC}" "../../../extern/wcwidth/")
include_directories(${INC_NEW})
add_library(wcwidth_lib ${SRC_NEW})
# glew-mx
include(${CMAKE_SOURCE_DIR}/../../../intern/glew-mx/CMakeLists.txt)
suffix_relpaths(INC_NEW "${INC}" "../../../intern/glew-mx/")
suffix_relpaths(SRC_NEW "${SRC}" "../../../intern/glew-mx/")
include_directories(${INC_NEW})
add_library(glewmx_lib ${SRC_NEW})
# grr, blenfont needs BLI
include_directories(
"../../../source/blender/blenlib"
@ -136,6 +143,7 @@ add_library(bli_lib
"../../../source/blender/blenlib/intern/BLI_linklist.c"
"../../../source/blender/blenlib/intern/BLI_memarena.c"
"../../../source/blender/blenlib/intern/BLI_mempool.c"
"../../../source/blender/blenlib/intern/system.c"
)
set(PLATFORM_CGLAGS)
@ -190,6 +198,7 @@ add_executable(gears_c
target_link_libraries(gears_c
ghost_lib
glewmx_lib
string_lib
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
@ -203,6 +212,7 @@ add_executable(gears_cpp
target_link_libraries(gears_cpp
ghost_lib
glewmx_lib
string_lib
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
@ -231,6 +241,7 @@ target_link_libraries(multitest_c
blenfont_lib
bli_lib
ghost_lib
glewmx_lib
string_lib
guardedalloc_lib
wcwidth_lib

34
intern/ghost/test/gears/GHOST_C-Test.c
View File

@ -448,6 +448,7 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData)
int main(int argc, char **argv)
{
GHOST_GLSettings glSettings = {0};
char *title1 = "gears - main window";
char *title2 = "gears - secondary window";
GHOST_EventConsumerHandle consumer = GHOST_CreateEventConsumer(processEvent, NULL);
@ -459,16 +460,12 @@ int main(int argc, char **argv)
if (shSystem)
{
/* Create the main window */
sMainWindow = GHOST_CreateWindow(shSystem,
title1,
10,
64,
320,
200,
GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL,
FALSE,
FALSE);
sMainWindow = GHOST_CreateWindow(
shSystem, title1,
10, 64, 320, 200,
GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL,
glSettings);
if (!sMainWindow)
{
printf("could not create main window\n");
@ -476,16 +473,13 @@ int main(int argc, char **argv)
}
/* Create a secondary window */
sSecondaryWindow = GHOST_CreateWindow(shSystem,
title2,
340,
64,
320,
200,
GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL,
FALSE,
FALSE);
sSecondaryWindow = GHOST_CreateWindow(
shSystem,
title2,
340, 64, 320, 200,
GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL,
glSettings);
if (!sSecondaryWindow)
{
printf("could not create secondary window\n");

17
intern/ghost/test/gears/GHOST_Test.cpp
View File

@ -418,12 +418,17 @@ Application::Application(GHOST_ISystem *system)
m_gearsTimer(0), m_testTimer(0), m_cursor(GHOST_kStandardCursorFirstCursor),
m_exitRequested(false), stereo(false)
{
GHOST_GLSettings glSettings = {0};
fApp = this;
// Create the main window
STR_String title1("gears - main window");
m_mainWindow = system->createWindow(title1, 10, 64, 320, 200, GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL, false, false);
m_mainWindow = system->createWindow(
title1,
10, 64, 320, 200,
GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL,
glSettings);
if (!m_mainWindow) {
std::cout << "could not create main window\n";
@ -432,8 +437,12 @@ Application::Application(GHOST_ISystem *system)
// Create a secondary window
STR_String title2("gears - secondary window");
m_secondaryWindow = system->createWindow(title2, 340, 64, 320, 200, GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL, false, false);
m_secondaryWindow = system->createWindow(
title2,
340, 64, 320, 200,
GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL,
glSettings);
if (!m_secondaryWindow) {
std::cout << "could not create secondary window\n";
exit(-1);

39
intern/ghost/test/multitest/MultiTest.c
View File

@ -309,13 +309,18 @@ static void mainwindow_timer_proc(GHOST_TimerTaskHandle task, GHOST_TUns64 time)
mainwindow_log(mw, buf);
}
MainWindow *mainwindow_new(MultiTestApp *app) {
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,
FALSE, FALSE);
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");
@ -577,15 +582,20 @@ static void loggerwindow_handle(void *priv, GHOST_EventHandle evt)
/**/
LoggerWindow *loggerwindow_new(MultiTestApp *app) {
LoggerWindow *loggerwindow_new(MultiTestApp *app)
{
GHOST_GLSettings glSettings = {0};
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", 40, screensize[1] - 432,
800, 300, GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL, FALSE, FALSE);
win = GHOST_CreateWindow(
sys, "MultiTest:Logger",
40, screensize[1] - 432, 800, 300,
GHOST_kWindowStateNormal,
GHOST_kDrawingContextTypeOpenGL,
glSettings);
if (win) {
LoggerWindow *lw = MEM_callocN(sizeof(*lw), "loggerwindow_new");
@ -775,13 +785,18 @@ static void extrawindow_handle(void *priv, GHOST_EventHandle evt)
/**/
ExtraWindow *extrawindow_new(MultiTestApp *app) {
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,
FALSE, FALSE);
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");