- Added basic Android support for OprnGL ES.

Author: McNopper

GLUS/.cproject

@@ -0,0 +1,81 @@
+# Comment out the version used.
+
+GLES_VERSION := 20
+#GLES_VERSION := 30
+#GLES_VERSION := 31
+
+LOCAL_PATH := $(call my-dir)
+
+#
+# GLUS.
+#
+ 
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := GLUS
+
+# All files.
+
+PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../src/*.c)
+
+# Remove specific files.
+
+GL_FILES := $(LOCAL_PATH)/../../src/glus_window_glfw.c
+GL_FILES += $(LOCAL_PATH)/../../src/glus_programpipeline.c
+GL_FILES += $(LOCAL_PATH)/../../src/glus_program.c
+GL_FILES += $(LOCAL_PATH)/../../src/glus_shape_adjacency.c
+
+NOT_USED_FILES := $(LOCAL_PATH)/../../src/glus_memory_nodm.c
+
+OS_FILES := $(wildcard $(LOCAL_PATH)/../../src/glus_os_*.c)
+
+VG_FILES := $(wildcard $(LOCAL_PATH)/../../src/*_vg.c)
+
+ES_FILES := $(wildcard $(LOCAL_PATH)/../../src/*_es.c)
+
+ES2_FILES := $(wildcard $(LOCAL_PATH)/../../src/*_es2.c)
+
+ES31_FILES := $(wildcard $(LOCAL_PATH)/../../src/*_es31.c)
+
+PROJECT_FILES := $(filter-out $(GL_FILES), $(PROJECT_FILES))
+PROJECT_FILES := $(filter-out $(OS_FILES), $(PROJECT_FILES))
+PROJECT_FILES := $(filter-out $(NOT_USED_FILES), $(PROJECT_FILES))
+PROJECT_FILES := $(filter-out $(VG_FILES), $(PROJECT_FILES))
+ifeq ($(GLES_VERSION),20)
+	PROJECT_FILES := $(filter-out $(ES31_FILES), $(PROJECT_FILES))
+
+	LOCAL_CFLAGS    := -DGLUS_ES2=1
+endif
+ifeq ($(GLES_VERSION),30)
+	PROJECT_FILES := $(filter-out $(ES2_FILES), $(PROJECT_FILES))
+	PROJECT_FILES := $(filter-out $(ES31_FILES), $(PROJECT_FILES))
+
+	LOCAL_CFLAGS    := -DGLUS_ES3=1
+endif
+ifeq ($(GLES_VERSION),31)
+	PROJECT_FILES := $(filter-out $(ES2_FILES), $(PROJECT_FILES))
+	
+	LOCAL_CFLAGS    := -DGLUS_ES31=1
+endif
+
+# Change base path in general.
+
+LOCAL_CFLAGS    += -DGLUS_BASE_DIRECTORY=\"/sdcard/Download/Binaries/\"
+
+# Add specfic files.
+
+PROJECT_FILES += $(LOCAL_PATH)/../../src/glus_os_android.c
+
+# Generate the final list.
+
+PROJECT_FILES := $(PROJECT_FILES:$(LOCAL_PATH)/%=%)
+ 
+#
+
+LOCAL_SRC_FILES := $(PROJECT_FILES)
+ 
+LOCAL_STATIC_LIBRARIES := android_native_app_glue
+ 
+include $(BUILD_STATIC_LIBRARY)
+
+$(call import-module,android/native_app_glue)

GLUS/Android/jni/Android.mk

@@ -0,0 +1 @@
+APP_PLATFORM := android-19

GLUS/Android/jni/Application.mk

@@ -73,6 +73,8 @@ Yours Norbert Nopper
 
 Changelog:
 
+08.09.2015 - Added basic Android support for OprnGL ES.
+
 11.07.2015 - Improved, updated README.
 
 14.05.2015 - Updated OpenGL ES libraries.

GLUS/README.txt

@@ -79,6 +79,12 @@
 #define GLUS_VERTICES_FACTOR 4
 #define GLUS_VERTICES_DIVISOR 4
 
-#define GLUS_MAX_STRING  256
+#define GLUS_MAX_STRING 	256
+
+#define GLUS_MAX_FILENAME	2048
+
+#ifndef GLUS_BASE_DIRECTORY
+	#define GLUS_BASE_DIRECTORY ""
+#endif
 
 #endif /* GLUS_DEFINE_H_ */

GLUS/src/GLUS/glus_define.h

@@ -52,4 +52,16 @@ typedef struct _GLUSbinaryfile
 
 } GLUSbinaryfile;
 
+/**
+ * Opens the file whose name is specified in the parameter filename and
+ * associates it with a stream that can be identified in future operations by the FILE pointer returned.
+ *
+ * @param filename C string containing the name of the file to be opened.
+ * @param mode C string containing a file access mode
+ *
+ * @return If the file is successfully opened, the function returns a pointer to a FILE object that can be used to identify the stream on future operations.
+ *		   Otherwise, a null pointer is returned.
+ */
+GLUSAPI FILE* GLUSAPIENTRY glusFileOpen(const char * filename, const char * mode);
+
 #endif /* GLUS_FILE_H_ */

GLUS/src/GLUS/glus_file.h

@@ -17,6 +17,26 @@
 
 #include "GL/glus.h"
 
+FILE* GLUSAPIENTRY glusFileOpen(const char * filename, const char * mode)
+{
+	char buffer[GLUS_MAX_FILENAME];
+
+	if (!filename)
+	{
+		return 0;
+	}
+
+	if (strlen(filename) + strlen(GLUS_BASE_DIRECTORY) >= GLUS_MAX_FILENAME)
+	{
+		return 0;
+	}
+
+	strcpy(buffer, GLUS_BASE_DIRECTORY);
+	strcat(buffer, filename);
+
+	return fopen(buffer, mode);
+}
+
 GLUSboolean _glusFileCheckRead(FILE* f, size_t actualRead, size_t expectedRead)
 {
 	if (!f)

GLUS/src/glus_file.c

@@ -36,7 +36,7 @@ GLUSboolean GLUSAPIENTRY glusFileLoadBinary(const GLUSchar* filename, GLUSbinary
 
 	binaryfile->length = 0;
 
-	f = fopen(filename, "rb");
+	f = glusFileOpen(filename, "rb");
 
 	if (!f)
 	{
@@ -100,7 +100,7 @@ GLUSboolean GLUSAPIENTRY glusFileSaveBinary(const GLUSchar* filename, const GLUS
 		return GLUS_FALSE;
 	}
 
-	file = fopen(filename, "wb");
+	file = glusFileOpen(filename, "wb");
 
 	if (!file)
 	{

GLUS/src/glus_file_binary.c

@@ -36,7 +36,7 @@ GLUSboolean GLUSAPIENTRY glusFileLoadText(const GLUSchar* filename, GLUStextfile
 
 	textfile->length = 0;
 
-	f = fopen(filename, "rb");
+	f = glusFileOpen(filename, "rb");
 
 	if (!f)
 	{
@@ -100,7 +100,7 @@ GLUSboolean GLUSAPIENTRY glusFileSaveText(const GLUSchar* filename, const GLUSte
 		return GLUS_FALSE;
 	}
 
-	file = fopen(filename, "w");
+	file = glusFileOpen(filename, "w");
 
 	if (!file)
 	{

GLUS/src/glus_file_text.c

@@ -219,7 +219,7 @@ GLUSboolean GLUSAPIENTRY glusImageLoadHdr(const GLUSchar* filename, GLUShdrimage
 	hdrimage->data = 0;
 
 	// open filename in "read binary" mode
-	file = fopen(filename, "rb");
+	file = glusFileOpen(filename, "rb");
 
 	if (!file)
 	{
@@ -496,7 +496,7 @@ GLUSboolean GLUSAPIENTRY glusImageSaveHdr(const GLUSchar* filename, const GLUShd
 	}
 
 	// open filename in "write binary" mode
-	file = fopen(filename, "wb");
+	file = glusFileOpen(filename, "wb");
 
 	if (!file)
 	{