Merge: doc -> main
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
#include <GL/gl.h>
|
||||
|
||||
#include "main.h"
|
||||
#include "data/cube.h"
|
||||
#include "data/axis.h"
|
||||
#include "data/shaders.h"
|
||||
#include <GL/glew.h>
|
||||
//#include <stdlib.h>
|
||||
|
||||
#define WIDTH 512
|
||||
#define HEIGHT 512
|
||||
@@ -31,6 +31,8 @@ int main( void )
|
||||
use_window( window );
|
||||
set_clean_color_context( 0x2E, 0x07, 0x3F );
|
||||
|
||||
glewInit();
|
||||
|
||||
if( !( shader = create_shader() ) )
|
||||
goto error_shader;
|
||||
|
||||
@@ -57,13 +59,14 @@ int main( void )
|
||||
load_rot_matrix( shader, q );
|
||||
|
||||
clean_context();
|
||||
|
||||
#ifndef DEBUG
|
||||
load_mdl_matrix( shader, 0, 0 );
|
||||
draw_mesh( m_axis );
|
||||
load_mdl_matrix( shader, 1, 1 );
|
||||
draw_mesh( m_axis );
|
||||
load_mdl_matrix( shader, 2, 2 );
|
||||
draw_mesh( m_axis );
|
||||
#endif
|
||||
load_mdl_matrix( shader, 0, 3 );
|
||||
draw_mesh( m_cube );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user