aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Kropf <josh@slashdev.ca>2011-04-21 17:20:23 (GMT)
committerJosh Kropf <josh@slashdev.ca>2011-04-21 17:20:23 (GMT)
commit18f149fa6a389050b6309e84ab65e87f9c4c35c8 (patch)
treed72e2079feb98cfa5aee582ba4dac2a63d2ff310
parentfd581f8104d17b7888479d23a48942da9284650d (diff)
downloadballdemo-18f149fa6a389050b6309e84ab65e87f9c4c35c8.zip
balldemo-18f149fa6a389050b6309e84ab65e87f9c4c35c8.tar.gz
balldemo-18f149fa6a389050b6309e84ab65e87f9c4c35c8.tar.bz2
formatting cleanup and typo correction
-rw-r--r--android/src/com/jiggak/balldemo/BallDemo.java2
-rw-r--r--common/opengl.h12
-rw-r--r--desktop/main.cpp4
3 files changed, 6 insertions, 12 deletions
diff --git a/android/src/com/jiggak/balldemo/BallDemo.java b/android/src/com/jiggak/balldemo/BallDemo.java
index c98bde4..0e90f0a 100644
--- a/android/src/com/jiggak/balldemo/BallDemo.java
+++ b/android/src/com/jiggak/balldemo/BallDemo.java
@@ -79,7 +79,7 @@ public class BallDemo extends Activity {
/**
* This method is called from native code to load assets from the APK.
- * @param path relative path inside apk for of asset to load
+ * @param path relative path inside apk of asset to load
* @return byte array containing asset data or null if asset not found
*/
public byte[] loadResource(String path) {
diff --git a/common/opengl.h b/common/opengl.h
index 081a685..ddb52fc 100644
--- a/common/opengl.h
+++ b/common/opengl.h
@@ -6,15 +6,9 @@
*/
#ifdef ANDROID
-
-#include <GLES2/gl2.h>
-
+ #include <GLES2/gl2.h>
#elif __IPHONE_OS_VERSION_MIN_REQUIRED
-
-#include <OpenGLES/ES2/gl.h>
-
+ #include <OpenGLES/ES2/gl.h>
#else
-
-#include <GL/glew.h>
-
+ #include <GL/glew.h>
#endif
diff --git a/desktop/main.cpp b/desktop/main.cpp
index 9ac0f06..ec5f86e 100644
--- a/desktop/main.cpp
+++ b/desktop/main.cpp
@@ -7,9 +7,9 @@ using namespace std;
#include <GL/glew.h>
#ifdef __APPLE__
-#include <GLUT/glut.h>
+ #include <GLUT/glut.h>
#else
-#include <GL/glut.h>
+ #include <GL/glut.h>
#endif
#include "logging.h"