Author: dhudson
Date: 2006-11-09 18:36:46 -0500 (Thu, 09 Nov 2006)
New Revision: 67652
Added:
trunk/tao/examples/GeWangExamples/GeWangExamples.Designer.cs
trunk/tao/examples/GeWangExamples/GeWangExamples.License.txt
trunk/tao/examples/GeWangExamples/GeWangExamples.Readme.txt
trunk/tao/examples/GeWangExamples/GeWangExamples.cs
trunk/tao/examples/GeWangExamples/GeWangExamples.resx
Removed:
trunk/tao/examples/GeWangExamples/GeWang.Designer.cs
trunk/tao/examples/GeWangExamples/GeWang.License.txt
trunk/tao/examples/GeWangExamples/GeWang.Readme.txt
trunk/tao/examples/GeWangExamples/GeWang.cs
trunk/tao/examples/GeWangExamples/GeWang.resx
Modified:
trunk/tao/examples/GeWangExamples/
trunk/tao/src/Tao.OpenGl/prebuild.xml
Log:
consolidate gewang using RobLoach's example code
Property changes on: trunk/tao/examples/GeWangExamples
___________________________________________________________________
Name: svn:ignore
- Makefile.in
Makefile
obj
GeWang.csproj
GeWang.csproj.user
bin
+ Makefile.in
Makefile
obj
GeWang.csproj
GeWang.csproj.user
bin
GeWangExamples.csproj
GeWangExamples.csproj.user
Deleted: trunk/tao/examples/GeWangExamples/GeWang.Designer.cs
===================================================================
--- trunk/tao/examples/GeWangExamples/GeWang.Designer.cs 2006-11-09
23:29:41 UTC (rev 67651)
+++ trunk/tao/examples/GeWangExamples/GeWang.Designer.cs 2006-11-09
23:36:46 UTC (rev 67652)
@@ -1,77 +0,0 @@
-namespace GeWangExamples
-{
- partial class GeWang
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be
disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- this.lstExamples = new System.Windows.Forms.ListBox();
- this.btnRun = new System.Windows.Forms.Button();
- this.SuspendLayout();
- //
- // lstExamples
- //
- this.lstExamples.FormattingEnabled = true;
- this.lstExamples.Location = new System.Drawing.Point(13, 13);
- this.lstExamples.Name = "lstExamples";
- this.lstExamples.Size = new System.Drawing.Size(258, 173);
- this.lstExamples.Sorted = true;
- this.lstExamples.TabIndex = 0;
- this.lstExamples.DoubleClick += new
System.EventHandler(this.lstExamples_SelectedIndexChanged);
- //
- // btnRun
- //
- this.btnRun.Location = new System.Drawing.Point(94, 192);
- this.btnRun.Name = "btnRun";
- this.btnRun.Size = new System.Drawing.Size(95, 23);
- this.btnRun.TabIndex = 1;
- this.btnRun.Text = "Run";
- this.btnRun.UseVisualStyleBackColor = true;
- this.btnRun.Click += new System.EventHandler(this.btnRun_Click);
- //
- // GeWangExamples
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(283, 224);
- this.Controls.Add(this.btnRun);
- this.Controls.Add(this.lstExamples);
- this.FormBorderStyle =
System.Windows.Forms.FormBorderStyle.FixedSingle;
- this.MaximizeBox = false;
- this.Name = "GeWangExamples";
- this.Text = "GeWangExamples";
- this.Load += new System.EventHandler(this.frmExamples_Load);
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private System.Windows.Forms.ListBox lstExamples;
- private System.Windows.Forms.Button btnRun;
- }
-}
-
Deleted: trunk/tao/examples/GeWangExamples/GeWang.License.txt
===================================================================
--- trunk/tao/examples/GeWangExamples/GeWang.License.txt 2006-11-09
23:29:41 UTC (rev 67651)
+++ trunk/tao/examples/GeWangExamples/GeWang.License.txt 2006-11-09
23:36:46 UTC (rev 67652)
@@ -1,22 +0,0 @@
-MIT License
-Copyright �2003-2005 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
Deleted: trunk/tao/examples/GeWangExamples/GeWang.Readme.txt
===================================================================
--- trunk/tao/examples/GeWangExamples/GeWang.Readme.txt 2006-11-09 23:29:41 UTC
(rev 67651)
+++ trunk/tao/examples/GeWangExamples/GeWang.Readme.txt 2006-11-09 23:36:46 UTC
(rev 67652)
@@ -1,27 +0,0 @@
-GeWang
-Copyright �2003-2005 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-
-These are C# ports of some OpenGL examples developed by Ge Wang, the originals
-are available from http://www.gewang.com/projects/samples/opengl/.
-
-These examples use Tao.OpenGl and Tao.FreeGlut. Make sure you have the
-appropriate native libraries for your system installed.
-
-These examples are fairly well documented, however, do not take
-them to be 'best practices' for .NET OpenGL development. The
-intent of these ports is as an introduction or as a comparison
-against the original native versions.
-
-If you'd like to contribute you can port the Globe example as listed
-on Ge Wang's site. I never got around to it, but it looks pretty
-trivial.
-
-Randy Ridge
-http://www.taoframework.com
-
-Change Log:
-
-April 23, 2004
- Initial release, version 1.0.0.0.
Deleted: trunk/tao/examples/GeWangExamples/GeWang.cs
===================================================================
--- trunk/tao/examples/GeWangExamples/GeWang.cs 2006-11-09 23:29:41 UTC (rev
67651)
+++ trunk/tao/examples/GeWangExamples/GeWang.cs 2006-11-09 23:36:46 UTC (rev
67652)
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using System.Reflection;
-
-namespace GeWangExamples
-{
- public partial class GeWang : Form
- {
- public GeWang()
- {
- InitializeComponent();
- }
-
- private void frmExamples_Load(object sender, EventArgs e)
- {
- Type[] types = Assembly.GetExecutingAssembly().GetTypes();
- foreach (Type type in types)
- {
- MemberInfo[] runMethods = type.GetMember("Run");
- foreach (MemberInfo run in runMethods)
- {
- lstExamples.Items.Add(type.Name);
- }
- }
- }
-
- private void btnRun_Click(object sender, EventArgs e)
- {
- SelectExample();
- }
-
- private void SelectExample()
- {
- Type example =
Assembly.GetExecutingAssembly().GetType("GeWangExamples." +
lstExamples.SelectedItem.ToString(), true, true);
- example.InvokeMember("Run", BindingFlags.InvokeMethod, null, null,
null);
- }
-
- private void lstExamples_SelectedIndexChanged(object sender, EventArgs
e)
- {
- SelectExample();
- }
- }
-}
\ No newline at end of file
Deleted: trunk/tao/examples/GeWangExamples/GeWang.resx
===================================================================
--- trunk/tao/examples/GeWangExamples/GeWang.resx 2006-11-09 23:29:41 UTC
(rev 67651)
+++ trunk/tao/examples/GeWangExamples/GeWang.resx 2006-11-09 23:36:46 UTC
(rev 67652)
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader,
System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter,
System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a
comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1"
mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing"
mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of
the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0"
msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0"
msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"
msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"
/>
- <xsd:attribute name="mimetype" type="xsd:string"
msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0"
msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
Copied: trunk/tao/examples/GeWangExamples/GeWangExamples.Designer.cs (from rev
67651, trunk/tao/examples/GeWangExamples/GeWang.Designer.cs)
Copied: trunk/tao/examples/GeWangExamples/GeWangExamples.License.txt (from rev
67651, trunk/tao/examples/GeWangExamples/GeWang.License.txt)
Copied: trunk/tao/examples/GeWangExamples/GeWangExamples.Readme.txt (from rev
67651, trunk/tao/examples/GeWangExamples/GeWang.Readme.txt)
Copied: trunk/tao/examples/GeWangExamples/GeWangExamples.cs (from rev 67651,
trunk/tao/examples/GeWangExamples/GeWang.cs)
Copied: trunk/tao/examples/GeWangExamples/GeWangExamples.resx (from rev 67651,
trunk/tao/examples/GeWangExamples/GeWang.resx)
Modified: trunk/tao/src/Tao.OpenGl/prebuild.xml
===================================================================
--- trunk/tao/src/Tao.OpenGl/prebuild.xml 2006-11-09 23:29:41 UTC (rev
67651)
+++ trunk/tao/src/Tao.OpenGl/prebuild.xml 2006-11-09 23:36:46 UTC (rev
67652)
@@ -249,14 +249,14 @@
<Match path="." pattern="*.cs" recurse="true"/>
</Files>
</Project>
- <Project name="GeWang" path="../../examples/GeWang" language="C#"
type="WinExe" startupObject="GeWang.Program" designerFolder="Properties">
+ <Project name="GeWangExamples" path="../../examples/GeWangExamples"
language="C#" type="WinExe" startupObject="GeWangExamples.Program"
designerFolder="Properties">
<Configuration name="Debug">
<Options>
<CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
<OptimizeCode>false</OptimizeCode>
<AllowUnsafe>false</AllowUnsafe>
<OutputPath>bin/Debug</OutputPath>
- <KeyFile>../../../src/Tao.OpenGl/Tao.OpenGl.snk</KeyFile>
+ <KeyFile>../../src/Tao.OpenGl/Tao.OpenGl.snk</KeyFile>
<DebugInformation>true</DebugInformation>
</Options>
</Configuration>
@@ -266,24 +266,24 @@
<OptimizeCode>true</OptimizeCode>
<AllowUnsafe>false</AllowUnsafe>
<OutputPath>bin/Release</OutputPath>
- <KeyFile>../../../src/Tao.OpenGl/Tao.OpenGl.snk</KeyFile>
+ <KeyFile>../../src/Tao.OpenGl/Tao.OpenGl.snk</KeyFile>
<DebugInformation>false</DebugInformation>
</Options>
</Configuration>
<Reference name="System" />
<Reference name="System.Windows.Forms" />
<Reference name="System.Data" />
- <Reference name="SystemDrawing" />
+ <Reference name="System.Drawing" />
<Reference name="Tao.FreeGlut" localCopy="true" />
<Reference name="Tao.OpenGl" localCopy="true" />
<Files>
- <File subType="Form" resourceName="GeWang">GeWang.cs</File>
+ <File subType="Form"
resourceName="GeWangExamples">GeWangExamples.cs</File>
<Match path="." pattern="*.cs" recurse="true">
- <Exclude name="GeWang.cs"/>
+ <Exclude name="GeWangExamples.cs"/>
</Match>
</Files>
</Project>
- <Project name="GlfwExamples" path="../../examples/Glfw" language="C#"
type="WinExe" startupObject="GlfwExamples.Program" designerFolder="Properties">
+ <Project name="GlfwExamples" path="../../examples/GlfwExamples"
language="C#" type="WinExe" startupObject="GlfwExamples.Program"
designerFolder="Properties">
<Configuration name="Debug">
<Options>
<CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
@@ -307,7 +307,7 @@
<Reference name="System" />
<Reference name="System.Windows.Forms" />
<Reference name="System.Data" />
- <Reference name="SystemDrawing" />
+ <Reference name="System.Drawing" />
<Reference name="Tao.Glfw" localCopy="true" />
<Reference name="Tao.OpenGl" localCopy="true" />
<Files>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches