@@ -32,7 +32,7 @@ namespace ApiWithoutSecrets {
32
32
33
33
#if defined(VK_USE_PLATFORM_WIN32_KHR)
34
34
35
- #define TUTORIAL_NAME " API without Secrets: Introduction to Vulkan"
35
+ #define SERIES_NAME " API without Secrets: Introduction to Vulkan"
36
36
37
37
LRESULT CALLBACK WndProc ( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) {
38
38
switch ( message ) {
@@ -56,7 +56,7 @@ namespace ApiWithoutSecrets {
56
56
}
57
57
58
58
if ( Parameters.Instance ) {
59
- UnregisterClass ( TUTORIAL_NAME , Parameters.Instance );
59
+ UnregisterClass ( SERIES_NAME , Parameters.Instance );
60
60
}
61
61
}
62
62
@@ -77,23 +77,23 @@ namespace ApiWithoutSecrets {
77
77
wcex.hCursor = LoadCursor ( NULL , IDC_ARROW );
78
78
wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1 );
79
79
wcex.lpszMenuName = NULL ;
80
- wcex.lpszClassName = TUTORIAL_NAME ;
80
+ wcex.lpszClassName = SERIES_NAME ;
81
81
wcex.hIconSm = NULL ;
82
82
83
83
if ( !RegisterClassEx ( &wcex ) ) {
84
84
return false ;
85
85
}
86
86
87
87
// Create window
88
- Parameters.Handle = CreateWindow ( TUTORIAL_NAME , title, WS_OVERLAPPEDWINDOW, 20 , 20 , 500 , 500 , nullptr , nullptr , Parameters.Instance , nullptr );
88
+ Parameters.Handle = CreateWindow ( SERIES_NAME , title, WS_OVERLAPPEDWINDOW, 20 , 20 , 500 , 500 , nullptr , nullptr , Parameters.Instance , nullptr );
89
89
if ( !Parameters.Handle ) {
90
90
return false ;
91
91
}
92
92
93
93
return true ;
94
94
}
95
95
96
- bool Window::RenderingLoop ( TutorialBase &tutorial ) const {
96
+ bool Window::RenderingLoop ( ProjectBase &project ) const {
97
97
// Display window
98
98
ShowWindow ( Parameters.Handle , SW_SHOWNORMAL );
99
99
UpdateWindow ( Parameters.Handle );
@@ -123,13 +123,13 @@ namespace ApiWithoutSecrets {
123
123
// Draw
124
124
if ( resize ) {
125
125
resize = false ;
126
- if ( !tutorial .OnWindowSizeChanged () ) {
126
+ if ( !project .OnWindowSizeChanged () ) {
127
127
result = false ;
128
128
break ;
129
129
}
130
130
}
131
- if ( tutorial .ReadyToDraw () ) {
132
- if ( !tutorial .Draw () ) {
131
+ if ( project .ReadyToDraw () ) {
132
+ if ( !project .Draw () ) {
133
133
result = false ;
134
134
break ;
135
135
}
@@ -203,7 +203,7 @@ namespace ApiWithoutSecrets {
203
203
return true ;
204
204
}
205
205
206
- bool Window::RenderingLoop ( TutorialBase &tutorial ) const {
206
+ bool Window::RenderingLoop ( ProjectBase &project ) const {
207
207
// Prepare notification for window destruction
208
208
xcb_intern_atom_cookie_t protocols_cookie = xcb_intern_atom ( Parameters.Connection , 1 , 12 , " WM_PROTOCOLS" );
209
209
xcb_intern_atom_reply_t *protocols_reply = xcb_intern_atom_reply ( Parameters.Connection , protocols_cookie, 0 );
@@ -258,13 +258,13 @@ namespace ApiWithoutSecrets {
258
258
// Draw
259
259
if ( resize ) {
260
260
resize = false ;
261
- if ( !tutorial .OnWindowSizeChanged () ) {
261
+ if ( !project .OnWindowSizeChanged () ) {
262
262
result = false ;
263
263
break ;
264
264
}
265
265
}
266
- if ( tutorial .ReadyToDraw () ) {
267
- if ( !tutorial .Draw () ) {
266
+ if ( project .ReadyToDraw () ) {
267
+ if ( !project .Draw () ) {
268
268
result = false ;
269
269
break ;
270
270
}
@@ -310,7 +310,7 @@ namespace ApiWithoutSecrets {
310
310
return true ;
311
311
}
312
312
313
- bool Window::RenderingLoop ( TutorialBase &tutorial ) const {
313
+ bool Window::RenderingLoop ( ProjectBase &project ) const {
314
314
// Prepare notification for window destruction
315
315
Atom delete_window_atom;
316
316
delete_window_atom = XInternAtom ( Parameters.DisplayPtr , " WM_DELETE_WINDOW" , false );
@@ -359,13 +359,13 @@ namespace ApiWithoutSecrets {
359
359
// Draw
360
360
if ( resize ) {
361
361
resize = false ;
362
- if ( !tutorial .OnWindowSizeChanged () ) {
362
+ if ( !project .OnWindowSizeChanged () ) {
363
363
result = false ;
364
364
break ;
365
365
}
366
366
}
367
- if ( tutorial .ReadyToDraw () ) {
368
- if ( !tutorial .Draw () ) {
367
+ if ( project .ReadyToDraw () ) {
368
+ if ( !project .Draw () ) {
369
369
result = false ;
370
370
break ;
371
371
}
0 commit comments