Author: cjcollier
Date: 2006-01-13 00:22:11 -0500 (Fri, 13 Jan 2006)
New Revision: 55490
Added:
trunk/gtkglarea-sharp/examples/pick-object/
trunk/gtkglarea-sharp/examples/shapes/
trunk/gtkglarea-sharp/examples/shapes/ColoredSquare.cs
trunk/gtkglarea-sharp/examples/shapes/ColoredTriangle.cs
trunk/gtkglarea-sharp/examples/shapes/Cube.cs
trunk/gtkglarea-sharp/examples/shapes/Makefile.am
trunk/gtkglarea-sharp/examples/shapes/Pyramid.cs
trunk/gtkglarea-sharp/examples/shapes/Square.cs
trunk/gtkglarea-sharp/examples/shapes/Teapot.cs
trunk/gtkglarea-sharp/examples/shapes/Triangle.cs
Removed:
trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Square.cs
trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Triangle.cs
trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/ColoredSquare.cs
trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/ColoredTriangle.cs
trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Cube.cs
trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Pyramid.cs
trunk/gtkglarea-sharp/examples/util/Teapot.cs
Modified:
trunk/gtkglarea-sharp/configure.ac
trunk/gtkglarea-sharp/examples/Makefile.am
trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Makefile.am
trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/Makefile.am
trunk/gtkglarea-sharp/examples/NeHe/Lessons/04/Makefile.am
trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Makefile.am
trunk/gtkglarea-sharp/examples/trackball/Makefile.am
trunk/gtkglarea-sharp/examples/util/Makefile.am
Log:
- moved shapes into examples/shapes
- built a .dll from them
- corrected Makefile.am files to point to the new .dll
Modified: trunk/gtkglarea-sharp/configure.ac
===================================================================
--- trunk/gtkglarea-sharp/configure.ac 2006-01-13 05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/configure.ac 2006-01-13 05:22:11 UTC (rev 55490)
@@ -137,6 +137,7 @@
examples/glade/Makefile
examples/trackball/Makefile
examples/util/Makefile
+examples/shapes/Makefile
examples/resources/Makefile
examples/NeHe/Makefile
examples/NeHe/Lessons/Makefile
Modified: trunk/gtkglarea-sharp/examples/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/examples/Makefile.am 2006-01-13 05:14:37 UTC (rev
55489)
+++ trunk/gtkglarea-sharp/examples/Makefile.am 2006-01-13 05:22:11 UTC (rev
55490)
@@ -1,5 +1,6 @@
SUBDIRS = \
util \
+ shapes \
NeHe \
trackball \
rotate-buttons \
Modified: trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Makefile.am 2006-01-13
05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Makefile.am 2006-01-13
05:22:11 UTC (rev 55490)
@@ -1,10 +1,7 @@
SOURCE_FILES = \
Lesson02.cs \
- $(top_srcdir)/examples/glade/GladeExample.cs \
- Triangle.cs \
- Square.cs
+ $(top_srcdir)/examples/glade/GladeExample.cs
-
CLEANFILES = \
Lesson02.exe \
Lesson02.exe.pidb
@@ -23,12 +20,14 @@
MCS_ARGS = \
-debug \
-lib:$(top_srcdir)/examples/util/ \
+ -lib:$(top_srcdir)/examples/shapes/ \
-lib:$(top_srcdir)/gtkglarea/ \
-resource:$(top_srcdir)/examples/resources/glwidget.glade \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0 \
-pkg:tao-opengl-glu \
-r:gtkglarea-sharp.dll \
+ -r:shapes.dll \
-nowarn:0169 \
-r:gtkglarea-sharp-util.dll
Deleted: trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Square.cs
===================================================================
--- trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Square.cs 2006-01-13
05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Square.cs 2006-01-13
05:22:11 UTC (rev 55490)
@@ -1,18 +0,0 @@
-namespace NeHe {
- using System;
-
- using gl=Tao.OpenGl.Gl;
-
- public class Square : GtkGL.GLObjectBase, GtkGL.IGLObject {
-
- protected override void DrawObject ()
- {
- gl.glBegin(gl.GL_QUADS);
// Draw A Quad
- gl.glVertex3f(-1.0f, 1.0f, 0.0f);
// Top Left
- gl.glVertex3f( 1.0f, 1.0f, 0.0f);
// Top Right
- gl.glVertex3f( 1.0f,-1.0f, 0.0f);
// Bottom Right
- gl.glVertex3f(-1.0f,-1.0f, 0.0f);
// Bottom Left
- gl.glEnd();
// Done Drawing The Quad
- }
- }
-}
Deleted: trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Triangle.cs
===================================================================
--- trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Triangle.cs 2006-01-13
05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Triangle.cs 2006-01-13
05:22:11 UTC (rev 55490)
@@ -1,18 +0,0 @@
-
-namespace NeHe {
- using System;
-
- using gl=Tao.OpenGl.Gl;
-
- public class Triangle : GtkGL.GLObjectBase,GtkGL.IGLObject{
-
- protected override void DrawObject()
- {
- gl.glBegin(gl.GL_TRIANGLES);
// Drawing Using Triangles
- gl.glVertex3f( 0.0f, 1.0f, 0.0f);
// Top
- gl.glVertex3f(-1.0f,-1.0f, 0.0f);
// Bottom Left
- gl.glVertex3f( 1.0f,-1.0f, 0.0f);
// Bottom Right
- gl.glEnd();
// Finished Drawing The Triangle
- }
- }
-}
Deleted: trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/ColoredSquare.cs
===================================================================
--- trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/ColoredSquare.cs
2006-01-13 05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/ColoredSquare.cs
2006-01-13 05:22:11 UTC (rev 55490)
@@ -1,19 +0,0 @@
-namespace NeHe {
- using System;
-
- using gl=Tao.OpenGl.Gl;
-
- public class ColoredSquare : GtkGL.GLObjectBase, GtkGL.IGLObject {
-
- protected override void DrawObject ()
- {
- gl.glColor3f(0.5f,0.5f,1.0f);
// Set The Color To Blue One Time Only
- gl.glBegin(gl.GL_QUADS);
// Draw A Quad
- gl.glVertex3f(-1.0f, 1.0f, 0.0f);
// Top Left
- gl.glVertex3f( 1.0f, 1.0f, 0.0f);
// Top Right
- gl.glVertex3f( 1.0f,-1.0f, 0.0f);
// Bottom Right
- gl.glVertex3f(-1.0f,-1.0f, 0.0f);
// Bottom Left
- gl.glEnd();
// Done Drawing The Quad
- }
- }
-}
Deleted: trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/ColoredTriangle.cs
===================================================================
--- trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/ColoredTriangle.cs
2006-01-13 05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/ColoredTriangle.cs
2006-01-13 05:22:11 UTC (rev 55490)
@@ -1,21 +0,0 @@
-
-namespace NeHe {
- using System;
-
- using gl=Tao.OpenGl.Gl;
-
- public class ColoredTriangle : GtkGL.GLObjectBase,GtkGL.IGLObject{
-
- protected override void DrawObject()
- {
- gl.glBegin(gl.GL_TRIANGLES);
// Drawing Using Triangles
- gl.glColor3f(1.0f,0.0f,0.0f);
// Set The Color To Red
- gl.glVertex3f( 0.0f, 1.0f, 0.0f);
// Top
- gl.glColor3f(0.0f,1.0f,0.0f);
// Set The Color To Green
- gl.glVertex3f(-1.0f,-1.0f, 0.0f);
// Bottom Left
- gl.glColor3f(0.0f,0.0f,1.0f);
// Set The Color To Blue
- gl.glVertex3f( 1.0f,-1.0f, 0.0f);
// Bottom Right
- gl.glEnd();
// Finished Drawing The Triangle
- }
- }
-}
Modified: trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/Makefile.am 2006-01-13
05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/Makefile.am 2006-01-13
05:22:11 UTC (rev 55490)
@@ -1,8 +1,6 @@
SOURCE_FILES = \
Lesson03.cs \
- $(top_srcdir)/examples/glade/GladeExample.cs \
- ColoredTriangle.cs \
- ColoredSquare.cs
+ $(top_srcdir)/examples/glade/GladeExample.cs
CLEANFILES = \
@@ -22,12 +20,14 @@
MCS_ARGS = \
-debug \
-lib:$(top_srcdir)/examples/util/ \
+ -lib:$(top_srcdir)/examples/shapes/ \
-lib:$(top_srcdir)/gtkglarea/ \
-resource:$(top_srcdir)/examples/resources/glwidget.glade \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0 \
-pkg:tao-opengl-glu \
-r:gtkglarea-sharp.dll \
+ -r:shapes.dll \
-nowarn:0169 \
-r:gtkglarea-sharp-util.dll
Modified: trunk/gtkglarea-sharp/examples/NeHe/Lessons/04/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/examples/NeHe/Lessons/04/Makefile.am 2006-01-13
05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/NeHe/Lessons/04/Makefile.am 2006-01-13
05:22:11 UTC (rev 55490)
@@ -1,8 +1,6 @@
SOURCE_FILES = \
Lesson04.cs \
- $(top_srcdir)/examples/glade/GladeExample.cs \
- ColoredTriangle.cs \
- ColoredSquare.cs
+ $(top_srcdir)/examples/glade/GladeExample.cs
CLEANFILES = \
Lesson04.exe \
@@ -21,14 +19,16 @@
MCS_ARGS = \
-debug \
-lib:$(top_srcdir)/examples/util/ \
+ -lib:$(top_srcdir)/examples/shapes/ \
-lib:$(top_srcdir)/gtkglarea/ \
-resource:$(top_srcdir)/examples/resources/glwidget.glade \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0 \
-pkg:tao-opengl-glu \
+ -nowarn:0169 \
-r:gtkglarea-sharp.dll \
- -nowarn:0169 \
-r:gtkglarea-sharp-util.dll
+ -r:shapes.dll
Lesson04.exe: $(SOURCE_FILES)
mcs \
Deleted: trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Cube.cs
===================================================================
--- trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Cube.cs 2006-01-13
05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Cube.cs 2006-01-13
05:22:11 UTC (rev 55490)
@@ -1,51 +0,0 @@
-namespace NeHe {
- using System;
-
- using gl=Tao.OpenGl.Gl;
-
- public class Cube : GtkGL.GLObjectBase, GtkGL.IGLObject {
-
- protected override void DrawObject ()
- {
- gl.glBegin(gl.GL_QUADS);
// Draw a Cube
-
- gl.glColor3f(0.0f,1.0f,0.0f);
// Set The Color To Green
- gl.glVertex3f( 1.0f, 1.0f,-1.0f);
// Top Right Of The Quad (Top)
- gl.glVertex3f(-1.0f, 1.0f,-1.0f);
// Top Left Of The Quad (Top)
- gl.glVertex3f(-1.0f, 1.0f, 1.0f);
// Bottom Left Of The Quad (Top)
- gl.glVertex3f( 1.0f, 1.0f, 1.0f);
// Bottom Right Of The Quad (Top)
-
- gl.glColor3f(1.0f,0.5f,0.0f);
// Set The Color To Orange
- gl.glVertex3f( 1.0f,-1.0f, 1.0f);
// Top Right Of The Quad (Bottom)
- gl.glVertex3f(-1.0f,-1.0f, 1.0f);
// Top Left Of The Quad (Bottom)
- gl.glVertex3f(-1.0f,-1.0f,-1.0f);
// Bottom Left Of The Quad (Bottom)
- gl.glVertex3f( 1.0f,-1.0f,-1.0f);
// Bottom Right Of The Quad (Bottom)
-
- gl.glColor3f(1.0f,0.0f,0.0f);
// Set The Color To Red
- gl.glVertex3f( 1.0f, 1.0f, 1.0f);
// Top Right Of The Quad (Front)
- gl.glVertex3f(-1.0f, 1.0f, 1.0f);
// Top Left Of The Quad (Front)
- gl.glVertex3f(-1.0f,-1.0f, 1.0f);
// Bottom Left Of The Quad (Front)
- gl.glVertex3f( 1.0f,-1.0f, 1.0f);
// Bottom Right Of The Quad (Front)
-
- gl.glColor3f(1.0f,1.0f,0.0f);
// Set The Color To Yellow
- gl.glVertex3f( 1.0f,-1.0f,-1.0f);
// Bottom Left Of The Quad (Back)
- gl.glVertex3f(-1.0f,-1.0f,-1.0f);
// Bottom Right Of The Quad (Back)
- gl.glVertex3f(-1.0f, 1.0f,-1.0f);
// Top Right Of The Quad (Back)
- gl.glVertex3f( 1.0f, 1.0f,-1.0f);
// Top Left Of The Quad (Back)
-
- gl.glColor3f(0.0f,0.0f,1.0f);
// Set The Color To Blue
- gl.glVertex3f(-1.0f, 1.0f, 1.0f);
// Top Right Of The Quad (Left)
- gl.glVertex3f(-1.0f, 1.0f,-1.0f);
// Top Left Of The Quad (Left)
- gl.glVertex3f(-1.0f,-1.0f,-1.0f);
// Bottom Left Of The Quad (Left)
- gl.glVertex3f(-1.0f,-1.0f, 1.0f);
// Bottom Right Of The Quad (Left)
-
- gl.glColor3f(1.0f,0.0f,1.0f);
// Set The Color To Violet
- gl.glVertex3f( 1.0f, 1.0f,-1.0f);
// Top Right Of The Quad (Right)
- gl.glVertex3f( 1.0f, 1.0f, 1.0f);
// Top Left Of The Quad (Right)
- gl.glVertex3f( 1.0f,-1.0f, 1.0f);
// Bottom Left Of The Quad (Right)
- gl.glVertex3f( 1.0f,-1.0f,-1.0f);
// Bottom Right Of The Quad (Right)
-
- gl.glEnd();
- }
- }
-}
Modified: trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Makefile.am 2006-01-13
05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Makefile.am 2006-01-13
05:22:11 UTC (rev 55490)
@@ -21,13 +21,15 @@
MCS_ARGS = \
-debug \
-lib:$(top_srcdir)/examples/util/ \
+ -lib:$(top_srcdir)/examples/shapes/ \
-lib:$(top_srcdir)/gtkglarea/ \
-resource:$(top_srcdir)/examples/resources/glwidget.glade \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0 \
-pkg:tao-opengl-glu \
+ -nowarn:0169 \
-r:gtkglarea-sharp.dll \
- -nowarn:0169 \
+ -r:shapes.dll \
-r:gtkglarea-sharp-util.dll
Lesson05.exe: $(SOURCE_FILES)
Deleted: trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Pyramid.cs
===================================================================
--- trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Pyramid.cs 2006-01-13
05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Pyramid.cs 2006-01-13
05:22:11 UTC (rev 55490)
@@ -1,58 +0,0 @@
-
-namespace NeHe {
- using System;
-
- using gl=Tao.OpenGl.Gl;
-
- public class Pyramid : GtkGL.GLObjectBase,GtkGL.IGLObject{
-
- protected override void DrawObject()
- {
- gl.glBegin(gl.GL_TRIANGLES);
// Start drawing the Pyramid
-
- gl.glColor3f(1.0f,0.0f,0.0f);
// Red
- gl.glVertex3f( 0.0f, 1.0f, 0.0f);
// Top Of Triangle (Front)
- gl.glColor3f(0.0f,1.0f,0.0f);
// Green
- gl.glVertex3f(-1.0f,-1.0f, 1.0f);
// Left Of Triangle (Front)
- gl.glColor3f(0.0f,0.0f,1.0f);
// Blue
- gl.glVertex3f( 1.0f,-1.0f, 1.0f);
// Right Of Triangle (Front)
-
- gl.glColor3f(1.0f,0.0f,0.0f);
// Red
- gl.glVertex3f( 0.0f, 1.0f, 0.0f);
// Top Of Triangle (Right)
- gl.glColor3f(0.0f,0.0f,1.0f);
// Blue
- gl.glVertex3f( 1.0f,-1.0f, 1.0f);
// Left Of Triangle (Right)
- gl.glColor3f(0.0f,1.0f,0.0f);
// Green
- gl.glVertex3f( 1.0f,-1.0f, -1.0f);
// Right Of Triangle (Right)
-
- gl.glColor3f(1.0f,0.0f,0.0f);
// Red
- gl.glVertex3f( 0.0f, 1.0f, 0.0f);
// Top Of Triangle (Back)
- gl.glColor3f(0.0f,1.0f,0.0f);
// Green
- gl.glVertex3f( 1.0f,-1.0f, -1.0f);
// Left Of Triangle (Back)
- gl.glColor3f(0.0f,0.0f,1.0f);
// Blue
- gl.glVertex3f(-1.0f,-1.0f, -1.0f);
// Right Of Triangle (Back)
-
- gl.glColor3f(1.0f,0.0f,0.0f);
// Red
- gl.glVertex3f( 0.0f, 1.0f, 0.0f);
// Top Of Triangle (Left)
- gl.glColor3f(0.0f,0.0f,1.0f);
// Blue
- gl.glVertex3f(-1.0f,-1.0f,-1.0f);
// Left Of Triangle (Left)
- gl.glColor3f(0.0f,1.0f,0.0f);
// Green
- gl.glVertex3f(-1.0f,-1.0f, 1.0f);
// Right Of Triangle (Left)
-
- gl.glEnd();
// Finished Drawing sides
-
- gl.glBegin(gl.GL_QUADS);
// Draw the base
-
- gl.glColor3f(0.0f,1.0f,0.0f);
// Green
- gl.glVertex3f(-1.0f,-1.0f, 1.0f);
// Left Of Triangle (Front)
- gl.glColor3f(0.0f,0.0f,1.0f);
// Blue
- gl.glVertex3f( 1.0f,-1.0f, 1.0f);
// Left Of Triangle (Right)
- gl.glColor3f(0.0f,1.0f,0.0f);
// Green
- gl.glVertex3f( 1.0f,-1.0f, -1.0f);
// Left Of Triangle (Back)
- gl.glColor3f(0.0f,0.0f,1.0f);
// Blue
- gl.glVertex3f(-1.0f,-1.0f,-1.0f);
// Left Of Triangle (Left)
-
- gl.glEnd();
// Finished Drawing The Pyramid
-
- }
- }
-}
Copied: trunk/gtkglarea-sharp/examples/shapes/ColoredSquare.cs (from rev 55464,
trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/ColoredSquare.cs)
Copied: trunk/gtkglarea-sharp/examples/shapes/ColoredTriangle.cs (from rev
55464, trunk/gtkglarea-sharp/examples/NeHe/Lessons/03/ColoredTriangle.cs)
Copied: trunk/gtkglarea-sharp/examples/shapes/Cube.cs (from rev 55483,
trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Cube.cs)
Added: trunk/gtkglarea-sharp/examples/shapes/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/examples/shapes/Makefile.am 2006-01-13 05:14:37 UTC
(rev 55489)
+++ trunk/gtkglarea-sharp/examples/shapes/Makefile.am 2006-01-13 05:22:11 UTC
(rev 55490)
@@ -0,0 +1,29 @@
+SOURCE_FILES = \
+ ColoredSquare.cs \
+ ColoredTriangle.cs \
+ Cube.cs \
+ Pyramid.cs \
+ Square.cs \
+ Teapot.cs \
+ Triangle.cs
+
+
+EXTRA_DIST = $(SOURCE_FILES)
+
+CLEANFILES = \
+ shapes.dll \
+ shapes.dll.mdb
+
+all: shapes.dll
+
+shapes.dll: $(SOURCE_FILES)
+ $(MCS) -debug \
+ -lib:$(top_srcdir)/gtkglarea/ \
+ -lib:$(top_srcdir)/examples/util/ \
+ -r:gtkglarea-sharp.dll \
+ -r:gtkglarea-sharp-util.dll \
+ -target:library \
+ -pkg:tao-opengl-glu \
+ -out:shapes.dll \
+ $(SOURCE_FILES)
+
Copied: trunk/gtkglarea-sharp/examples/shapes/Pyramid.cs (from rev 55483,
trunk/gtkglarea-sharp/examples/NeHe/Lessons/05/Pyramid.cs)
Copied: trunk/gtkglarea-sharp/examples/shapes/Square.cs (from rev 55464,
trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Square.cs)
Copied: trunk/gtkglarea-sharp/examples/shapes/Teapot.cs (from rev 55464,
trunk/gtkglarea-sharp/examples/util/Teapot.cs)
Copied: trunk/gtkglarea-sharp/examples/shapes/Triangle.cs (from rev 55464,
trunk/gtkglarea-sharp/examples/NeHe/Lessons/02/Triangle.cs)
Modified: trunk/gtkglarea-sharp/examples/trackball/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/examples/trackball/Makefile.am 2006-01-13
05:14:37 UTC (rev 55489)
+++ trunk/gtkglarea-sharp/examples/trackball/Makefile.am 2006-01-13
05:22:11 UTC (rev 55490)
@@ -17,7 +17,6 @@
-r:gtkglarea-sharp.dll \
-r:gtkglarea-sharp-util.dll \
-pkg:tao-opengl-glu \
- -lib:$(GTKSHARP_PREFIX)/lib \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0 \
-out:TrackballExample.exe \
Modified: trunk/gtkglarea-sharp/examples/util/Makefile.am
===================================================================
--- trunk/gtkglarea-sharp/examples/util/Makefile.am 2006-01-13 05:14:37 UTC
(rev 55489)
+++ trunk/gtkglarea-sharp/examples/util/Makefile.am 2006-01-13 05:22:11 UTC
(rev 55490)
@@ -6,8 +6,7 @@
Rotation.cs \
Vector.cs \
Quaternion.cs \
- TransformationMatrix.cs \
- Teapot.cs
+ TransformationMatrix.cs
EXTRA_DIST = $(SOURCE_FILES)
Deleted: trunk/gtkglarea-sharp/examples/util/Teapot.cs
===================================================================
--- trunk/gtkglarea-sharp/examples/util/Teapot.cs 2006-01-13 05:14:37 UTC
(rev 55489)
+++ trunk/gtkglarea-sharp/examples/util/Teapot.cs 2006-01-13 05:22:11 UTC
(rev 55490)
@@ -1,186 +0,0 @@
-// created on 11/25/2005 at 11:13 AM
-using Tao.OpenGl;
-using gl=Tao.OpenGl.Gl;
-using System;
-using System.Collections;
-
-namespace GtkGL {
- public class Teapot : GtkGL.GLObjectBase,GtkGL.IGLObject {
- /*
- * Teapot
- */
-
- /* Rim, body, lid, and bottom data must be reflected in x and
- y; handle and spout data across the y axis only. */
-
- static int[,] patchdata =
- {
- /* rim */
- {102, 103, 104, 105, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15},
- /* body */
- {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27},
- {24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
39, 40},
- /* lid */
- {96, 96, 96, 96, 97, 98, 99, 100, 101, 101, 101, 101, 0,
1, 2, 3,},
- {0, 1, 2, 3, 106, 107, 108, 109, 110, 111, 112, 113, 114,
115, 116, 117},
- /* bottom */
- {118, 118, 118, 118, 124, 122, 119, 121, 123, 126, 125,
120, 40, 39, 38, 37},
- /* handle */
- {41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
55, 56},
- {53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 28, 65,
66, 67},
- /* spout */
- {68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
82, 83},
- {80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
94, 95}
- };
- /* *INDENT-OFF* */
-
- static double[,] cpdata =
- {
- {0.2, 0, 2.7}, {0.2, -0.112, 2.7}, {0.112, -0.2, 2.7},
- {0,-0.2, 2.7}, {1.3375, 0, 2.53125}, {1.3375, -0.749,
2.53125},
- {0.749, -1.3375, 2.53125}, {0, -1.3375, 2.53125},
{1.4375,0, 2.53125},
- {1.4375, -0.805, 2.53125}, {0.805, -1.4375,2.53125}, {0,
-1.4375, 2.53125},
- {1.5, 0, 2.4}, {1.5, -0.84, 2.4}, {0.84, -1.5, 2.4},
- {0, -1.5, 2.4}, {1.75, 0, 1.875},
- {1.75, -0.98, 1.875}, {0.98, -1.75, 1.875}, {0, -1.75,
1.875},
- {2, 0, 1.35}, {2, -1.12, 1.35}, {1.12, -2, 1.35},
- {0, -2, 1.35}, {2, 0, 0.9}, {2, -1.12, 0.9},
- {1.12, -2, 0.9}, {0, -2, 0.9}, {-2, 0, 0.9},
- {2, 0, 0.45}, {2, -1.12, 0.45}, {1.12, -2, 0.45},
- {0, -2, 0.45}, {1.5, 0, 0.225},
- {1.5, -0.84, 0.225}, {0.84, -1.5, 0.225}, {0, -1.5,
0.225},
- {1.5, 0, 0.15}, {1.5, -0.84, 0.15}, {0.84, -1.5, 0.15},
- {0, -1.5, 0.15}, {-1.6, 0, 2.025}, {-1.6, -0.3, 2.025},
- {-1.5, -0.3, 2.25}, {-1.5, 0, 2.25}, {-2.3, 0, 2.025},
- {-2.3, -0.3, 2.025}, {-2.5, -0.3, 2.25}, {-2.5, 0, 2.25},
- {-2.7, 0, 2.025}, {-2.7, -0.3, 2.025}, {-3, -0.3, 2.25},
- {-3, 0, 2.25}, {-2.7, 0, 1.8}, {-2.7, -0.3, 1.8},
- {-3, -0.3, 1.8}, {-3, 0, 1.8}, {-2.7, 0, 1.575},
- {-2.7, -0.3, 1.575}, {-3, -0.3, 1.35}, {-3, 0, 1.35},
- {-2.5, 0, 1.125}, {-2.5, -0.3, 1.125}, {-2.65, -0.3,
0.9375},
- {-2.65, 0, 0.9375}, {-2, -0.3, 0.9}, {-1.9, -0.3, 0.6},
- {-1.9, 0, 0.6}, {1.7, 0, 1.425}, {1.7, -0.66, 1.425},
- {1.7, -0.66, 0.6}, {1.7, 0, 0.6}, {2.6, 0, 1.425},
- {2.6, -0.66, 1.425}, {3.1, -0.66, 0.825}, {3.1, 0, 0.825},
- {2.3, 0, 2.1}, {2.3, -0.25, 2.1},
- {2.4, -0.25, 2.025}, {2.4, 0, 2.025}, {2.7, 0, 2.4},
- {2.7, -0.25, 2.4}, {3.3, -0.25, 2.4}, {3.3, 0, 2.4},
- {2.8, 0, 2.475}, {2.8, -0.25, 2.475}, {3.525, -0.25,
2.49375},
- {3.525, 0, 2.49375}, {2.9, 0, 2.475}, {2.9, -0.15, 2.475},
- {3.45, -0.15, 2.5125}, {3.45, 0, 2.5125}, {2.8, 0, 2.4},
- {2.8, -0.15, 2.4}, {3.2, -0.15, 2.4}, {3.2, 0, 2.4},
- {0, 0, 3.15}, {0.8, 0, 3.15}, {0.8, -0.45, 3.15},
- {0.45, -0.8, 3.15}, {0, -0.8, 3.15}, {0, 0, 2.85},
- {1.4, 0, 2.4}, {1.4, -0.784, 2.4}, {0.784, -1.4, 2.4},
- {0, -1.4, 2.4}, {0.4, 0, 2.55}, {0.4, -0.224, 2.55},
- {0.224, -0.4, 2.55}, {0, -0.4, 2.55}, {1.3, 0, 2.55},
{1.3, -0.728, 2.55}, {0.728, -1.3, 2.55}, {0, -1.3, 2.55}, {1.3, 0, 2.4}, {1.3,
-0.728, 2.4},
- {0.728, -1.3, 2.4}, {0, -1.3, 2.4}, {0, 0, 0}, {1.425,
-0.798, 0}, {1.5, 0, 0.075}, {1.425, 0, 0}, {0.798, -1.425, 0}, {0, -1.5,
0.075}, {0, -1.425, 0}, {1.5, -0.84, 0.075},
- {0.84, -1.5, 0.075}
- };
-
- static float[,,] tex =
- {
- { {0, 0},
- {1, 0}},
- { {0, 1},
- {1, 1}}
- };
-
- /* *INDENT-ON* */
-
- static float[][]
- cachedP = new float[10][],
- cachedQ = new float[10][],
- cachedR = new float[10][],
- cachedS = new float[10][];
-
- private void DoTeaPot(int grid, double scale, int type)
- {
-
- gl.glPushAttrib(gl.GL_ENABLE_BIT | gl.GL_EVAL_BIT);
- gl.glEnable(gl.GL_AUTO_NORMAL);
- gl.glEnable(gl.GL_NORMALIZE);
- gl.glEnable(gl.GL_MAP2_VERTEX_3);
- gl.glEnable(gl.GL_MAP2_TEXTURE_COORD_2);
- gl.glPushMatrix();
- gl.glRotatef(270.0f, 1.0f, 0.0f, 0.0f);
- gl.glScalef((float)(0.5 * scale), (float)(0.5 *
scale), (float)(0.5 * scale));
- gl.glTranslatef(0.0f, 0.0f, -1.5f);
-
- float[,,]
- p = new float[4,4,3],
- q = new float[4,4,3],
- r = new float[4,4,3],
- s = new float[4,4,3];
- int i, j, k, l;
-
- for (i = 0; i < 10; i++) {
-
- if(cachedP[i] == null){
- for (j = 0; j < 4; j++) {
- for (k = 0; k < 4; k++)
{
- for (l = 0; l <
3; l++) {
- p[j,k,l] =
(float)cpdata[patchdata[i,j * 4 + k],l];
- q[j,k,l] =
(float)cpdata[patchdata[i,j * 4 + (3 - k)],l];
- if (l == 1)
-
q[j,k,l] *= -1.0f;
- if (i < 6) {
-
r[j,k,l] = (float)cpdata[patchdata[i,j * 4 + (3 - k)],l];
- if (l
== 0)
-
r[j,k,l] *= -1.0f;
-
s[j,k,l] = (float)cpdata[patchdata[i,j * 4 + k],l];
- if (l
== 0)
-
s[j,k,l] *= -1.0f;
- if (l
== 1)
-
s[j,k,l] *= -1.0f;
- }
- }
- }
- }
-
- cachedP[i] = new float[4*4*3];
- cachedQ[i] = new float[4*4*3];
- cachedR[i] = new float[4*4*3];
- cachedS[i] = new float[4*4*3];
-
- int pos;
- pos = 0;
- for(int I = 0; I < 4; I++)
- for(int J = 0; J < 4; J++)
- for(int K = 0; K < 3;
K++,pos++){
-
cachedP[i][pos] = p[I,J,K];
- cachedQ[i][pos]
= q[I,J,K];
- cachedR[i][pos]
= r[I,J,K];
- cachedS[i][pos]
= s[I,J,K];
- }
- }
-
- gl.glMap2f(gl.GL_MAP2_TEXTURE_COORD_2, 0, 1, 2,
2, 0, 1, 4, 2, ref tex[0,0,0]);
- gl.glMap2f(gl.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0,
1, 12, 4, cachedP[i]);
- gl.glMapGrid2f(grid, 0.0f, 1.0f, grid, 0.0f,
1.0f);
- gl.glEvalMesh2(type, 0, grid, 0, grid);
- gl.glMap2f(gl.GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0,
1, 12, 4, cachedQ[i]);
- gl.glEvalMesh2(type, 0, grid, 0, grid);
- if (i < 6) {
- gl.glMap2f(gl.GL_MAP2_VERTEX_3,
0, 1, 3, 4, 0, 1, 12, 4, cachedR[i]);
- gl.glEvalMesh2(type, 0, grid,
0, grid);
- gl.glMap2f(gl.GL_MAP2_VERTEX_3,
0, 1, 3, 4, 0, 1, 12, 4, cachedS[i]);
- gl.glEvalMesh2(type, 0, grid,
0, grid);
- }
- }
- gl.glPopMatrix();
- gl.glPopAttrib();
- }
-
- protected override void DrawObject()
- {
- bool solid = true;
- double scale = 0.5;
-
- if (solid)
- DoTeaPot (7, scale, gl.GL_FILL);
- else
- DoTeaPot (10, scale, gl.GL_LINE);
- }
- }
-}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
