Menu
▾
▴
CVS: bzflag/package/mac/platform MacDisplay.cxx,1.2,1.3 MacDisplay.h,1.2,1.3 MacVisual.cxx,1.2,1.3 MacWindow.cxx,1.2,1.3
|
From: Tim R. <tim...@us...> - 2001-11-30 04:36:59
|
Update of /cvsroot/bzflag/bzflag/package/mac/platform
In directory usw-pr-cvs1:/tmp/cvs-serv14533/package/mac/platform
Modified Files:
MacDisplay.cxx MacDisplay.h MacVisual.cxx MacWindow.cxx
Log Message:
whitespace
Index: MacDisplay.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/package/mac/platform/MacDisplay.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MacDisplay.cxx 2001/11/15 09:37:07 1.2
+++ MacDisplay.cxx 2001/11/30 04:36:55 1.3
@@ -109,7 +109,7 @@
case updateEvt:
bzf_event.type = BzfEvent::Redraw;
BeginUpdate((WindowPtr)eventRec.message);
- EndUpdate((WindowPtr)eventRec.message);
+ EndUpdate((WindowPtr)eventRec.message);
break;
//case diskEvt:
@@ -126,14 +126,14 @@
gSleepTime = gInBackground ? MAC_BG_SLEEP : MAC_FG_SLEEP;
gMouseGrabbed = !gInBackground;
if (!gInBackground)
- SetCursor (&qd.arrow);
+ SetCursor (&qd.arrow);
break;
}
break;
case kHighLevelEvent:
- AEProcessAppleEvent(&eventRec);
- break;
+ AEProcessAppleEvent(&eventRec);
+ break;
}
Index: MacDisplay.h
===================================================================
RCS file: /cvsroot/bzflag/bzflag/package/mac/platform/MacDisplay.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MacDisplay.h 2001/11/15 09:37:07 1.2
+++ MacDisplay.h 2001/11/30 04:36:55 1.3
@@ -52,9 +52,9 @@
// int screen_depth;
- boolean is_valid;
+ boolean is_valid;
- static boolean pending;
+ static boolean pending;
static CGrafPtr window;
static AGLContext context;
Index: MacVisual.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/package/mac/platform/MacVisual.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MacVisual.cxx 2001/11/15 09:37:07 1.2
+++ MacVisual.cxx 2001/11/30 04:36:55 1.3
@@ -10,8 +10,8 @@
int MacVisual::findAttribute (GLint attribute) {
for (int i = 0; i < attributes.size(); i++)
- if (attributes[i] == attribute)
- return i;
+ if (attributes[i] == attribute)
+ return i;
return -1;
}
@@ -21,15 +21,15 @@
int size = attributes.size();
if (index == -1) {
- if (size > 0)
- attributes[size-1] = attribute;
- else
- attributes.push_back (attribute);
+ if (size > 0)
+ attributes[size-1] = attribute;
+ else
+ attributes.push_back (attribute);
- attributes.push_back (AGL_NONE);
+ attributes.push_back (AGL_NONE);
}
else
- attributes[index] = attribute;
+ attributes[index] = attribute;
}
void MacVisual::addAttribute2 (GLint attribute, int value) {
@@ -38,29 +38,29 @@
int size = attributes.size();
if (index == -1) {
- if (size > 0)
- attributes[size-1] = attribute;
- else
- attributes.push_back(attribute);
+ if (size > 0)
+ attributes[size-1] = attribute;
+ else
+ attributes.push_back(attribute);
- attributes.push_back(value);
- attributes.push_back(AGL_NONE);
+ attributes.push_back(value);
+ attributes.push_back(AGL_NONE);
}
else
- attributes[index+1] = value;
+ attributes[index+1] = value;
}
void MacVisual::removeAttribute1 (GLint attribute) {
int index = findAttribute (attribute);
if ( index == -1)
- return;
+ return;
else {
- for (int i = index; i < attributes.size ()-1; i++)
- attributes[i] = attributes[i+1];
+ for (int i = index; i < attributes.size ()-1; i++)
+ attributes[i] = attributes[i+1];
- attributes.pop_back ();
+ attributes.pop_back ();
}
}
@@ -68,13 +68,13 @@
int index = findAttribute (attribute);
if ( index == -1)
- return;
+ return;
else {
- for (int i = index; i < attributes.size ()-2; i++)
- attributes[i] = attributes[i+2];
+ for (int i = index; i < attributes.size ()-2; i++)
+ attributes[i] = attributes[i+2];
- attributes.pop_back ();
- attributes.pop_back ();
+ attributes.pop_back ();
+ attributes.pop_back ();
}
}
@@ -86,9 +86,9 @@
void MacVisual::setDoubleBuffer(boolean dbl_buffer) {
if (dbl_buffer)
- addAttribute1(AGL_DOUBLEBUFFER);
+ addAttribute1(AGL_DOUBLEBUFFER);
else
- removeAttribute1(AGL_DOUBLEBUFFER);
+ removeAttribute1(AGL_DOUBLEBUFFER);
}
@@ -115,7 +115,7 @@
if (value < 0) return;
if (findAttribute (AGL_RGBA) != -1) // indexed color is ignored if AGL_RGBA is present
- addAttribute2(AGL_BUFFER_SIZE, value);
+ addAttribute2(AGL_BUFFER_SIZE, value);
}
void MacVisual::setStencil (int value) {
@@ -137,9 +137,9 @@
void MacVisual::setStereo (boolean stereo) {
if (stereo)
- addAttribute1 (AGL_STEREO);
+ addAttribute1 (AGL_STEREO);
else
- removeAttribute1 (AGL_STEREO);
+ removeAttribute1 (AGL_STEREO);
}
boolean MacVisual::build () {
@@ -147,7 +147,7 @@
// GLint attrib[] = { AGL_DOUBLEBUFFER, AGL_RGBA, AGL_DEPTH_SIZE, 24, AGL_NONE };
GLint *attrib = new GLint[attributes.size()];
for (int i = 0; i < attributes.size(); i++)
- attrib[i] = attributes[i];
+ attrib[i] = attributes[i];
if (pixel_format == NULL) {
pixel_format = aglChoosePixelFormat (NULL, 0, attrib);
Index: MacWindow.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/package/mac/platform/MacWindow.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MacWindow.cxx 2001/11/15 09:37:07 1.2
+++ MacWindow.cxx 2001/11/30 04:36:55 1.3
@@ -12,7 +12,7 @@
bool gMouseGrabbed;
MacWindow::MacWindow (const MacDisplay *display, MacVisual *visual) :
- BzfWindow (display)
+ BzfWindow (display)
{
GLboolean ok;
@@ -20,7 +20,7 @@
#ifndef USE_DSP
SetRect (&rect, GLOBAL_OFFSET_X, GLOBAL_OFFSET_Y, 640 + GLOBAL_OFFSET_X, 480 + GLOBAL_OFFSET_Y);
window = NewCWindow (NULL, &rect, "\pBZFlag", false,
- plainDBox, (WindowPtr) -1L, true, 0L);
+ plainDBox, (WindowPtr) -1L, true, 0L);
#else
window = dsSetupScreen (640, 480 );
#endif
@@ -88,9 +88,9 @@
if (window == NULL) return;
if (show)
- ShowWindow (window);
+ ShowWindow (window);
else
- HideWindow (window);
+ HideWindow (window);
#endif
}
@@ -177,7 +177,7 @@
GetPort(&savedPort);
SetPort(window);
GetMouse (&tmpMouse); // returns mouse location in coords of local
- // window which must be set
+ // window which must be set
x = tmpMouse.h;
y = tmpMouse.v;
|