[dasher: 20/27] fix line endings on MacOSX/GLUtils.*
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher: 20/27] fix line endings on MacOSX/GLUtils.*
- Date: Wed, 18 Aug 2010 15:11:21 +0000 (UTC)
commit fafa721e9ba7cf0728b4de1dd1302318ca269490
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date: Mon Aug 16 22:39:53 2010 +0100
fix line endings on MacOSX/GLUtils.*
Src/MacOSX/GLUtils.h | 17 ++++++++++++++++-
Src/MacOSX/GLUtils.mm | 27 ++++++++++++++++++++++++++-
2 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/Src/MacOSX/GLUtils.h b/Src/MacOSX/GLUtils.h
index 7bd1156..ff95a4f 100755
--- a/Src/MacOSX/GLUtils.h
+++ b/Src/MacOSX/GLUtils.h
@@ -1 +1,16 @@
-//// GLUtils.h// Alphabet//// Created by mtrent on Sat Feb 09 2002.// Copyright (c) 2002 xxxxx. All rights reserved.//#import <Foundation/Foundation.h>#import <OpenGL/gl.h>// These functions are handy when working with OpenGL//void CheckGLError(const char *note);unsigned int P2Ceiling(unsigned int n);
\ No newline at end of file
+//
+// GLUtils.h
+// Alphabet
+//
+// Created by mtrent on Sat Feb 09 2002.
+// Copyright (c) 2002 xxxxx. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <OpenGL/gl.h>
+
+// These functions are handy when working with OpenGL
+//
+void CheckGLError(const char *note);
+unsigned int P2Ceiling(unsigned int n);
+
diff --git a/Src/MacOSX/GLUtils.mm b/Src/MacOSX/GLUtils.mm
index 0ae1338..cf37394 100644
--- a/Src/MacOSX/GLUtils.mm
+++ b/Src/MacOSX/GLUtils.mm
@@ -1 +1,26 @@
-//// GLUtils.m// Alphabet//// Created by mtrent on Sat Feb 09 2002.// Copyright (c) 2002 xxxxx. All rights reserved.//#import <OpenGL/glu.h>#import "GLUtils.h"void CheckGLError(const char *note){ GLenum error; while (error = glGetError()) { NSLog(@"%s: %s (%d)", note, gluErrorString(error), error); }}unsigned int P2Ceiling(unsigned int n){ unsigned long i = 1; while (i < n) i <<= 1; return i;}
\ No newline at end of file
+//
+// GLUtils.m
+// Alphabet
+//
+// Created by mtrent on Sat Feb 09 2002.
+// Copyright (c) 2002 xxxxx. All rights reserved.
+//
+
+#import <OpenGL/glu.h>
+#import "GLUtils.h"
+
+void CheckGLError(const char *note)
+{
+ GLenum error;
+ while (error = glGetError()) {
+ NSLog(@"%s: %s (%d)", note, gluErrorString(error), error);
+ }
+}
+
+unsigned int P2Ceiling(unsigned int n)
+{
+ unsigned long i = 1;
+ while (i < n) i <<= 1;
+ return i;
+}
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]