Merge: doc -> main

src/context.c

@@ -2,13 +2,13 @@
 #include <GL/gl.h>
 #include "main.h"
 
-void set_color( unsigned char r, unsigned char g, unsigned char b )
+void set_clean_color_context( unsigned char r, unsigned char g, unsigned char b )
 {
 	glEnable( GL_DEPTH_TEST );
 	glClearColor( (float)r/0xff, (float)g/0xff, (float)b/0xff, 1.0 );
 }
 
-void draw_color( void )
+void clean_context( void )
 {
 	glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
 }

src/data/axis.h

@@ -8,8 +8,8 @@
 #undef H
 
 const float X = 2.0;
-const float Y = 0.1;
-const float Z = 0.1;
+const float Y = 0.05;
+const float Z = 0.05;
 
 #define A -X,-Y,-Z,
 #define B -X,-Y, Z,
@@ -20,7 +20,7 @@ const float Z = 0.1;
 #define G  X, Y,-Z,
 #define H  X, Y, Z,
 
-float d_axis[] =
+narray_float_t d_axis =
 {
 	3*3*2*6,
 

src/data/cube.h

@@ -7,7 +7,7 @@
 #define G  1, 1,-1,
 #define H  1, 1, 1,
 
-float d_cube[] =
+narray_float_t d_cube =
 {
 	3*3*2*6,
 

src/input.c

@@ -3,7 +3,7 @@
 #define inline
 #include <cglm/quat.h>
 
-#define ANGLE ((float)0x01/0xff*2*GLM_PI)
+#define ANGLE ((float)0x02/0xff*2*GLM_PI)
 
 versor q = GLM_QUAT_IDENTITY_INIT;
 vec3 axis[3] =
@@ -13,7 +13,7 @@ vec3 axis[3] =
 	{0,0,1},
 };
 
-float * poll_input( window_t window )
+quat_t poll_input( window_t window )
 {
 	versor p = GLM_QUAT_IDENTITY_INIT;
 

src/main.c

@@ -21,16 +21,15 @@ const char * wname = "manigraph: manifold grapher";
 
 int main( void )
 {
-	unsigned int shader, texture;
-	void * m_cube, *m_axis;
-
+	id_t shader, texture;
+	mesh_t m_cube, m_axis;
 	window_t window;
 
 	if( !( window = init_window( WIDTH, HEIGHT, wname ) ) )
 		goto error_window;
 
 	use_window( window );
-	set_color( 0x2E, 0x07, 0x3F );
+	set_clean_color_context( 0x2E, 0x07, 0x3F );
 
 	if( !( shader = create_shader() ) )
 		goto error_shader;
@@ -52,11 +51,12 @@ int main( void )
 
 	while( is_open_window( window ) )
 	{
-		float * q;
+		quat_t q;
+
 		q=poll_input( window );
 		load_rot_matrix( shader, q );
 		
-		draw_color();
+		clean_context();
 
 		load_mdl_matrix( shader, 0, 0 );
 		draw_mesh( m_axis );

src/main.h

@@ -1,4 +1,11 @@
 typedef const void * window_t;
+typedef unsigned int id_t;
+typedef void * mesh_t;
+typedef float * quat_t;
+typedef float * mat4_t;
+
+typedef float narray_float_t[];
+typedef unsigned char narray_u8_t[];
 
 enum
 {
@@ -13,40 +20,40 @@ int is_open_window( window_t window );
 
 void close_window( window_t window );
 
-void * create_mesh( float * mesh );
+mesh_t create_mesh( narray_float_t mesh );
 
-void destroy_mesh( void * p );
+void destroy_mesh( mesh_t p );
 
-void draw_mesh( void * p );
+void draw_mesh( mesh_t p );
 
-void set_color( unsigned char, unsigned char, unsigned char );
+void set_clean_color_context( unsigned char, unsigned char, unsigned char );
 
-void draw_color( void );
+void clean_context( void );
 
-void destroy_shader( unsigned int shader );
+void destroy_shader( id_t shader );
 
-unsigned int create_shader( void );
+id_t create_shader( void );
 
-void use_shader( unsigned int program );
+void use_shader( id_t program );
 
-unsigned char gload_program( unsigned int program, const char * src, unsigned int type );
+unsigned char gload_program( id_t program, const char * src, unsigned int type );
 
-void gload_float( unsigned int program, char * var, float f );
+void gload_float( id_t program, char * var, float f );
 
-void gload_mat4( unsigned int program, char * var, float * m );
+void gload_mat4( id_t program, char * var, mat4_t m );
 
-void load_fix_matrix( unsigned int shader, float ratio );
+void load_fix_matrix( id_t shader, float ratio );
 
-void load_mdl_matrix( unsigned int shader, unsigned char i, unsigned char c );
+void load_mdl_matrix( id_t shader, unsigned char i, unsigned char c );
 
-void load_rot_matrix( unsigned int shader, float * q );
+void load_rot_matrix( id_t shader, quat_t q );
 
-unsigned int config_texture( unsigned short type );
+id_t config_texture( unsigned short type );
 
-void use_texture( unsigned int texture );
+void use_texture( id_t texture );
 
-void destroy_texture( unsigned int texture );
+void destroy_texture( id_t texture );
 
-unsigned int create_palette_texture( const unsigned char * colors );
+id_t create_palette_texture( const narray_u8_t colors );
 
-float * poll_input( window_t window );
+quat_t poll_input( window_t window );

src/matrix.c

@@ -26,7 +26,7 @@ mat4 ortho[] =
 	},
 };
 
-void load_fix_matrix( unsigned int shader, float ratio )
+void load_fix_matrix( id_t shader, float ratio )
 {
 	mat4 m, n;
 	const int d = 7;
@@ -35,18 +35,18 @@ void load_fix_matrix( unsigned int shader, float ratio )
 	glm_perspective( CGLM_PI/4, ratio, d-3, d+3, n );
 	glm_mat4_mul( n, m, m );
 
-	gload_mat4( shader, "fix", (float*)m );
+	gload_mat4( shader, "fix", (mat4_t) m );
 }
 
-void load_mdl_matrix( unsigned int shader, unsigned char i, unsigned char c )
+void load_mdl_matrix( id_t shader, unsigned char i, unsigned char c )
 {
 	gload_float( shader, "idx", c );
-	gload_mat4( shader, "mdl", (float*)ortho[i] );
+	gload_mat4( shader, "mdl", (mat4_t)ortho[i] );
 }
 
-void load_rot_matrix( unsigned int shader, float * q )
+void load_rot_matrix( id_t shader, quat_t q )
 {
 	mat4 m;
 	glm_quat_mat4( q, m );
-	gload_mat4( shader, "rot", (float*)m );
+	gload_mat4( shader, "rot", (mat4_t)m );
 }

src/mesh.c

@@ -1,13 +1,14 @@
 #define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
 #include <stdlib.h>
+#include "main.h"
 
 struct obj 
 {
 	unsigned int vertex, vao, vbo;
 };
 
-void * create_mesh( float * mesh )
+mesh_t create_mesh( narray_float_t mesh )
 {
 	struct obj * p;
 
@@ -29,7 +30,7 @@ void * create_mesh( float * mesh )
 	return p;
 }
 
-void destroy_mesh( void * p )
+void destroy_mesh( mesh_t p )
 {
 	struct obj * obj ;
 	obj = p;
@@ -38,10 +39,18 @@ void destroy_mesh( void * p )
 	free( p );
 }
 
-void draw_mesh( void * p )
+void draw_mesh( mesh_t p )
 {
 	struct obj * obj=p;
 
 	glBindVertexArray( obj->vao );
+#ifdef DEBUG
+	{
+		int i;
+		for( i=0; i<obj->vertex;i+=3 )
+			glDrawArrays(GL_LINE_LOOP, i, 3 );
+	}
+#else
 	glDrawArrays(GL_TRIANGLES, 0, obj->vertex );
+#endif
 }

src/shader.c

@@ -2,6 +2,10 @@
 #include <GL/gl.h>
 #include "main.h"
 
+#ifdef DEBUG
+#include <stdio.h>
+#endif
+
 #define NULL ((void*)0)
 
 void destroy_shader( unsigned int shader )
@@ -44,7 +48,7 @@ unsigned char gload_program( unsigned int program, const char * src,
 #ifdef DEBUG
 		char log[256];
 		glGetShaderInfoLog( shader, 256, NULL, log );
-		printf( log );
+		printf( "%s", log );
 #endif
 		return 0;
 	}

src/texture.c

@@ -3,9 +3,9 @@
 
 #define TYPE GL_TEXTURE_2D_ARRAY
 
-unsigned int config_texture( unsigned short type )
+id_t config_texture( unsigned short type )
 {
-	unsigned int texture;
+	id_t texture;
 
 	glGenTextures( 1, &texture );
 	glBindTexture( TYPE, texture );
@@ -18,7 +18,7 @@ unsigned int config_texture( unsigned short type )
 	return texture;
 }
 
-void use_texture( unsigned int texture )
+void use_texture( id_t texture )
 {
 	return glBindTexture( TYPE, texture );
 }
@@ -28,9 +28,9 @@ void destroy_texture( unsigned int texture )
 	return glDeleteTextures( 1, &texture );
 }
 
-unsigned int create_palette_texture( const unsigned char * colors )
+id_t create_palette_texture( const unsigned char * colors )
 {
-	unsigned int texture = config_texture( TYPE );
+	id_t texture = config_texture( TYPE );
 	glTexImage3D( TYPE, 0, GL_RGBA,
 		1, 1, (*colors)/4, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors+1);
 	return texture;