[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50444] trunk/blender: style cleanup: indentation
Campbell Barton
ideasman42 at gmail.com
Thu Sep 6 04:20:07 CEST 2012
Revision: 50444
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50444
Author: campbellbarton
Date: 2012-09-06 02:20:03 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
style cleanup: indentation
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
trunk/blender/source/blender/compositor/intern/COM_Converter.cpp
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm 2012-09-06 02:10:09 UTC (rev 50443)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm 2012-09-06 02:20:03 UTC (rev 50444)
@@ -101,7 +101,7 @@
NSScreen *askedDisplay;
GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerCocoa::getCurrentDisplaySetting(): only main display is supported");
-
+
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
if (display == kMainDisplay) //Screen #0 may not be the main one
@@ -162,6 +162,6 @@
#endif // GHOST_DEBUG
//CGDisplayErr err = ::CGDisplaySwitchToMode(m_displayIDs[display], displayModeValues);
-
+
return /*err == CGDisplayNoErr ?*/ GHOST_kSuccess /*: GHOST_kFailure*/;
}
Modified: trunk/blender/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Converter.cpp 2012-09-06 02:10:09 UTC (rev 50443)
+++ trunk/blender/source/blender/compositor/intern/COM_Converter.cpp 2012-09-06 02:20:03 UTC (rev 50444)
@@ -500,7 +500,8 @@
system->addOperation(sxop);
system->addOperation(syop);
- unsigned int resolution[2] = {fromWidth, fromHeight};
+ unsigned int resolution[2] = {fromOperation->getWidth(),
+ fromOperation->getHeight()};
scaleOperation->setResolution(resolution);
sxop->setResolution(resolution);
syop->setResolution(resolution);
@@ -522,7 +523,8 @@
system->addOperation(xop);
system->addOperation(yop);
- unsigned int resolution[2] = {toWidth, toHeight};
+ unsigned int resolution[2] = {toOperation->getWidth(),
+ toOperation->getHeight()};
translateOperation->setResolution(resolution);
xop->setResolution(resolution);
yop->setResolution(resolution);
Modified: trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2012-09-06 02:10:09 UTC (rev 50443)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2012-09-06 02:20:03 UTC (rev 50444)
@@ -125,68 +125,66 @@
return bfd;
}
-int BL_KetsjiNextFrame(struct KX_KetsjiEngine* ketsjiengine, struct bContext *C, struct wmWindow* win, struct Scene* scene, struct ARegion *ar,
- KX_BlenderKeyboardDevice* keyboarddevice, KX_BlenderMouseDevice* mousedevice, int draw_letterbox)
+int BL_KetsjiNextFrame(KX_KetsjiEngine *ketsjiengine, bContext *C, wmWindow *win, Scene *scene, ARegion *ar,
+ KX_BlenderKeyboardDevice* keyboarddevice, KX_BlenderMouseDevice* mousedevice, int draw_letterbox)
{
- int exitrequested;
+ int exitrequested;
- // first check if we want to exit
- exitrequested = ketsjiengine->GetExitCode();
+ // first check if we want to exit
+ exitrequested = ketsjiengine->GetExitCode();
- // kick the engine
- bool render = ketsjiengine->NextFrame();
+ // kick the engine
+ bool render = ketsjiengine->NextFrame();
- if (render)
- {
- if(draw_letterbox) {
- // Clear screen to border color
- // We do this here since we set the canvas to be within the frames. This means the engine
- // itself is unaware of the extra space, so we clear the whole region for it.
- glClearColor(scene->gm.framing.col[0], scene->gm.framing.col[1], scene->gm.framing.col[2], 1.0f);
- glViewport(ar->winrct.xmin, ar->winrct.ymin,
+ if (render) {
+ if (draw_letterbox) {
+ // Clear screen to border color
+ // We do this here since we set the canvas to be within the frames. This means the engine
+ // itself is unaware of the extra space, so we clear the whole region for it.
+ glClearColor(scene->gm.framing.col[0], scene->gm.framing.col[1], scene->gm.framing.col[2], 1.0f);
+ glViewport(ar->winrct.xmin, ar->winrct.ymin,
BLI_RCT_SIZE_X(&ar->winrct), BLI_RCT_SIZE_Y(&ar->winrct));
- glClear(GL_COLOR_BUFFER_BIT);
- }
+ glClear(GL_COLOR_BUFFER_BIT);
+ }
- // render the frame
- ketsjiengine->Render();
- }
+ // render the frame
+ ketsjiengine->Render();
+ }
- wm_window_process_events_nosleep();
+ wm_window_process_events_nosleep();
- // test for the ESC key
- //XXX while (qtest())
- while(wmEvent *event= (wmEvent *)win->queue.first)
- {
- short val = 0;
- //unsigned short event = 0; //XXX extern_qread(&val);
+ // test for the ESC key
+ //XXX while (qtest())
+ while (wmEvent *event= (wmEvent *)win->queue.first) {
+ short val = 0;
+ //unsigned short event = 0; //XXX extern_qread(&val);
- if (keyboarddevice->ConvertBlenderEvent(event->type,event->val))
- exitrequested = KX_EXIT_REQUEST_BLENDER_ESC;
+ if (keyboarddevice->ConvertBlenderEvent(event->type,event->val))
+ exitrequested = KX_EXIT_REQUEST_BLENDER_ESC;
- /* Coordinate conversion... where
- * should this really be?
- */
- if (event->type==MOUSEMOVE) {
- /* Note, not nice! XXX 2.5 event hack */
- val = event->x - ar->winrct.xmin;
- mousedevice->ConvertBlenderEvent(MOUSEX, val);
+ /* Coordinate conversion... where
+ * should this really be?
+ */
+ if (event->type == MOUSEMOVE) {
+ /* Note, not nice! XXX 2.5 event hack */
+ val = event->x - ar->winrct.xmin;
+ mousedevice->ConvertBlenderEvent(MOUSEX, val);
- val = ar->winy - (event->y - ar->winrct.ymin) - 1;
- mousedevice->ConvertBlenderEvent(MOUSEY, val);
- }
- else {
- mousedevice->ConvertBlenderEvent(event->type,event->val);
- }
+ val = ar->winy - (event->y - ar->winrct.ymin) - 1;
+ mousedevice->ConvertBlenderEvent(MOUSEY, val);
+ }
+ else {
+ mousedevice->ConvertBlenderEvent(event->type,event->val);
+ }
- BLI_remlink(&win->queue, event);
- wm_event_free(event);
- }
+ BLI_remlink(&win->queue, event);
+ wm_event_free(event);
+ }
- if(win != CTX_wm_window(C)) {
- exitrequested= KX_EXIT_REQUEST_OUTSIDE; /* window closed while bge runs */
- }
- return exitrequested;
+ if (win != CTX_wm_window(C)) {
+ exitrequested= KX_EXIT_REQUEST_OUTSIDE; /* window closed while bge runs */
+ }
+ return exitrequested;
}
struct BL_KetsjiNextFrameState {
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 2012-09-06 02:10:09 UTC (rev 50443)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 2012-09-06 02:20:03 UTC (rev 50444)
@@ -334,17 +334,16 @@
bool GPG_NextFrame(GHOST_ISystem* system, GPG_Application *app, int &exitcode, STR_String &exitstring, GlobalSettings *gs)
{
- bool run = true;
- system->processEvents(false);
- system->dispatchEvents();
+ bool run = true;
+ system->processEvents(false);
+ system->dispatchEvents();
app->EngineNextFrame();
- if ((exitcode = app->getExitRequested()))
- {
- run = false;
- exitstring = app->getExitString();
- *gs = *app->getGlobalSettings();
- }
- return run;
+ if ((exitcode = app->getExitRequested())) {
+ run = false;
+ exitstring = app->getExitString();
+ *gs = *app->getGlobalSettings();
+ }
+ return run;
}
struct GPG_NextFrameState {
More information about the Bf-blender-cvs
mailing list