Merge branch 'BBHoodsta/GLdc-master'

GL/matrix.c

@@ -186,11 +186,12 @@ void APIENTRY glRotatef(GLfloat angle, GLfloat x, GLfloat  y, GLfloat z) {
         0.0f, 0.0f, 0.0f, 1.0f
     };
 
-    vec3f_normalize(x, y, z);
-
     float r = DEG2RAD * angle;
     float c = cos(r);
     float s = sin(r);
+
+    vec3f_normalize(x, y, z);
+
     float invc = 1.0f - c;
     float xs = x * s;
     float zs = z * s;

samples/Makefile

@@ -11,6 +11,8 @@ all:
 	$(KOS_MAKE) -C nehe02va all
 	$(KOS_MAKE) -C nehe02de all
 	$(KOS_MAKE) -C nehe03 all
+	$(KOS_MAKE) -C nehe04 all
+	$(KOS_MAKE) -C nehe05 all
 	$(KOS_MAKE) -C nehe06 all
 	$(KOS_MAKE) -C nehe06_vq all
 	$(KOS_MAKE) -C ortho2d all

samples/nehe04/Makefile

@@ -0,0 +1,29 @@
+TARGET = nehe04.elf
+OBJS = main.o
+
+all: rm-elf $(TARGET)
+
+include $(KOS_BASE)/Makefile.rules
+
+clean:
+	-rm -f $(TARGET) $(OBJS) romdisk.*
+
+rm-elf:
+	-rm -f $(TARGET) romdisk.*
+
+$(TARGET): $(OBJS) romdisk.o
+	$(KOS_CC) $(KOS_CFLAGS) $(KOS_LDFLAGS) -o $(TARGET) $(KOS_START) \
+		$(OBJS) romdisk.o $(OBJEXTRA) -lm -lkosutils $(KOS_LIBS)
+
+romdisk.img:
+	$(KOS_GENROMFS) -f romdisk.img -d romdisk -v
+
+romdisk.o: romdisk.img
+	$(KOS_BASE)/utils/bin2o/bin2o romdisk.img romdisk romdisk.o
+
+run: $(TARGET)
+	$(KOS_LOADER) $(TARGET)
+
+dist:
+	rm -f $(OBJS) romdisk.o romdisk.img
+	$(KOS_STRIP) $(TARGET)

samples/nehe04/main.c

@@ -0,0 +1,94 @@
+#include "gl.h"
+#include "glu.h"
+#include "glkos.h"
+
+GLfloat rtri;
+GLfloat rquad;
+
+/* A general OpenGL initialization function.  Sets all of the initial parameters. */
+void InitGL(int Width, int Height)	        // We call this right after our OpenGL window is created.
+{
+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);		// This Will Clear The Background Color To Black
+    glClearDepth(1.0);				// Enables Clearing Of The Depth Buffer
+    glDepthFunc(GL_LESS);				// The Type Of Depth Test To Do
+    glEnable(GL_DEPTH_TEST);			// Enables Depth Testing
+    glShadeModel(GL_SMOOTH);			// Enables Smooth Color Shading
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();				// Reset The Projection Matrix
+
+    gluPerspective(45.0f,(GLfloat)Width/(GLfloat)Height,0.1f,100.0f);	// Calculate The Aspect Ratio Of The Window
+
+    glMatrixMode(GL_MODELVIEW);
+}
+
+/* The function called when our window is resized (which shouldn't happen, because we're fullscreen) */
+void ReSizeGLScene(int Width, int Height)
+{
+    if (Height == 0)				// Prevent A Divide By Zero If The Window Is Too Small
+        Height = 1;
+
+    glViewport(0, 0, Width, Height);		// Reset The Current Viewport And Perspective Transformation
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+
+    gluPerspective(45.0f,(GLfloat)Width/(GLfloat)Height,0.1f,100.0f);
+    glMatrixMode(GL_MODELVIEW);
+}
+
+
+/* The main drawing function. */
+void DrawGLScene()
+{
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);		// Clear The Screen And The Depth Buffer
+    glLoadIdentity();				// Reset The View
+
+    glTranslatef(-1.5f,0.0f,-6.0f);		// Move Left 1.5 Units And Into The Screen 6.0
+
+    // draw a triangle (in smooth coloring mode)
+    glRotatef(rtri, 0.0f,1.0f,0.0f);
+    glBegin(GL_TRIANGLES);				// start drawing a polygon
+        glColor3f(1.0f,0.0f,0.0f);			// Set The Color To Red
+        glVertex3f( 0.0f, 1.0f, 0.0f);		// Top
+        glColor3f(0.0f,1.0f,0.0f);			// Set The Color To Green
+        glVertex3f( 1.0f,-1.0f, 0.0f);		// Bottom Right
+        glColor3f(0.0f,0.0f,1.0f);			// Set The Color To Blue
+        glVertex3f(-1.0f,-1.0f, 0.0f);		// Bottom Left
+    glEnd();					// we're done with the polygon (smooth color interpolation)
+
+    glTranslatef(3.0f,0.0f,0.0f);		        // Move Right 3 Units
+
+    glLoadIdentity();
+    glTranslatef(1.5f,0.0f,-6.0f);
+    glRotatef(rquad,1.0f,0.0f,0.0f);
+
+    // draw a square (quadrilateral)
+    glColor3f(0.5f,0.5f,1.0f);			// set color to a blue shade.
+    glBegin(GL_QUADS);				// start drawing a polygon (4 sided)
+        glVertex3f(-1.0f, 1.0f, 0.0f);		// Top Left
+        glVertex3f( 1.0f, 1.0f, 0.0f);		// Top Right
+        glVertex3f( 1.0f,-1.0f, 0.0f);		// Bottom Right
+        glVertex3f(-1.0f,-1.0f, 0.0f);		// Bottom Left
+    glEnd(); 				// done with the polygon
+
+    rtri += 0.2f;
+    rquad -= 0.15f;
+
+    // swap buffers to display, since we're double buffered.
+    glKosSwapBuffers();
+}
+
+int main(int argc, char **argv)
+{
+    glKosInit();
+
+    InitGL(640, 480);
+    ReSizeGLScene(640, 480);
+
+    while(1) {
+        DrawGLScene();
+    }
+
+    return 0;
+}

samples/nehe05/Makefile

@@ -0,0 +1,29 @@
+TARGET = nehe05.elf
+OBJS = main.o
+
+all: rm-elf $(TARGET)
+
+include $(KOS_BASE)/Makefile.rules
+
+clean:
+	-rm -f $(TARGET) $(OBJS) romdisk.*
+
+rm-elf:
+	-rm -f $(TARGET) romdisk.*
+
+$(TARGET): $(OBJS) romdisk.o
+	$(KOS_CC) $(KOS_CFLAGS) $(KOS_LDFLAGS) -o $(TARGET) $(KOS_START) \
+		$(OBJS) romdisk.o $(OBJEXTRA) -lm -lkosutils $(KOS_LIBS)
+
+romdisk.img:
+	$(KOS_GENROMFS) -f romdisk.img -d romdisk -v
+
+romdisk.o: romdisk.img
+	$(KOS_BASE)/utils/bin2o/bin2o romdisk.img romdisk romdisk.o
+
+run: $(TARGET)
+	$(KOS_LOADER) $(TARGET)
+
+dist:
+	rm -f $(OBJS) romdisk.o romdisk.img
+	$(KOS_STRIP) $(TARGET)

samples/nehe05/main.c

@@ -0,0 +1,147 @@
+#include "gl.h"
+#include "glu.h"
+#include "glkos.h"
+
+GLfloat rtri;
+GLfloat rquad;
+
+/* A general OpenGL initialization function.  Sets all of the initial parameters. */
+void InitGL(int Width, int Height)	        // We call this right after our OpenGL window is created.
+{
+    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);		// This Will Clear The Background Color To Black
+    glClearDepth(1.0);				// Enables Clearing Of The Depth Buffer
+    glDepthFunc(GL_LESS);				// The Type Of Depth Test To Do
+    glEnable(GL_DEPTH_TEST);			// Enables Depth Testing
+    glShadeModel(GL_SMOOTH);			// Enables Smooth Color Shading
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();				// Reset The Projection Matrix
+
+    gluPerspective(45.0f,(GLfloat)Width/(GLfloat)Height,0.1f,100.0f);	// Calculate The Aspect Ratio Of The Window
+
+    glMatrixMode(GL_MODELVIEW);
+}
+
+/* The function called when our window is resized (which shouldn't happen, because we're fullscreen) */
+void ReSizeGLScene(int Width, int Height)
+{
+    if (Height == 0)				// Prevent A Divide By Zero If The Window Is Too Small
+        Height = 1;
+
+    glViewport(0, 0, Width, Height);		// Reset The Current Viewport And Perspective Transformation
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+
+    gluPerspective(45.0f,(GLfloat)Width/(GLfloat)Height,0.1f,100.0f);
+    glMatrixMode(GL_MODELVIEW);
+}
+
+
+/* The main drawing function. */
+void DrawGLScene()
+{
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);        // Clear The Screen And The Depth Buffer
+    glLoadIdentity();                // Reset The View
+    glTranslatef(-1.5f,0.0f,-6.0f);        // Move Left 1.5 Units And Into The Screen 6.0
+    // draw a triangle (in smooth coloring mode)
+    glRotatef(rtri, 0.0f,1.0f,0.0f);
+    glBegin(GL_TRIANGLES);                // start drawing a polygon
+    
+        // Front Face
+        glColor3f(1.0f,0.0f,0.0f);            // Set The Color To Red
+        glVertex3f( 0.0f, 1.0f, 0.0f);        // Top
+        glColor3f(0.0f,1.0f,0.0f);            // Set The Color To Green
+        glVertex3f(-1.0f,-1.0f, 1.0f);        // Bottom Right
+        glColor3f(0.0f,0.0f,1.0f);            // Set The Color To Blue
+        glVertex3f(1.0f,-1.0f, 1.0f);        // Bottom Left
+    
+        // Right Face
+        glColor3f(1.0f,0.0f,0.0f);          // Red
+        glVertex3f( 0.0f, 1.0f, 0.0f);          // Top Of Triangle (Right)
+        glColor3f(0.0f,0.0f,1.0f);          // Blue
+        glVertex3f( 1.0f,-1.0f, 1.0f);          // Left Of Triangle (Right)
+        glColor3f(0.0f,1.0f,0.0f);          // Green
+        glVertex3f( 1.0f,-1.0f, -1.0f);         // Right Of Triangle (Right)
+    
+        // Back face
+        glColor3f(1.0f,0.0f,0.0f);          // Red
+        glVertex3f( 0.0f, 1.0f, 0.0f);          // Top Of Triangle (Back)
+        glColor3f(0.0f,1.0f,0.0f);          // Green
+        glVertex3f( 1.0f,-1.0f, -1.0f);         // Left Of Triangle (Back)
+        glColor3f(0.0f,0.0f,1.0f);          // Blue
+        glVertex3f(-1.0f,-1.0f, -1.0f);         // Right Of Triangle (Back)
+
+        // Left face
+        glColor3f(1.0f,0.0f,0.0f);          // Red
+        glVertex3f( 0.0f, 1.0f, 0.0f);          // Top Of Triangle (Left)
+        glColor3f(0.0f,0.0f,1.0f);          // Blue
+        glVertex3f(-1.0f,-1.0f,-1.0f);          // Left Of Triangle (Left)
+        glColor3f(0.0f,1.0f,0.0f);          // Green
+        glVertex3f(-1.0f,-1.0f, 1.0f);          // Right Of Triangle (Left)
+    glEnd();                        // Done Drawing The Pyramid
+
+    glLoadIdentity();
+    glTranslatef(1.5f,0.0f,-7.0f);              // Move Right And Into The Screen
+     
+    glRotatef(rquad,1.0f,1.0f,1.0f);            // Rotate The Cube On X, Y & Z
+     
+    glBegin(GL_QUADS);                  // Start Drawing The Cube
+        // Top
+        glColor3f(0.0f,1.0f,0.0f);          // Set The Color To Green
+        glVertex3f( 1.0f, 1.0f,-1.0f);          // Top Right Of The Quad (Top)
+        glVertex3f(-1.0f, 1.0f,-1.0f);          // Top Left Of The Quad (Top)
+        glVertex3f(-1.0f, 1.0f, 1.0f);          // Bottom Left Of The Quad (Top)
+        glVertex3f( 1.0f, 1.0f, 1.0f);          // Bottom Right Of The Quad (Top)
+    
+        glColor3f(1.0f,0.5f,0.0f);          // Set The Color To Orange
+        glVertex3f( 1.0f,-1.0f, 1.0f);          // Top Right Of The Quad (Bottom)
+        glVertex3f(-1.0f,-1.0f, 1.0f);          // Top Left Of The Quad (Bottom)
+        glVertex3f(-1.0f,-1.0f,-1.0f);          // Bottom Left Of The Quad (Bottom)
+        glVertex3f( 1.0f,-1.0f,-1.0f);          // Bottom Right Of The Quad (Bottom)
+
+        glColor3f(1.0f,0.0f,0.0f);          // Set The Color To Red
+        glVertex3f( 1.0f, 1.0f, 1.0f);          // Top Right Of The Quad (Front)
+        glVertex3f(-1.0f, 1.0f, 1.0f);          // Top Left Of The Quad (Front)
+        glVertex3f(-1.0f,-1.0f, 1.0f);          // Bottom Left Of The Quad (Front)
+        glVertex3f( 1.0f,-1.0f, 1.0f);          // Bottom Right Of The Quad (Front)
+
+        glColor3f(1.0f,1.0f,0.0f);          // Set The Color To Yellow
+        glVertex3f( 1.0f,-1.0f,-1.0f);          // Bottom Left Of The Quad (Back)
+        glVertex3f(-1.0f,-1.0f,-1.0f);          // Bottom Right Of The Quad (Back)
+        glVertex3f(-1.0f, 1.0f,-1.0f);          // Top Right Of The Quad (Back)
+        glVertex3f( 1.0f, 1.0f,-1.0f);          // Top Left Of The Quad (Back)
+    
+        glColor3f(0.0f,0.0f,1.0f);          // Set The Color To Blue
+        glVertex3f(-1.0f, 1.0f, 1.0f);          // Top Right Of The Quad (Left)
+        glVertex3f(-1.0f, 1.0f,-1.0f);          // Top Left Of The Quad (Left)
+        glVertex3f(-1.0f,-1.0f,-1.0f);          // Bottom Left Of The Quad (Left)
+        glVertex3f(-1.0f,-1.0f, 1.0f);          // Bottom Right Of The Quad (Left)
+
+        glColor3f(1.0f,0.0f,1.0f);          // Set The Color To Violet
+        glVertex3f( 1.0f, 1.0f,-1.0f);          // Top Right Of The Quad (Right)
+        glVertex3f( 1.0f, 1.0f, 1.0f);          // Top Left Of The Quad (Right)
+        glVertex3f( 1.0f,-1.0f, 1.0f);          // Bottom Left Of The Quad (Right)
+        glVertex3f( 1.0f,-1.0f,-1.0f);          // Bottom Right Of The Quad (Right)
+    glEnd();                        // Done Drawing The Quad
+    
+    rtri += 0.2f;
+    rquad -= 0.15f;
+
+    // swap buffers to display, since we're double buffered.
+    glKosSwapBuffers();
+}
+
+int main(int argc, char **argv)
+{
+    glKosInit();
+
+    InitGL(640, 480);
+    ReSizeGLScene(640, 480);
+
+    while(1) {
+        DrawGLScene();
+    }
+
+    return 0;
+}