Menu
▾
▴
csdopenglnet-cvs — CVS Update Information
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(79) |
Aug
(69) |
Sep
(120) |
Oct
(17) |
Nov
(7) |
Dec
|
|---|
|
From: Kai R. <kre...@us...> - 2004-11-05 17:36:08
|
Update of /cvsroot/csdopenglnet/csdOpenGL/math In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15420/math Modified Files: F3Matrix.cs F4Matrix.cs Added Files: MathTest.cs Log Message: Index: F4Matrix.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/math/F4Matrix.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** F4Matrix.cs 12 Jul 2004 17:17:23 -0000 1.1.1.1 --- F4Matrix.cs 5 Nov 2004 17:35:58 -0000 1.2 *************** *** 11,15 **** using System; - using System.Diagnostics; using System.Globalization; --- 11,14 ---- *************** *** 125,129 **** // F4Matrix(s) have constand dimension => // no check is needed - Debug.WriteLine( "F4Matrix.Mult()" ); for( short i=3; i>=0; i--){ for( short j=3; j>=0; j--){ --- 124,127 ---- --- NEW FILE: MathTest.cs --- using System; using csDragons.OpenGL.Math; public class MathTest{ public static void Main( string[] args ) { F3Matrix f3m = new F3Matrix(); Console.WriteLine( f3m.ToString() ) ; } } Index: F3Matrix.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/math/F3Matrix.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** F3Matrix.cs 12 Jul 2004 17:17:23 -0000 1.1.1.1 --- F3Matrix.cs 5 Nov 2004 17:35:58 -0000 1.2 *************** *** 11,15 **** using System; - using System.Diagnostics; using System.Globalization; --- 11,14 ---- *************** *** 126,130 **** // F3Matrix(s) have constand dimension => // no check is needed - Debug.WriteLine( "F3Matrix.Mult()" ); for( short i=2; i>=0; i--){ for( short j=2; j>=0; j--){ --- 125,128 ---- |
|
From: Tim R. <ti...@us...> - 2004-11-05 15:45:57
|
Update of /cvsroot/csdopenglnet/csdOpenGL/generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20295/generator Modified Files: define.cs function.cs generator.cs typedef.cs Log Message: Kai forced me to remove the Debug-calls Index: typedef.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/typedef.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** typedef.cs 19 Sep 2004 18:51:03 -0000 1.7 --- typedef.cs 5 Nov 2004 15:45:37 -0000 1.8 *************** *** 1,5 **** using System; using System.Collections; - using System.Diagnostics; using System.IO; using System.Xml; --- 1,4 ---- *************** *** 38,44 **** */ public TypeDef( StreamWriter w, bool _quiet ) { - Debug.Indent(); - Debug.WriteLine( "Entering TypeDef.Define(StreamWriter)" ); - quiet = _quiet; writer = w; --- 37,40 ---- *************** *** 58,65 **** tList.Add( "double", "double" ); tList.Add( "long", "long" ); - - - Debug.WriteLine( "Exiting TypeDef.Define(StreamWriter)" ); - Debug.Unindent(); } --- 54,57 ---- *************** *** 169,173 **** tList.Add( n, n ); } catch (Exception e ) { ! Debug.WriteLine( e.ToString() ); } --- 161,166 ---- tList.Add( n, n ); } catch (Exception e ) { ! Console.Write( "TypeDef.addCallBack( "+param+", "+name+", "+c.ToString()+" ) #163: "); ! Console.WriteLine( e.ToString() ); } *************** *** 175,179 **** dList.Add( n, ret+" "+n+"( " + par + ")" ); } catch (Exception e ) { ! Debug.WriteLine( e.ToString() ); } } --- 168,173 ---- dList.Add( n, ret+" "+n+"( " + par + ")" ); } catch (Exception e ) { ! Console.Write( "TypeDef.addCallBack( "+param+", "+name+", "+c.ToString()+" ) #170: "); ! Console.WriteLine( e.ToString() ); } } *************** *** 220,226 **** */ public void write() { - Debug.Indent(); - Debug.WriteLine( "Entering TypeDef.write()" ); - Console.WriteLine( "Writing delegates" ); --- 214,217 ---- *************** *** 237,244 **** writer.Write( ";\n" ); } - - - Debug.WriteLine( "Exiting TypeDef.write()" ); - Debug.Unindent(); } --- 228,231 ---- *************** *** 249,255 **** */ public void add( string entry ) { - Debug.Indent(); - Debug.WriteLine( "Entering TypeDef.add(string)" ); - XmlDocument doc = new XmlDocument(); doc.LoadXml( entry ); // bringt entry into xml structure --- 236,239 ---- *************** *** 278,287 **** tList.Add( n, t ); // add typedef to list } catch (Exception e) { - Debug.WriteLine( e.ToString() ); } } - - Debug.WriteLine( "Exiting TypeDef.add(string)" ); - Debug.Unindent(); } --- 262,267 ---- Index: function.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/function.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** function.cs 19 Sep 2004 18:51:03 -0000 1.9 --- function.cs 5 Nov 2004 15:45:37 -0000 1.10 *************** *** 1,5 **** using System; using System.Collections; - using System.Diagnostics; using System.IO; using System.Xml; --- 1,4 ---- *************** *** 60,66 **** */ public Function( StreamWriter w, TypeDef t, string df, string da, string l, ArrayList _ignoreFunctions, bool _quiet ) { - Debug.Indent(); - Debug.WriteLine( "Entering Function.Function(StreamWriter)" ); - quiet = _quiet; dllFlags = df; --- 59,62 ---- *************** *** 88,94 **** listWrap = new ArrayList(); attrList = new SortedList(); - - Debug.WriteLine( "Exiting Function.Function(StreamWriter)" ); - Debug.Unindent(); } --- 84,87 ---- *************** *** 149,155 **** */ public void add( string entry ) { - Debug.Indent(); - Debug.WriteLine( "Entering Function.add(string)" ); - string t=""; string n=""; --- 142,145 ---- *************** *** 196,202 **** Console.WriteLine( n ); } - - Debug.WriteLine( "Exiting Function.add(string)" ); - Debug.Unindent(); } --- 186,189 ---- *************** *** 218,224 **** */ public void process() { - Debug.Indent(); - Debug.WriteLine( "Entering Function.process()" ); - Console.WriteLine( "Preparing Function statements" ); --- 205,208 ---- *************** *** 258,265 **** removeIntPtr( fs2 ); } - - Debug.WriteLine( "Exiting Function.process()" ); - Debug.Unindent(); - } --- 242,245 ---- *************** *** 311,317 **** */ public void write() { - Debug.Indent(); - Debug.WriteLine( "Entering Functions.write()" ); - IDictionaryEnumerator s = attrList.GetEnumerator(); while ( s.MoveNext() ) { --- 291,294 ---- *************** *** 410,416 **** } - - Debug.WriteLine( "Exiting Functions.write()" ); - Debug.Unindent(); } --- 387,390 ---- Index: define.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/define.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** define.cs 19 Sep 2004 18:51:03 -0000 1.2 --- define.cs 5 Nov 2004 15:45:37 -0000 1.3 *************** *** 35,47 **** */ public Define( StreamWriter w, bool _quiet ) { - Debug.Indent(); - Debug.WriteLine( "Entering Define.Define(StreamWriter)" ); - quiet = _quiet; writer = w; list = new SortedList( System.Collections.Comparer.Default ); - - Debug.WriteLine( "Exiting Define.Define(StreamWriter)" ); - Debug.Unindent(); } --- 35,41 ---- *************** *** 52,58 **** */ public void process() { - Debug.Indent(); - Debug.WriteLine( "Entering Define.process()" ); - Console.WriteLine( "Preparing define statements" ); --- 46,49 ---- *************** *** 83,89 **** } } - - Debug.WriteLine( "Exiting Define.process()" ); - Debug.Unindent(); } --- 74,77 ---- *************** *** 139,145 **** */ public void write() { - Debug.Indent(); - Debug.WriteLine( "Entering Define.write()" ); - Console.WriteLine( "Writing define statements" ); --- 127,130 ---- *************** *** 156,162 **** writer.Write( ";\n" ); } - - Debug.WriteLine( "Exiting Define.write()" ); - Debug.Unindent(); } --- 141,144 ---- *************** *** 167,173 **** */ public void add( string entry ) { - Debug.Indent(); - Debug.WriteLine( "Entering Define.add(string)" ); - string n = ""; string i = ""; --- 149,152 ---- *************** *** 199,205 **** } } - - Debug.WriteLine( "Exiting Define.add(string)" ); - Debug.Unindent(); } --- 178,181 ---- Index: generator.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/generator.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** generator.cs 19 Sep 2004 18:51:03 -0000 1.10 --- generator.cs 5 Nov 2004 15:45:37 -0000 1.11 *************** *** 1,5 **** using System; using System.Collections; - using System.Diagnostics; using System.IO; using System.Xml; --- 1,4 ---- *************** *** 51,64 **** */ public Generator( string[] args ) { - Debug.Indent(); - Debug.WriteLine( "Entering Generator.Generator(string[])" ); - if (args.Length==1) { if (args[0] == "--createConfig") { ! Debug.WriteLine( "Writing sample configuration" ); config = new Configuration(); saveConfig( "generator.xml" ); } else { ! Debug.WriteLine( "Loading Configuration" ); loadConfig( args[0] ); createClass(); --- 50,60 ---- */ public Generator( string[] args ) { if (args.Length==1) { if (args[0] == "--createConfig") { ! Console.WriteLine( "Writing sample configuration..." ); config = new Configuration(); saveConfig( "generator.xml" ); } else { ! Console.WriteLine( "Loading Configuration..." ); loadConfig( args[0] ); createClass(); *************** *** 67,78 **** if ( (args[0] == "-q") || (args[0]=="--quiet") ) { quiet = true; ! Debug.WriteLine( "Loading Configuration" ); loadConfig( args[1] ); createClass(); } } - - Debug.WriteLine( "Exiting Generator.Generator(string[])" ); - Debug.Unindent(); } --- 63,71 ---- if ( (args[0] == "-q") || (args[0]=="--quiet") ) { quiet = true; ! Console.WriteLine( "Loading Configuration..." ); loadConfig( args[1] ); createClass(); } } } *************** *** 82,88 **** */ protected void createClass() { - Debug.Indent(); - Debug.WriteLine( "Entering Generator.createClass()" ); - FileStream fs = new FileStream( config.outputFile, FileMode.Create, FileAccess.Write ); // Open or create file with write access writer = new StreamWriter( fs ); // bind stream to file --- 75,78 ---- *************** *** 96,108 **** try { - Debug.WriteLine( "Initializing XmlTestReader" ); reader = new XmlTextReader( config.xmlInput ); } catch (Exception e) { ! Debug.WriteLine( "***** " + e.ToString() ); ! Console.WriteLine( "Error Opening inputfile '"+config.xmlInput+"'" ); } if ( (reader!=null) && (reader.ReadState!=ReadState.Error) && (reader.ReadState!=ReadState.Closed) ) { - Debug.WriteLine( "Creating Class" ); compile(); } --- 86,96 ---- try { reader = new XmlTextReader( config.xmlInput ); } catch (Exception e) { ! Console.Write( "Generator.createClass() #90: "); ! Console.WriteLine( e.ToString() ); } if ( (reader!=null) && (reader.ReadState!=ReadState.Error) && (reader.ReadState!=ReadState.Closed) ) { compile(); } *************** *** 110,116 **** writeFooter(); // write file footer writer.Close(); // close stream - - Debug.WriteLine( "Exiting Generator.createClass()" ); - Debug.Unindent(); } --- 98,101 ---- *************** *** 118,131 **** for ( int i=0; i<config.typedefFiles.Count; i++ ) { try { - Debug.WriteLine( "Initializing XmlTestReader" ); reader = new XmlTextReader( (string)config.typedefFiles[i] ); } catch (Exception e) { ! Debug.WriteLine( "***** " + e.ToString() ); Console.WriteLine( "Error Opening inputfile '"+(string)config.typedefFiles[i]+"'" ); } if ( (reader!=null) && (reader.ReadState!=ReadState.Error) && (reader.ReadState!=ReadState.Closed) ) { - Debug.WriteLine( "Loading typdef statements" ); - Console.Write( "Loading typedef statements in " ); Console.WriteLine( (string)config.typedefFiles[i] ); --- 103,114 ---- for ( int i=0; i<config.typedefFiles.Count; i++ ) { try { reader = new XmlTextReader( (string)config.typedefFiles[i] ); } catch (Exception e) { ! Console.Write( "Generator.loadTypeDefs() #107: "); ! Console.WriteLine( e.ToString() ); Console.WriteLine( "Error Opening inputfile '"+(string)config.typedefFiles[i]+"'" ); } if ( (reader!=null) && (reader.ReadState!=ReadState.Error) && (reader.ReadState!=ReadState.Closed) ) { Console.Write( "Loading typedef statements in " ); Console.WriteLine( (string)config.typedefFiles[i] ); *************** *** 145,149 **** } } catch (Exception e) { ! Debug.WriteLine( "***** " + e.ToString() ); Console.WriteLine( "Error Opening inputfile '"+(string)config.typedefFiles[i]+"'" ); } --- 128,133 ---- } } catch (Exception e) { ! Console.Write( "Generator.loadTypeDefs() #130: "); ! Console.WriteLine( e.ToString() ); Console.WriteLine( "Error Opening inputfile '"+(string)config.typedefFiles[i]+"'" ); } *************** *** 161,167 **** */ protected void compile() { - Debug.Indent(); - Debug.WriteLine( "Entering Generator.compile()" ); - Console.WriteLine( "Parsing Entries..." ); --- 145,148 ---- *************** *** 201,207 **** function.write(); // write functions } - - Debug.WriteLine( "Exiting Generater.compile()" ); - Debug.Unindent(); } --- 182,185 ---- *************** *** 211,217 **** */ protected void writeHeader() { - Debug.Indent(); - Debug.WriteLine( "Entering Generator.writeHeader(StreamWriter)" ); - // default usings writer.WriteLine( config.Header ); --- 189,192 ---- *************** *** 233,239 **** writer.Write( config.upperClass ); writer.WriteLine( " {" ); - - Debug.WriteLine( "Exiting Generator.writeHeader(StreamWriter)" ); - Debug.Unindent(); } --- 208,211 ---- *************** *** 244,262 **** */ protected void writeFooter() { - Debug.Indent(); - Debug.WriteLine( "Entering Generator.writeFooter(StreamWriter)" ); - writer.WriteLine( "}" ); // class footer if (config.Namespace.Trim()!="") writer.WriteLine( "}" ); writer.WriteLine( config.Footer ); - - Debug.WriteLine( "Exiting Generator.writeFooter(StreamWriter)" ); - Debug.Unindent(); } protected void saveConfig( string file ) { - Debug.Indent(); - Debug.WriteLine( "Entering Generator.saveConfig()" ); - try { // try, because of I/O-failure. XmlSerializer serializer = new XmlSerializer( typeof(Configuration) ); // initializing serializer object --- 216,225 ---- *************** *** 265,279 **** writer.Close(); } catch (Exception e) { ! Debug.WriteLine( e.Message ); } - - Debug.WriteLine( "Exiting Generator.saveConfig()" ); - Debug.Unindent(); } protected void loadConfig( string fileName ) { - Debug.Indent(); - Debug.WriteLine( "Entering Configuration.loadConfig()" ); - try { // try, because of I/O-failure XmlSerializer serializer = new XmlSerializer( typeof(Configuration) ); // initialize seriaizer object --- 228,237 ---- writer.Close(); } catch (Exception e) { ! Console.Write( "Generator.saveConfig( "+file+" ) #230: "); ! Console.WriteLine( e.ToString() ); } } protected void loadConfig( string fileName ) { try { // try, because of I/O-failure XmlSerializer serializer = new XmlSerializer( typeof(Configuration) ); // initialize seriaizer object *************** *** 282,290 **** stream.Close(); } catch (Exception e) { ! Debug.WriteLine( e.Message ); } - - Debug.WriteLine( "Exiting Configuration.loadConfig()" ); - Debug.Unindent(); } --- 240,246 ---- stream.Close(); } catch (Exception e) { ! Console.Write( "Generator.loadConfig( "+fileName+" ) #242: "); ! Console.WriteLine( e.ToString() ); } } *************** *** 295,300 **** */ public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; new Generator(args); } --- 251,254 ---- |
|
From: Tim R. <ti...@us...> - 2004-11-05 15:45:57
|
Update of /cvsroot/csdopenglnet/csdOpenGL/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20295/samples Modified Files: gears.cs gtkAdvanced.cs gtkFrame.cs gtkGears.cs gtkTexture.cs gtkTriangle.cs gtkWidget.cs Log Message: Kai forced me to remove the Debug-calls Index: gtkAdvanced.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkAdvanced.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** gtkAdvanced.cs 11 Sep 2004 08:39:28 -0000 1.12 --- gtkAdvanced.cs 5 Nov 2004 15:45:37 -0000 1.13 *************** *** 6,10 **** using GtkSharp; using System; - using System.Diagnostics; public class GtkAdvanced : GL { --- 6,9 ---- *************** *** 30,40 **** public GtkAdvanced() { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvaned()" ); - - Debug.WriteLine( "Init Application" ); Application.Init(); - Debug.WriteLine( "Init Window" ); window = new Gtk.Window( "Gtk Frame" ); window.ReallocateRedraws = true; --- 29,34 ---- *************** *** 42,46 **** window.Resize( 640, 480 ); - Debug.WriteLine( "Init GtkGLArea" ); glarea = new GtkGLArea(); glarea.Events = Gdk.EventMask.PointerMotionMask | Gdk.EventMask.ButtonPressMask | Gdk.EventMask.ButtonReleaseMask; --- 36,39 ---- *************** *** 54,68 **** glarea.ButtonPressEvent += new ButtonPressEventHandler( OnButtonPress ); - Debug.WriteLine( "Init rotation entry fields" ); rotX_entry = new Entry(); rotX_entry.ActivatesDefault = true; rotY_entry = new Entry(); rotY_entry.ActivatesDefault = true; rotZ_entry = new Entry(); rotZ_entry.ActivatesDefault = true; - Debug.WriteLine( "Init speed entry fields" ); speedX_entry = new Entry(); speedX_entry.ActivatesDefault = true; speedY_entry = new Entry(); speedY_entry.ActivatesDefault = true; speedZ_entry = new Entry(); speedZ_entry.ActivatesDefault = true; - Debug.WriteLine( "Init Table-Layout rotTable" ); Table rotTable = new Table( 2, 3, false ); rotTable.Attach( new Label( "x-rotation: " ), 0, 1, 0, 1 ); --- 47,58 ---- *************** *** 73,77 **** rotTable.Attach( rotZ_entry, 1, 2, 2, 3 ); - Debug.WriteLine( "Init Table-Layout speedTable" ); Table speedTable = new Table( 2, 3, false ); speedTable.Attach( new Label( "x-speed: " ), 0, 1, 0, 1 ); --- 63,66 ---- *************** *** 82,86 **** speedTable.Attach( speedZ_entry, 1, 2, 2, 3 ); - Debug.WriteLine( "Init buttons" ); animate_tglbtn = new ToggleButton( "Animate" ); animate_tglbtn.Toggled += new EventHandler( OnButton ); --- 71,74 ---- *************** *** 93,97 **** window.Default = update_btn; - Debug.WriteLine( "Init Table-Layout buttonTable" ); Table buttonTable = new Table( 3, 1, true ); buttonTable.Attach( animate_tglbtn, 0, 1, 0, 1 ); --- 81,84 ---- *************** *** 99,103 **** buttonTable.Attach( update_btn, 0, 1, 2, 3 ); - Debug.WriteLine( "Init HBox-Layout hbox" ); HBox hbox = new HBox( false, 4 ); hbox.PackStart( rotTable, false, true, 5 ); --- 86,89 ---- *************** *** 105,114 **** hbox.PackEnd( buttonTable, false, true, 5 ); - Debug.WriteLine( "Init VBox-Layout vbox" ); VBox vbox = new VBox( false, 2 ); vbox.PackStart( glarea, true, true, 5 ); vbox.PackEnd( hbox, false, true, 5 ); - Debug.WriteLine( "Display Window" ); window.Add( vbox ); window.ShowAll(); --- 91,98 ---- *************** *** 116,135 **** setDefaults(); - Debug.WriteLine( "MainLoop" ); Application.Run (); - - Debug.WriteLine( "Exiting GtkAdvaned()" ); - Debug.Unindent(); - } protected void updateValues() { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.updateValues()" ); - bool p = animate; animate = false; - Debug.WriteLine( "Setting speed" ); try { speedX = System.Convert.ToSingle( speedX_entry.Text ); --- 100,110 ---- *************** *** 148,152 **** } - Debug.WriteLine( "Setting angle" ); try { rotX = System.Convert.ToSingle( rotX_entry.Text ); --- 123,126 ---- *************** *** 166,177 **** animate = p; - Debug.WriteLine( "Exiting GtkAdvanced.updateValues()" ); - Debug.Unindent(); } protected void setDefaults() { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.setDefaults()" ); - animate = false; rotX = 0.0f; --- 140,146 ---- *************** *** 181,228 **** speedY = 0.2f; speedZ = 0.5f; - - Debug.WriteLine( "Exiting GtkAdvanced.setDefaults()" ); - Debug.Unindent(); } protected bool Animate () { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.Animate()" ); - rotX += speedX; rotY += speedY; rotZ += speedZ; if ( (glarea!=null) && (!stop) ) glarea.QueueDraw (); - - Debug.WriteLine( "Entering GtkAdvanced.Animate() *" ); - Debug.Unindent(); - return animate; } protected void OnMap (object obj, MapEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Enering GtkAdvanced.OnMap( object, MapEventArgs )" ); - stop = false; - - Debug.WriteLine( "Exiting GtkAdvanced.OnMap( object, MapEventArgs )" ); - Debug.Unindent(); } protected void OnUnmap (object obj, UnmapEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Enering GtkAdvanced.OnUnmap( object, UnapEventArgs )" ); - stop = true; - - Debug.WriteLine( "Exiting GtkAdvanced.OnUnmap( object, UnapEventArgs )" ); - Debug.Unindent(); } protected virtual void OnExpose (object obj, ExposeEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnExpose( object, ExposeEventArgs )" ); - if (glarea.MakeCurrent()) { glClearColor( 0, 0, 0, 0 ); --- 150,172 ---- *************** *** 242,255 **** glarea.SwapBuffers(); ! } else Debug.WriteLine( "MakeCurrent() failed" ); ! ! Debug.WriteLine( "Exiting GtkAdvanced.OnExpose( object, ExposeEventArgs )" ); ! Debug.Unindent(); } protected void OnMotionNotify( object obj, MotionNotifyEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnMotionNotify( object, MotionNotifyEventArgs )" ); - if ( (args.Event.State==Gdk.ModifierType.Button1Mask) || (args.Event.State==Gdk.ModifierType.Button3Mask) ) { int w = 0; --- 186,193 ---- glarea.SwapBuffers(); ! } } protected void OnMotionNotify( object obj, MotionNotifyEventArgs args) { if ( (args.Event.State==Gdk.ModifierType.Button1Mask) || (args.Event.State==Gdk.ModifierType.Button3Mask) ) { int w = 0; *************** *** 259,267 **** if ( args.Event.State==Gdk.ModifierType.Button1Mask ) { if ( mouseX>=0.0 ) { - Debug.WriteLine( "y-rotation" ); rotY += ((float)(args.Event.X-mouseX)) * 360.0f / w; } else mouseX = args.Event.X; if ( mouseY>=0.0 ) { - Debug.WriteLine( "x-rotation" ); rotX += ((float)(args.Event.Y-mouseY)) * 360.0f / h; mouseY = args.Event.Y; --- 197,203 ---- *************** *** 271,275 **** if ( args.Event.State==Gdk.ModifierType.Button3Mask ) { if ( mouseX>=0.0 ) { - Debug.WriteLine( "y-rotation" ); rotZ += ((float)(args.Event.X-mouseX)) * 360.0f / w; } else mouseX = args.Event.X; --- 207,210 ---- *************** *** 279,313 **** } - - Debug.WriteLine( "Exiting GtkAdvanced.OnMotionNotify( object, MotionNotifyEventArgs )" ); - Debug.Unindent(); } protected void OnButtonPress( object obj, ButtonPressEventArgs args ) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnButtonPress( object, ButtonPressEventArgs )" ); - mouseX = args.Event.X; mouseY = args.Event.Y; - - Debug.WriteLine( "Exiting GtkAdvanced.OnButtonPress( object, ButtonPressEventArgs )" ); - Debug.Unindent(); } protected void OnButtonRelease( object obj, ButtonReleaseEventArgs args ) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnButtonRelease( object, ButtonReleaseEventArgs )" ); - mouseX = -1.0; mouseY = -1.0; - - Debug.WriteLine( "Exiting GtkAdvanced.OnButtonRelease( object, ButtonReleaseEventArgs )" ); - Debug.Unindent(); } protected virtual void draw() { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.draw()" ); - if (glarea.MakeCurrent()) { glTranslatef( -0.5f, -0.5f, 0.0f ); --- 214,230 ---- *************** *** 320,333 **** glVertex2f( 1.0f, 0.0f); glEnd(); ! } else Debug.WriteLine( "MakeCurrent() failed!" ); ! ! Debug.WriteLine( "Exiting GtkAdvanced.draw()" ); ! Debug.Unindent(); ! } protected virtual void OnConfigure (object obj, ConfigureEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnConfigure( object, ConfigureEventArgs )" ); - if (glarea.MakeCurrent()) { glViewport(0, 0, glarea.Allocation.Width, glarea.Allocation.Height); --- 237,244 ---- glVertex2f( 1.0f, 0.0f); glEnd(); ! } ! } protected virtual void OnConfigure (object obj, ConfigureEventArgs args) { if (glarea.MakeCurrent()) { glViewport(0, 0, glarea.Allocation.Width, glarea.Allocation.Height); *************** *** 339,352 **** glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); ! } else Debug.WriteLine( "MakeCurrent() failed" ); ! ! Debug.WriteLine( "Exiting GtkAdvanced.OnConfigure( object, ConfigureEventArgs )" ); ! Debug.Unindent(); } protected void OnRealized (object obj, EventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnRealized( object, EventArgs )" ); - if (glarea.MakeCurrent()) { glShadeModel( GL_SMOOTH ); --- 250,257 ---- glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); ! } } protected void OnRealized (object obj, EventArgs args) { if (glarea.MakeCurrent()) { glShadeModel( GL_SMOOTH ); *************** *** 357,370 **** glDepthFunc( GL_LEQUAL ); glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ); ! } else Debug.WriteLine( "MakeCurrent() failed" ); ! ! Debug.WriteLine( "Exiting GtkAdvanced.OnRealized( object, EventArgs )" ); ! Debug.Unindent(); } protected void OnButton( object obj, EventArgs args ) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnButton( objec, EventArgs )" ); - if (obj==reset_btn) { setDefaults(); --- 262,269 ---- glDepthFunc( GL_LEQUAL ); glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ); ! } } protected void OnButton( object obj, EventArgs args ) { if (obj==reset_btn) { setDefaults(); *************** *** 374,396 **** updateValues(); } - - Debug.WriteLine( "Exiting GtkAdvanced.OnButton( objec, EventArgs )" ); - Debug.Unindent(); } protected void OnDeleteEvent (object obj, DeleteEventArgs args) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkAdvanced.OnDeleteEvent( object, DeleteEventArgs )" ); - Application.Quit (); - - Debug.WriteLine( "Exiting GtkAdvanced.OnDeleteEvent( object, DeleteEventArgs )" ); - Debug.Unindent(); } protected float rotX { ! get { Debug.WriteLine( "rotX->get" ); return propRotX; } set { - Debug.WriteLine( "rotX->set" ); propRotX = value; while (propRotX<0) propRotX += 360.0f; --- 273,285 ---- updateValues(); } } protected void OnDeleteEvent (object obj, DeleteEventArgs args) { Application.Quit (); } protected float rotX { ! get { return propRotX; } set { propRotX = value; while (propRotX<0) propRotX += 360.0f; *************** *** 402,408 **** protected float rotY { ! get { Debug.WriteLine( "rotY->get" ); return propRotY; } set { - Debug.WriteLine( "rotY->set" ); propRotY = value; while (propRotY<0) propRotY += 360.0f; --- 291,296 ---- protected float rotY { ! get { return propRotY; } set { propRotY = value; while (propRotY<0) propRotY += 360.0f; *************** *** 414,420 **** protected float rotZ { ! get { Debug.WriteLine( "rotZ->get" ); return propRotZ; } set { - Debug.WriteLine( "rotZ->set" ); propRotZ = value; while (propRotZ<0) propRotZ += 360.0f; --- 302,307 ---- protected float rotZ { ! get {return propRotZ; } set { propRotZ = value; while (propRotZ<0) propRotZ += 360.0f; *************** *** 426,432 **** protected float speedX { ! get { Debug.WriteLine( "speedX->get" ); return propSpeedX; } set { - Debug.WriteLine( "speedX->set" ); propSpeedX = value; while (propSpeedX<=-360.0f) propSpeedX += 360.0f; --- 313,318 ---- protected float speedX { ! get { return propSpeedX; } set { propSpeedX = value; while (propSpeedX<=-360.0f) propSpeedX += 360.0f; *************** *** 437,443 **** protected float speedY { ! get { Debug.WriteLine( "speedY->get" ); return propSpeedY; } set { - Debug.WriteLine( "speedY->set" ); propSpeedY = value; while (propSpeedY<=-360.0f) propSpeedY += 360.0f; --- 323,328 ---- protected float speedY { ! get { return propSpeedY; } set { propSpeedY = value; while (propSpeedY<=-360.0f) propSpeedY += 360.0f; *************** *** 448,454 **** protected float speedZ { ! get { Debug.WriteLine( "speedZ->get" ); return propSpeedZ; } set { - Debug.WriteLine( "speedZ->set" ); propSpeedZ = value; while (propSpeedZ<=-360.0f) propSpeedZ += 360.0f; --- 333,338 ---- protected float speedZ { ! get { return propSpeedZ; } set { propSpeedZ = value; while (propSpeedZ<=-360.0f) propSpeedZ += 360.0f; *************** *** 459,465 **** protected bool animate { ! get { Debug.WriteLine( "animate->get" ); return propAnimate; } set { - Debug.WriteLine( "animate->set" ); if ( value && !propAnimate ) GLib.Idle.Add (new IdleHandler (Animate)); propAnimate = value; --- 343,348 ---- protected bool animate { ! get { return propAnimate; } set { if ( value && !propAnimate ) GLib.Idle.Add (new IdleHandler (Animate)); propAnimate = value; *************** *** 471,476 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkAdvanced gl = new GtkAdvanced(); } --- 354,357 ---- Index: gears.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gears.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gears.cs 20 Oct 2004 09:12:14 -0000 1.9 --- gears.cs 5 Nov 2004 15:45:37 -0000 1.10 *************** *** 1,5 **** using csDragons.OpenGL; using System; - using System.Diagnostics; public class Gears : GL { --- 1,4 ---- *************** *** 14,30 **** public Gears() { - Debug.Indent(); - Debug.WriteLine( "Entering Gears() "); - - Debug.WriteLine( "Initializiing GLUT" ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); glutInitWindowSize( 480, 480 ); glutCreateWindow("Gears"); - Debug.WriteLine( "Initialzing GL" ); initGL(); - Debug.WriteLine( "Initializing GLUT-CallBacks" ); - glutDisplayFunc( new cb0_glutDisplayFunc( draw ) ); glutKeyboardFunc( new cb0_glutKeyboardFunc( keyboard ) ); --- 13,22 ---- *************** *** 33,47 **** glutVisibilityFunc( new cb0_glutVisibilityFunc( visible ) ); - Debug.WriteLine( "Starting Main Loop" ); glutMainLoop(); - - Debug.WriteLine( "Exiting Gears() "); - Debug.Unindent(); } protected void visible( int state ) { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.visible(int)" ); - if ( state==GLUT_VISIBLE ) { glutIdleFunc( new cb0_glutIdleFunc( redraw ) ); --- 25,32 ---- *************** *** 49,55 **** glutIdleFunc( new cb0_glutIdleFunc( dummy ) ); } - - Debug.WriteLine( "Exiting Gears.visible(int)" ); - Debug.Unindent(); } --- 34,37 ---- *************** *** 58,76 **** protected void redraw() { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.redraw() "); - rotAng += 0.5f; glutPostRedisplay(); - - Debug.WriteLine( "Exiting Gears.redraw() "); - Debug.Unindent(); } protected void initGL() { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.initGL() "); - - Debug.WriteLine( "Set defaults "); float[] pos = { 5.0f, 5.0f, 10.0f, 0.0f }; float[] red = { 0.8f, 0.1f, 0.0f, 1.0f }; --- 40,48 ---- *************** *** 90,94 **** /* gears */ - Debug.WriteLine( "Define Gears "); gear1 = glGenLists( 1 ); glNewList( gear1, GL_COMPILE ); --- 62,65 ---- *************** *** 110,123 **** glEnable( GL_NORMALIZE ); - - Debug.WriteLine( "Exiting Gears.initGL() "); - Debug.Unindent(); - } protected void reshape( int width, int height ) { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.reshape(int,int) "); - if (height==0) height = 1; // prevent division by zero float h = ((float)height) / ((float)width); --- 81,87 ---- *************** *** 131,143 **** glLoadIdentity(); glTranslatef( 0.0f, 0.0f, -40.0f ); - - Debug.WriteLine( "Exiting Gears.reshape(int,int) "); - Debug.Unindent(); } protected void draw() { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.draw() "); - glClear ( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); --- 95,101 ---- *************** *** 168,180 **** glutSwapBuffers(); - - Debug.WriteLine( "Exiting Gears.draw() "); - Debug.Unindent(); } protected void gear( double inner_radius, double outer_radius, double width, int teeth, double tooth_depth ) { - Debug.Indent(); - Debug.WriteLine( "Entering Gears.gear(double,double.double,int,double) "); - int i; double r0, r1, r2, angle, da, u, v, len; --- 126,132 ---- *************** *** 285,291 **** } glEnd(); - - Debug.WriteLine( "Exiting Gears.gear(double,double.double,int,double) "); - Debug.Unindent(); } --- 237,240 ---- *************** *** 295,300 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; new Gears(); } --- 244,247 ---- Index: gtkTriangle.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkTriangle.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gtkTriangle.cs 11 Sep 2004 08:39:28 -0000 1.3 --- gtkTriangle.cs 5 Nov 2004 15:45:37 -0000 1.4 *************** *** 5,9 **** using GtkSharp; using System; - using System.Diagnostics; public class GtkTest : GL { --- 5,8 ---- *************** *** 14,29 **** public GtkTest() { - Debug.Indent(); - Debug.WriteLine( "Enering GtkTest()" ); - - Debug.WriteLine( "Init Application" ); Application.Init(); - Debug.WriteLine( "Init Window" ); Gtk.Window window = new Gtk.Window( "Gtk Triangle" ); window.ReallocateRedraws = true; window.DeleteEvent += new DeleteEventHandler( OnDeleteEvent ); - Debug.WriteLine( "Init GtkGLArea" ); glarea = new GtkGLArea(); glarea.Realized += new EventHandler (OnRealized); --- 13,22 ---- *************** *** 40,48 **** window.ShowAll (); - Debug.WriteLine( "MainLoop" ); Application.Run (); - - Debug.WriteLine( "Exiting GtkTest()" ); - Debug.Unindent(); } --- 33,37 ---- *************** *** 115,120 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkTest gl = new GtkTest(); } --- 104,107 ---- Index: gtkWidget.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkWidget.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gtkWidget.cs 11 Sep 2004 08:39:28 -0000 1.4 --- gtkWidget.cs 5 Nov 2004 15:45:37 -0000 1.5 *************** *** 5,10 **** using GtkSharp; using System; - using System.Diagnostics; - public class GtkTest : GL { --- 5,8 ---- *************** *** 15,30 **** public GtkTest() { - Debug.Indent(); - Debug.WriteLine( "Enering GtkTest()" ); - - Debug.WriteLine( "Init Application" ); Application.Init(); - Debug.WriteLine( "Init Window" ); Gtk.Window window = new Gtk.Window( "Gtk Triangle" ); window.ReallocateRedraws = true; window.DeleteEvent += new DeleteEventHandler( OnDeleteEvent ); - Debug.WriteLine( "Init GtkGLArea" ); glarea = new GtkGLArea(); glarea.Realized += new EventHandler (OnRealized); --- 13,22 ---- *************** *** 41,49 **** window.ShowAll (); - Debug.WriteLine( "MainLoop" ); Application.Run (); - - Debug.WriteLine( "Exiting GtkTest()" ); - Debug.Unindent(); } --- 33,37 ---- *************** *** 116,121 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkTest gl = new GtkTest(); } --- 104,107 ---- Index: gtkGears.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkGears.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gtkGears.cs 11 Sep 2004 08:39:28 -0000 1.5 --- gtkGears.cs 5 Nov 2004 15:45:37 -0000 1.6 *************** *** 5,9 **** using GtkSharp; using System; - using System.Diagnostics; public class GtkGears : GL { --- 5,8 ---- *************** *** 270,275 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkGears gl = new GtkGears(); } --- 269,272 ---- Index: gtkTexture.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkTexture.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gtkTexture.cs 11 Sep 2004 08:39:28 -0000 1.3 --- gtkTexture.cs 5 Nov 2004 15:45:37 -0000 1.4 *************** *** 5,9 **** using GtkSharp; using System; - using System.Diagnostics; public class GtkTest : GL { --- 5,8 ---- *************** *** 15,25 **** public GtkTest() { - Debug.Indent(); - Debug.WriteLine( "Enering GtkTest()" ); - - Debug.WriteLine( "Init Application" ); Application.Init(); - Debug.WriteLine( "Init Window" ); Gtk.Window window = new Gtk.Window( "Gtk Triangle" ); window.Resize( 480, 480 ); --- 14,19 ---- *************** *** 27,31 **** window.DeleteEvent += new DeleteEventHandler( OnDeleteEvent ); - Debug.WriteLine( "Init GtkGLArea" ); glarea = new GtkGLArea(); glarea.Realized += new EventHandler (OnRealized); --- 21,24 ---- *************** *** 42,50 **** window.ShowAll (); - Debug.WriteLine( "MainLoop" ); Application.Run (); - - Debug.WriteLine( "Exiting GtkTest()" ); - Debug.Unindent(); } --- 35,39 ---- *************** *** 160,165 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkTest gl = new GtkTest(); } --- 149,152 ---- Index: gtkFrame.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gtkFrame.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gtkFrame.cs 11 Sep 2004 08:39:28 -0000 1.9 --- gtkFrame.cs 5 Nov 2004 15:45:37 -0000 1.10 *************** *** 5,9 **** using GtkSharp; using System; - using System.Diagnostics; public class GtkFrame : GL { --- 5,8 ---- *************** *** 23,33 **** public GtkFrame() { - Debug.Indent(); - Debug.WriteLine( "Enering GtkFrame()" ); - - Debug.WriteLine( "Init Application" ); Application.Init(); - Debug.WriteLine( "Init Window" ); window = new Gtk.Window( "Gtk Frame" ); window.ReallocateRedraws = true; --- 22,27 ---- *************** *** 37,41 **** window.ShowAll(); - Debug.WriteLine( "Init GtkGLArea" ); glarea = new GtkGLArea(); glarea.Realized += new EventHandler (OnRealized); --- 31,34 ---- *************** *** 46,65 **** - Debug.WriteLine( "Init scaleRotX" ); scaleRotX = new VScale( 0.0, 359.9, 0.1 ); scaleRotX.ValuePos = PositionType.Bottom; scaleRotX.ValueChanged += new EventHandler( valueChanged ); - Debug.WriteLine( "Init scaleRotY" ); scaleRotY = new HScale( 0.0, 359.9, 0.1 ); scaleRotY.ValuePos = PositionType.Left; scaleRotY.ValueChanged += new EventHandler( valueChanged ); - Debug.WriteLine( "Init scaleRotZ" ); scaleRotZ = new VScale( 0.0, 359.5, 0.1 ); scaleRotZ.ValuePos = PositionType.Bottom; scaleRotZ.ValueChanged += new EventHandler( valueChanged ); - Debug.WriteLine( "Init HBox 1" ); HBox hbox1 = new HBox( false, 3 ); hbox1.PackStart( scaleRotX, false, true, 5 ); --- 39,54 ---- *************** *** 67,71 **** hbox1.PackEnd( scaleRotZ, false, true, 5 ); - Debug.WriteLine( "Init VBox 1" ); VBox vbox1 = new VBox( false, 2 ); vbox1.PackStart( hbox1, true, true, 5 ); --- 56,59 ---- *************** *** 75,83 **** window.ShowAll(); - Debug.WriteLine( "MainLoop" ); Application.Run (); - - Debug.WriteLine( "Exiting GtkFrame()" ); - Debug.Unindent(); } --- 63,67 ---- *************** *** 209,214 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; GtkFrame gl = new GtkFrame(); } --- 193,196 ---- |
|
From: Tim R. <ti...@us...> - 2004-11-05 15:45:57
|
Update of /cvsroot/csdopenglnet/csdOpenGL/platform/mono In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20295/platform/mono Modified Files: gtkArea.cs gtkContext.cs Log Message: Kai forced me to remove the Debug-calls Index: gtkContext.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/platform/mono/gtkContext.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gtkContext.cs 11 Sep 2004 08:10:42 -0000 1.1 --- gtkContext.cs 5 Nov 2004 15:45:37 -0000 1.2 *************** *** 5,9 **** using Gdk; using System; - using System.Diagnostics; using System.Runtime.InteropServices; --- 5,8 ---- *************** *** 60,139 **** public GdkGLContext() : this ( stdInitializer ) { - Debug.Indent(); - Debug.WriteLine( "Entering GdkGLContext()" ); - - Debug.WriteLine( "Exiting GdkGLContext()" ); - Debug.Unindent(); } public GdkGLContext( uint[] attributeList ) { - Debug.Indent(); - Debug.WriteLine( "Entering GdkGLContext(uint[])" ); // choose the visual based on attribute list - Debug.WriteLine( "gdk_x11_get_default_xdisplay" ); - Debug.Write( "preX11get: " ); - Debug.WriteLine( xdisplay.ToString() ); xdisplay = gdk_x11_get_default_xdisplay(); if (xdisplay==IntPtr.Zero) throw new NoXDisplayException(); - Debug.Write( "postX11get: " ); - Debug.WriteLine( xdisplay.ToString() ); - Debug.WriteLine( "glXChooseVisual" ); - IntPtr visualInfo = glXChooseVisual( xdisplay, gdk_x11_get_default_screen(), attributeList ); if (visualInfo==IntPtr.Zero) throw new NoGLContextException(); try { - Debug.WriteLine( "glXCreateContext" ); - Debug.Write( "preCreate: " ); - Debug.WriteLine( glxcontext.ToString() ); glxcontext = glXCreateContext( xdisplay, visualInfo, IntPtr.Zero, true ); - Debug.Write( "postCreate: " ); - Debug.WriteLine( glxcontext.ToString() ); } catch (Exception e) { ! Debug.Write( "==> " ); ! Debug.WriteLine( e.ToString() ); } finally { - Debug.WriteLine( "XFree" ); XFree( visualInfo ); } - - Debug.WriteLine( "Exiting GdkGLContext(uint[])" ); - Debug.Unindent(); } ~GdkGLContext() { - Debug.Indent(); - Debug.WriteLine( "Entering ~GdkGLContext(uint[])" ); - if (glxcontext==glXGetCurrentContext()) { - Debug.WriteLine( "glXMakeCurrent" ); glXMakeCurrent( xdisplay, 0, IntPtr.Zero ); } - - Debug.WriteLine( "glXDestroyContext" ); glXDestroyContext( xdisplay, glxcontext ); - - Debug.WriteLine( "Exiting ~GdkGLContext()" ); - Debug.Unindent(); } public bool MakeCurrent( Window window ) { - Debug.Indent(); - Debug.WriteLine( "Entering GdkGLContext.MakeCurrent(Window)" ); bool result = false; if (window==null) { - Debug.WriteLine( "window not initialized" ); result = false; } else { - Debug.WriteLine( "gdk_x11_drawable_get_xid" ); int id = gdk_x11_drawable_get_xid( window.Handle ); - Debug.WriteLine( "glXMakeCurrent" ); result = glXMakeCurrent( xdisplay, id, glxcontext ); - - Debug.WriteLine( "Exiting GdkGLContext.MakeCurrent(Window)*" ); - Debug.Indent(); } --- 59,98 ---- public GdkGLContext() : this ( stdInitializer ) { } public GdkGLContext( uint[] attributeList ) { // choose the visual based on attribute list xdisplay = gdk_x11_get_default_xdisplay(); if (xdisplay==IntPtr.Zero) throw new NoXDisplayException(); IntPtr visualInfo = glXChooseVisual( xdisplay, gdk_x11_get_default_screen(), attributeList ); if (visualInfo==IntPtr.Zero) throw new NoGLContextException(); try { glxcontext = glXCreateContext( xdisplay, visualInfo, IntPtr.Zero, true ); } catch (Exception e) { ! Console.Write( "GdkGlCopntext.GdkGLContext() #74: " ); ! Console.WriteLine( e.ToString() ); } finally { XFree( visualInfo ); } } ~GdkGLContext() { if (glxcontext==glXGetCurrentContext()) { glXMakeCurrent( xdisplay, 0, IntPtr.Zero ); } glXDestroyContext( xdisplay, glxcontext ); } public bool MakeCurrent( Window window ) { bool result = false; if (window==null) { result = false; } else { int id = gdk_x11_drawable_get_xid( window.Handle ); result = glXMakeCurrent( xdisplay, id, glxcontext ); } *************** *** 150,167 **** public void SwapBuffers( Window window ) { - Debug.Indent(); - Debug.WriteLine( "Entering GdkGLContext.SwapBuffers(Window)" ); - if (window==null) { - Debug.WriteLine( "window not initialized" ); } else { - Debug.WriteLine( "gdk_x11_drawable_get_xid" ); int id = gdk_x11_drawable_get_xid( window.Handle ); - Debug.WriteLine( "glXSwapBuffers" ); glXSwapBuffers( xdisplay, id ); } - - Debug.WriteLine( "Exiting GdkGLContext.SwapBuffers(Window)" ); - Debug.Unindent(); } } --- 109,117 ---- Index: gtkArea.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/platform/mono/gtkArea.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gtkArea.cs 11 Sep 2004 08:10:42 -0000 1.1 --- gtkArea.cs 5 Nov 2004 15:45:37 -0000 1.2 *************** *** 6,10 **** using Gtk; using System; - using System.Diagnostics; /** \brief OpenGL-widget --- 6,9 ---- *************** *** 25,37 **** */ public GtkGLArea() : base(type) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkGLArea()" ); - DoubleBuffered = false; - Debug.WriteLine( "Init context" ); context = new GdkGLContext(); - - Debug.WriteLine( "Exiting GtkGLArea()" ); - Debug.Unindent(); } --- 24,29 ---- *************** *** 41,53 **** */ public GtkGLArea( uint[] attr) : base(type) { - Debug.Indent(); - Debug.WriteLine( "Entering GtkGLArea(uint[])" ); - DoubleBuffered = false; - Debug.WriteLine( "Init context" ); context = new GdkGLContext( attr ); - - Debug.WriteLine( "Entering GtkGLArea(uint[])" ); - Debug.Unindent(); } --- 33,38 ---- *************** *** 58,69 **** */ public bool MakeCurrent() { - Debug.Indent(); - Debug.WriteLine( "Entering GtkGLArea.MakeCurrent()" ); - bool result = context.MakeCurrent( GdkWindow ); - - Debug.WriteLine( "Entering GtkGLArea.MakeCurrent()*" ); - Debug.Unindent(); - return result; } --- 43,47 ---- *************** *** 82,92 **** */ public void SwapBuffers() { - Debug.Indent(); - Debug.WriteLine( "Entering GtkGLArea.SwapBuffers()" ); - context.SwapBuffers( GdkWindow ); - - Debug.WriteLine( "Entering GtkGLArea.SwapBuffers()" ); - Debug.Unindent(); } } --- 60,64 ---- |
|
From: Tim R. <ti...@us...> - 2004-11-05 15:45:48
|
Update of /cvsroot/csdopenglnet/csdOpenGL/GL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20295/GL Modified Files: csdGL.cs Log Message: Kai forced me to remove the Debug-calls Index: csdGL.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/GL/csdGL.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** csdGL.cs 5 Aug 2004 21:13:56 -0000 1.2 --- csdGL.cs 5 Nov 2004 15:45:36 -0000 1.3 *************** *** 25,55 **** */ public void checkErrors() { - Debug.Indent(); - Debug.WriteLine( "Entering csdGL.checkErros()" ); - uint error = glGetError(); if (error==GL_INVALID_ENUM) { ! Debug.WriteLine( "OpenGL-Error: GL_INVALID_ENUM" ); throw new GLInvalidEnumException(); } else if (error==GL_INVALID_VALUE) { ! Debug.WriteLine( "OpenGL-Error: GL_INVALID_VALUE" ); throw new GLInvalidValue(); } else if (error==GL_INVALID_OPERATION) { ! Debug.WriteLine( "OpenGL-Error: GL_INVALID_OPERATION" ); throw new GLInvalidOperation(); } else if (error==GL_STACK_OVERFLOW) { ! Debug.WriteLine( "OpenGL-Error: GL_STACK_OVERFLOW" ); throw new GLStackOverflow(); } else if (error==GL_STACK_UNDERFLOW) { ! Debug.WriteLine( "OpenGL-Error: GL_STACK_UNDERFLOW" ); throw new GLStackUnderflow(); } else if (error==GL_OUT_OF_MEMORY) { ! Debug.WriteLine( "OpenGL-Error: GL_OUT_OF_MEMORY" ); throw new GLOutOfMemory(); } - - Debug.WriteLine( "Exiting csdGL.checkErros()" ); - Debug.Unindent(); } --- 25,49 ---- */ public void checkErrors() { uint error = glGetError(); if (error==GL_INVALID_ENUM) { ! Console.WriteLine( "OpenGL-Error: GL_INVALID_ENUM" ); throw new GLInvalidEnumException(); } else if (error==GL_INVALID_VALUE) { ! Console.WriteLine( "OpenGL-Error: GL_INVALID_VALUE" ); throw new GLInvalidValue(); } else if (error==GL_INVALID_OPERATION) { ! Console.WriteLine( "OpenGL-Error: GL_INVALID_OPERATION" ); throw new GLInvalidOperation(); } else if (error==GL_STACK_OVERFLOW) { ! Console.WriteLine( "OpenGL-Error: GL_STACK_OVERFLOW" ); throw new GLStackOverflow(); } else if (error==GL_STACK_UNDERFLOW) { ! Console.WriteLine( "OpenGL-Error: GL_STACK_UNDERFLOW" ); throw new GLStackUnderflow(); } else if (error==GL_OUT_OF_MEMORY) { ! Console.WriteLine( "OpenGL-Error: GL_OUT_OF_MEMORY" ); throw new GLOutOfMemory(); } } *************** *** 60,74 **** */ public void ignoreErrors() { - Debug.Indent(); - Debug.WriteLine( "Entering csdGL.ignoreErros()" ); - try { checkErrors(); } catch ( GLException e ) { ! Debug.WriteLine( e.ToString() ); } - - Debug.WriteLine( "Exiting csdGL.ignoreErrors()" ); - Debug.Unindent(); } --- 54,63 ---- */ public void ignoreErrors() { try { checkErrors(); } catch ( GLException e ) { ! Console.Write( "GL.ignoreErrors() #59: "); ! Console.WriteLine( e.ToString() ); } } *************** *** 80,86 **** */ protected bool getFlag( uint flag ) { - Debug.Indent(); - Debug.WriteLine( "Entering csdGL.getFlag( uint )" ); - bool result = GL_TRUE==glIsEnabled( flag ); --- 69,72 ---- *************** *** 88,95 **** checkErrors(); } - - Debug.WriteLine( "Exiting csdGL.getFlag( uint )*" ); - Debug.Unindent(); - return result; } --- 74,77 ---- *************** *** 103,109 **** */ protected void setFlag( uint flag, bool state ) { - Debug.Indent(); - Debug.WriteLine( "Entering csdGL.setFlag( uint, bool )" ); - if (state) { glEnable( flag ); --- 85,88 ---- *************** *** 115,121 **** checkErrors(); } - - Debug.WriteLine( "Exiting csdGL.setFlag( uint, bool )" ); - Debug.Unindent(); } --- 94,97 ---- |
|
From: Tim R. <ti...@us...> - 2004-11-05 15:45:48
|
Update of /cvsroot/csdopenglnet/csdOpenGL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20295 Modified Files: Makefile Log Message: Kai forced me to remove the Debug-calls Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 20 Oct 2004 09:12:10 -0000 1.12 --- Makefile 5 Nov 2004 15:45:35 -0000 1.13 *************** *** 2,5 **** --- 2,6 ---- all: + mkdir -p build $(MAKE) -C cbonding $(MAKE) -C generator |
|
From: Tim R. <ti...@us...> - 2004-11-05 15:45:48
|
Update of /cvsroot/csdopenglnet/csdOpenGL/Cg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20295/Cg Modified Files: demoCg.cs Log Message: Kai forced me to remove the Debug-calls Index: demoCg.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/Cg/demoCg.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** demoCg.cs 11 Sep 2004 18:52:44 -0000 1.2 --- demoCg.cs 5 Nov 2004 15:45:36 -0000 1.3 *************** *** 1,5 **** using csDragons.OpenGL; using System; - using System.Diagnostics; namespace csDragons { --- 1,4 ---- *************** *** 20,27 **** public DemoCg() { ! Debug.Indent(); ! Debug.WriteLine( "Entering Demo()" ); ! ! Debug.WriteLine( "Initializing GLUT" ); glutInitDisplayMode( GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH ); glutInitWindowSize( res, res ); --- 19,23 ---- public DemoCg() { ! Console.WriteLine( "Initializing GLUT" ); glutInitDisplayMode( GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH ); glutInitWindowSize( res, res ); *************** *** 31,50 **** glutKeyboardFunc( new cb0_glutKeyboardFunc(keyboard) ); ! Debug.WriteLine( "Initializing Cg" ); cgSetErrorCallback( new CgErrorEvent( errorHandler ) ); context = cgCreateContext(); ! Debug.WriteLine( "Start main loop" ); glutMainLoop(); - - Debug.WriteLine( "Exiting Demo()" ); - - Debug.Unindent(); } protected void errorHandler() { - Debug.Indent(); - Debug.WriteLine( "Entering Demo.errorHandler()" ); - CGerror err = cgGetError(); Console.Write( "Cg error: " ); --- 27,39 ---- glutKeyboardFunc( new cb0_glutKeyboardFunc(keyboard) ); ! Console.WriteLine( "Initializing Cg" ); cgSetErrorCallback( new CgErrorEvent( errorHandler ) ); context = cgCreateContext(); ! Console.WriteLine( "Start main loop" ); glutMainLoop(); } protected void errorHandler() { CGerror err = cgGetError(); Console.Write( "Cg error: " ); *************** *** 52,66 **** Console.WriteLine( cgGetErrorString( err ) ); System.Environment.Exit( 3 ); - - Debug.WriteLine( "Exiting Demo.errorHandler()" ); - Debug.Unindent(); } protected void draw() { - Debug.Indent(); - Debug.WriteLine( "Entering Demo.draw()" ); - if (!haveLoadedPrograms) { ! Debug.WriteLine( "Initiize GL/Cg" ); ChooseProfiles(); LoadCgPrograms(); --- 41,49 ---- Console.WriteLine( cgGetErrorString( err ) ); System.Environment.Exit( 3 ); } protected void draw() { if (!haveLoadedPrograms) { ! Console.WriteLine( "Initiize GL/Cg" ); ChooseProfiles(); LoadCgPrograms(); *************** *** 71,84 **** } ! Debug.WriteLine( "Reset GL" ); glClearColor( 0.25f, 0.25f, 0.25f, 1.0f ); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); ! Debug.WriteLine( "Set projection matrix" ); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); gluPerspective( 30.0, 1.0, 0.1, 100.0 ); ! Debug.WriteLine( "Set modelview matrix" ); glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); --- 54,67 ---- } ! Console.WriteLine( "Reset GL" ); glClearColor( 0.25f, 0.25f, 0.25f, 1.0f ); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); ! Console.WriteLine( "Set projection matrix" ); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); gluPerspective( 30.0, 1.0, 0.1, 100.0 ); ! Console.WriteLine( "Set modelview matrix" ); glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); *************** *** 86,102 **** glRotatef( curTime, 0, 1, 0 ); ! Debug.WriteLine( "Bind Cg programs" ); cgGLBindProgram( vertexProgram ); cgGLBindProgram( fragmentProgram ); ! Debug.WriteLine( "Bind uniform parameters to vertex shader" ); ! Debug.WriteLine( "==> ModelViewProj" ); cgGLSetStateMatrixParameter(cgGetNamedParameter(vertexProgram, "ModelViewProj"), CGGLenum.CG_GL_MODELVIEW_PROJECTION_MATRIX, CGGLenum.CG_GL_MATRIX_IDENTITY); ! Debug.WriteLine( "==> ModelView" ); cgGLSetStateMatrixParameter(cgGetNamedParameter(vertexProgram, "ModelView"), CGGLenum.CG_GL_MODELVIEW_MATRIX, CGGLenum.CG_GL_MATRIX_IDENTITY); ! Debug.WriteLine( "==> ModelViewIT" ); cgGLSetStateMatrixParameter(cgGetNamedParameter(vertexProgram, "ModelViewIT"), CGGLenum.CG_GL_MODELVIEW_MATRIX, CGGLenum.CG_GL_MATRIX_INVERSE_TRANSPOSE); ! Debug.WriteLine( "Bind varying parameters to vertex shader" ); float[] Kd = { 0.7f, 0.2f, 0.2f }; float[] Ks = { 0.9f, 0.9f, 0.9f }; --- 69,85 ---- glRotatef( curTime, 0, 1, 0 ); ! Console.WriteLine( "Bind Cg programs" ); cgGLBindProgram( vertexProgram ); cgGLBindProgram( fragmentProgram ); ! Console.WriteLine( "Bind uniform parameters to vertex shader" ); ! Console.WriteLine( "==> ModelViewProj" ); cgGLSetStateMatrixParameter(cgGetNamedParameter(vertexProgram, "ModelViewProj"), CGGLenum.CG_GL_MODELVIEW_PROJECTION_MATRIX, CGGLenum.CG_GL_MATRIX_IDENTITY); ! Console.WriteLine( "==> ModelView" ); cgGLSetStateMatrixParameter(cgGetNamedParameter(vertexProgram, "ModelView"), CGGLenum.CG_GL_MODELVIEW_MATRIX, CGGLenum.CG_GL_MATRIX_IDENTITY); ! Console.WriteLine( "==> ModelViewIT" ); cgGLSetStateMatrixParameter(cgGetNamedParameter(vertexProgram, "ModelViewIT"), CGGLenum.CG_GL_MODELVIEW_MATRIX, CGGLenum.CG_GL_MATRIX_INVERSE_TRANSPOSE); ! Console.WriteLine( "Bind varying parameters to vertex shader" ); float[] Kd = { 0.7f, 0.2f, 0.2f }; float[] Ks = { 0.9f, 0.9f, 0.9f }; *************** *** 104,124 **** cgGLSetParameter3fv(cgGetNamedParameter(vertexProgram, "specular"), Ks); ! Debug.WriteLine( "Bind uniform parameters to fragment shader" ); float[] lightPos = { 3.0f, 2.0f, -3.0f }; float[] lightColor = { 1.0f, 1.0f, 1.0f }; ! Debug.WriteLine( "==> Plight" ); cgGLSetParameter3fv(cgGetNamedParameter(fragmentProgram, "Plight"), lightPos); ! Debug.WriteLine( "==> lightColor" ); cgGLSetParameter3fv(cgGetNamedParameter(fragmentProgram, "lightColor"), lightColor); ! Debug.WriteLine( "==> shininess" ); cgGLSetParameter1f(cgGetNamedParameter(fragmentProgram, "shininess"), 40.0f ); ! Debug.WriteLine( "Enable approprate texture for fragment shader" ); cgGLEnableTextureParameter(cgGetNamedParameter(fragmentProgram, "diffuseMap")); - Debug.WriteLine( "Draw scene" ); DrawGeometry(); ! Debug.WriteLine( "Disable texture" ); cgGLDisableTextureParameter(cgGetNamedParameter(fragmentProgram, "diffuseMap")); --- 87,106 ---- cgGLSetParameter3fv(cgGetNamedParameter(vertexProgram, "specular"), Ks); ! Console.WriteLine( "Bind uniform parameters to fragment shader" ); float[] lightPos = { 3.0f, 2.0f, -3.0f }; float[] lightColor = { 1.0f, 1.0f, 1.0f }; ! Console.WriteLine( "==> Plight" ); cgGLSetParameter3fv(cgGetNamedParameter(fragmentProgram, "Plight"), lightPos); ! Console.WriteLine( "==> lightColor" ); cgGLSetParameter3fv(cgGetNamedParameter(fragmentProgram, "lightColor"), lightColor); ! Console.WriteLine( "==> shininess" ); cgGLSetParameter1f(cgGetNamedParameter(fragmentProgram, "shininess"), 40.0f ); ! Console.WriteLine( "Enable approprate texture for fragment shader" ); cgGLEnableTextureParameter(cgGetNamedParameter(fragmentProgram, "diffuseMap")); DrawGeometry(); ! Console.WriteLine( "Disable texture" ); cgGLDisableTextureParameter(cgGetNamedParameter(fragmentProgram, "diffuseMap")); *************** *** 126,138 **** ++curTime; glutPostRedisplay(); - - Debug.WriteLine( "Exiting Demo.draw()" ); - Debug.Unindent(); } protected void DrawGeometry() { - Debug.Indent(); - Debug.WriteLine( "Entering Demo.DrawGeometry()" ); - int nu = 30; int nv = 30; --- 108,114 ---- *************** *** 150,154 **** uv = new float[2*nVerts]; ! Debug.WriteLine( "Fill position, normal and texture coordinate arrays" ); for ( v=0; v<nv; ++v ) { float fv = ((float)v)/((float)(nv-1)); --- 126,130 ---- uv = new float[2*nVerts]; ! Console.WriteLine( "Fill position, normal and texture coordinate arrays" ); for ( v=0; v<nv; ++v ) { float fv = ((float)v)/((float)(nv-1)); *************** *** 164,168 **** } ! Debug.WriteLine( "Fill in the vertex index arrays" ); indices = new uint[3*nTris]; int ip = 0; --- 140,144 ---- } ! Console.WriteLine( "Fill in the vertex index arrays" ); indices = new uint[3*nTris]; int ip = 0; *************** *** 179,233 **** ! Debug.WriteLine( "Associate data 'pointers' with vertex shader" ); ! Debug.WriteLine( "==> Pobject" ); param = cgGetNamedParameter( vertexProgram, "Pobject" ); cgGLSetParameterPointer( param, 3, GL_FLOAT, 0, P ); ! Debug.WriteLine( "==> Nobject "); param = cgGetNamedParameter( vertexProgram, "Nobject" ); cgGLSetParameterPointer( param, 3, GL_FLOAT, 0, N ); ! Debug.WriteLine( "==> TexUV" ); param = cgGetNamedParameter( vertexProgram, "TexUV" ); cgGLSetParameterPointer( param, 2, GL_FLOAT, 0, uv ); } ! Debug.WriteLine( "Enable bindings to parameters" ); ! Debug.WriteLine( "==> Pobject" ); param = cgGetNamedParameter( vertexProgram, "Pobject" ); cgGLEnableClientState( param ); ! Debug.WriteLine( "==> Nobject" ); param = cgGetNamedParameter( vertexProgram, "Nobject" ); cgGLEnableClientState( param ); ! Debug.WriteLine( "==> TexUV" ); param = cgGetNamedParameter( vertexProgram, "TexUV" ); cgGLEnableClientState( param ); ! Debug.WriteLine( "==> diffuseMap" ); param = cgGetNamedParameter( fragmentProgram, "diffuseMap" ); cgGLEnableTextureParameter( param ); ! Debug.WriteLine( "Draw geometry" ); glDrawElements( GL_TRIANGLES, 3*nTris, GL_UNSIGNED_INT, indices ); ! Debug.WriteLine( "Disable bindings to parameters" ); ! Debug.WriteLine( "==> Pobject" ); param = cgGetNamedParameter( vertexProgram, "Pobject" ); cgGLDisableClientState( param ); ! Debug.WriteLine( "==> Nobject" ); param = cgGetNamedParameter( vertexProgram, "Nobject" ); cgGLDisableClientState( param ); ! Debug.WriteLine( "==> TexUV" ); param = cgGetNamedParameter( vertexProgram, "TexUV" ); cgGLDisableClientState( param ); ! Debug.WriteLine( "==> diffuseMap" ); param = cgGetNamedParameter( fragmentProgram, "diffuseMap" ); cgGLDisableTextureParameter( param ); - - Debug.WriteLine( "Exiting Demo.DrawGeometry()" ); - Debug.Unindent(); } protected void parametricEval( float u, float v, int pp, int np ) { - Debug.Indent(); - Debug.WriteLine( "Entering Demo.parametricEval(float,float,int,int)" ); - double theta = System.Math.PI * u; double phi = 2.0 * System.Math.PI * v; --- 155,203 ---- ! Console.WriteLine( "Associate data 'pointers' with vertex shader" ); ! Console.WriteLine( "==> Pobject" ); param = cgGetNamedParameter( vertexProgram, "Pobject" ); cgGLSetParameterPointer( param, 3, GL_FLOAT, 0, P ); ! Console.WriteLine( "==> Nobject "); param = cgGetNamedParameter( vertexProgram, "Nobject" ); cgGLSetParameterPointer( param, 3, GL_FLOAT, 0, N ); ! Console.WriteLine( "==> TexUV" ); param = cgGetNamedParameter( vertexProgram, "TexUV" ); cgGLSetParameterPointer( param, 2, GL_FLOAT, 0, uv ); } ! Console.WriteLine( "Enable bindings to parameters" ); ! Console.WriteLine( "==> Pobject" ); param = cgGetNamedParameter( vertexProgram, "Pobject" ); cgGLEnableClientState( param ); ! Console.WriteLine( "==> Nobject" ); param = cgGetNamedParameter( vertexProgram, "Nobject" ); cgGLEnableClientState( param ); ! Console.WriteLine( "==> TexUV" ); param = cgGetNamedParameter( vertexProgram, "TexUV" ); cgGLEnableClientState( param ); ! Console.WriteLine( "==> diffuseMap" ); param = cgGetNamedParameter( fragmentProgram, "diffuseMap" ); cgGLEnableTextureParameter( param ); ! Console.WriteLine( "Draw geometry" ); glDrawElements( GL_TRIANGLES, 3*nTris, GL_UNSIGNED_INT, indices ); ! Console.WriteLine( "Disable bindings to parameters" ); ! Console.WriteLine( "==> Pobject" ); param = cgGetNamedParameter( vertexProgram, "Pobject" ); cgGLDisableClientState( param ); ! Console.WriteLine( "==> Nobject" ); param = cgGetNamedParameter( vertexProgram, "Nobject" ); cgGLDisableClientState( param ); ! Console.WriteLine( "==> TexUV" ); param = cgGetNamedParameter( vertexProgram, "TexUV" ); cgGLDisableClientState( param ); ! Console.WriteLine( "==> diffuseMap" ); param = cgGetNamedParameter( fragmentProgram, "diffuseMap" ); cgGLDisableTextureParameter( param ); } protected void parametricEval( float u, float v, int pp, int np ) { double theta = System.Math.PI * u; double phi = 2.0 * System.Math.PI * v; *************** *** 240,252 **** N[np+1] = P[pp+1]; N[np+2] = P[pp+2]; - - Debug.WriteLine( "Exiting Demo.parametricEval(float,float,int,int)" ); - Debug.Unindent(); } protected void ChooseProfiles() { - Debug.Indent(); - Debug.WriteLine( "Entering Demo.ChooseProfiles()" ); - if ( CG_TRUE==cgGLIsProfileSupported( CGprofile.CG_PROFILE_ARBVP1 ) ) { vertexProfile = CGprofile.CG_PROFILE_ARBVP1; --- 210,216 ---- *************** *** 270,284 **** System.Environment.Exit(2); } - - Debug.WriteLine( "Exiting Demo.ChooseProfiles()" ); - Debug.Unindent(); } protected void LoadCgPrograms() { - Debug.Indent(); - Debug.WriteLine( "Entering Demo.LoadCgPrograms()" ); - - Debug.Assert( CG_TRUE==cgIsContext( context ) ); - vertexProgram = cgCreateProgramFromFile( context, CGenum.CG_SOURCE, "demo_vert.cg", vertexProfile, null, null ); if (CG_FALSE==cgIsProgramCompiled(vertexProgram)) cgCompileProgram(vertexProgram); --- 234,240 ---- *************** *** 290,302 **** cgGLEnableProfile( fragmentProfile ); cgGLLoadProgram( fragmentProgram ); - - Debug.WriteLine( "Exiting Demo.LoadCgPrograms()" ); - Debug.Unindent(); } protected void LoadTextures() { - Debug.Indent(); - Debug.WriteLine( "Entering Demo.LoadTextures()" ); - uint handle ; uint[] h = new uint[1]; --- 246,252 ---- *************** *** 331,337 **** glTexImage2D( GL_TEXTURE_2D, 0, 4, res, res, 0, GL_RGBA, GL_FLOAT, data ); cgGLSetTextureParameter( cgGetNamedParameter( fragmentProgram, "diffuseMap" ), handle ); - - Debug.WriteLine( "Exiting Demo.LoadTextures()" ); - Debug.Unindent(); } --- 281,284 ---- *************** *** 344,349 **** public static void Main( string[] args) { - Debug.Listeners.Add( new TextWriterTraceListener( Console.Out ) ); - Debug.AutoFlush = true; new DemoCg(); } --- 291,294 ---- |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:21:56
|
Update of /cvsroot/csdopenglnet/csdOpenGL/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31894/scripts Added Files: Makefile.Init Log Message: new files and loations --- NEW FILE: Makefile.Init --- PACKAGE=csDragons OS=LINUX FRAMEWORK=MONO GTK=0 MONO=1 WINDOWS=0 # Settings for Mono ifeq ($(FRAMEWORK),MONO) MCS=mcs $(OPTS) GACUTIL=gacutil $(GACUTIL_FLAGS) RUN=mono endif # Settings for Linux ifeq ($(OS),LINUX) CP=cp endif .IGNORE: clean .EXPORT_ALL_VARIABLES: .PHONY: clean |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:21:56
|
Update of /cvsroot/csdopenglnet/csdOpenGL/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31894/xml Added Files: cgGL_8h.xml cg_8h.xml gl_8h.xml glu_8h.xml glut_8h.xml glxtokens_8h.xml Log Message: new files and loations --- NEW FILE: gl_8h.xml --- <?xml version='1.0' encoding='iso-8859-1' standalone='no'?> <doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.3.8"> <compounddef id="gl_8h" kind="file"> <compoundname>gl.h</compoundname> <includes refid="glext_8h" local="no">GL/glext.h</includes> <includedby refid="glut_8h" local="no">glut.h</includedby> <includedby refid="glu_8h" local="no">glu.h</includedby> <incdepgraph> <node id="23"> <label>GL/glext.h</label> <link refid="glext_8h"/> </node> <node id="22"> <label>gl.h</label> <link refid="gl.h"/> <childnode refid="23" relation="include"> </childnode> </node> </incdepgraph> [...20635 lines suppressed...] <param> <type>const <ref refid="gl_8h_1a823" kindref="member">GLubyte</ref> *</type> <declname>comment</declname> </param> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <inbodydescription> </inbodydescription> <location file="/usr/include/GL/gl.h" line="2587"/> </memberdef> </sectiondef> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <location file="/usr/include/GL/gl.h"/> </compounddef> </doxygen> --- NEW FILE: cgGL_8h.xml --- <?xml version='1.0' encoding='iso-8859-1' standalone='no'?> <doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.3.8"> <compounddef id="cgGL_8h" kind="file"> <compoundname>cgGL.h</compoundname> <includes refid="cg_8h" local="no">Cg/cg.h</includes> <includes local="no">GL/gl.h</includes> <incdepgraph> <node id="95"> <label>stdarg.h</label> </node> <node id="90"> <label>Cg/cg_bindlocations.h</label> <link refid="cg__bindlocations_8h"/> </node> <node id="93"> <label>Cg/cg_errors.h</label> <link refid="cg__errors_8h"/> </node> <node id="94"> [...1925 lines suppressed...] <param> <type><ref refid="cg_8h_1a11" kindref="member">CGcontext</ref></type> <declname>ctx</declname> </param> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <inbodydescription> </inbodydescription> <location file="/usr/include/Cg/cgGL.h" line="366"/> </memberdef> </sectiondef> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <location file="/usr/include/Cg/cgGL.h"/> </compounddef> </doxygen> --- NEW FILE: glxtokens_8h.xml --- <?xml version='1.0' encoding='iso-8859-1' standalone='no'?> <doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.3.8"> <compounddef id="glxtokens_8h" kind="file"> <compoundname>glxtokens.h</compoundname> <sectiondef kind="define"> <memberdef kind="define" id="glxtokens_8h_1a0" prot="public" static="no"> <name>GLX_VERSION_1_1</name> <initializer>1</initializer> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <inbodydescription> </inbodydescription> <location file="/usr/include/GL/glxtokens.h" line="43" bodystart="43" bodyend="-1"/> </memberdef> <memberdef kind="define" id="glxtokens_8h_1a1" prot="public" static="no"> <name>GLX_VERSION_1_2</name> <initializer>1</initializer> [...1195 lines suppressed...] </memberdef> <memberdef kind="define" id="glxtokens_8h_1a110" prot="public" static="no"> <name>GLX_SAMPLES_SGIS</name> <initializer>100001</initializer> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <inbodydescription> </inbodydescription> <location file="/usr/include/GL/glxtokens.h" line="225" bodystart="225" bodyend="-1"/> </memberdef> </sectiondef> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <location file="/usr/include/GL/glxtokens.h"/> </compounddef> </doxygen> --- NEW FILE: cg_8h.xml --- <?xml version='1.0' encoding='iso-8859-1' standalone='no'?> <doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.3.8"> <compounddef id="cg_8h" kind="file"> <compoundname>cg.h</compoundname> <includes refid="cg__datatypes_8h" local="no">Cg/cg_datatypes.h</includes> <includes refid="cg__bindlocations_8h" local="no">Cg/cg_bindlocations.h</includes> <includes refid="cg__profiles_8h" local="no">Cg/cg_profiles.h</includes> <includes refid="cg__errors_8h" local="no">Cg/cg_errors.h</includes> <includes refid="cg__enums_8h" local="no">Cg/cg_enums.h</includes> <includes local="no">stdarg.h</includes> <includedby refid="cgGL_8h" local="no">cgGL.h</includedby> <incdepgraph> <node id="61"> <label>stdarg.h</label> </node> <node id="56"> <label>Cg/cg_bindlocations.h</label> <link refid="cg__bindlocations_8h"/> </node> [...2519 lines suppressed...] <param> <type><ref refid="cg_8h_1a13" kindref="member">CGparameter</ref></type> <declname>current</declname> </param> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <inbodydescription> </inbodydescription> <location file="/usr/include/Cg/cg.h" line="353"/> </memberdef> </sectiondef> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <location file="/usr/include/Cg/cg.h"/> </compounddef> </doxygen> --- NEW FILE: glu_8h.xml --- <?xml version='1.0' encoding='iso-8859-1' standalone='no'?> <doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.3.8"> <compounddef id="glu_8h" kind="file"> <compoundname>glu.h</compoundname> <includes refid="gl_8h" local="no">GL/gl.h</includes> <includedby refid="glut_8h" local="no">glut.h</includedby> <incdepgraph> <node id="34"> <label>GL/glext.h</label> <link refid="glext_8h"/> </node> <node id="32"> <label>glu.h</label> <link refid="glu.h"/> <childnode refid="33" relation="include"> </childnode> </node> <node id="33"> <label>GL/gl.h</label> [...3480 lines suppressed...] <param> <type><ref refid="gl_8h_1a829" kindref="member">GLdouble</ref> *</type> <declname>objW</declname> </param> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <inbodydescription> </inbodydescription> <location file="/usr/include/GL/glu.h" line="323"/> </memberdef> </sectiondef> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <location file="/usr/include/GL/glu.h"/> </compounddef> </doxygen> --- NEW FILE: glut_8h.xml --- <?xml version='1.0' encoding='iso-8859-1' standalone='no'?> <doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.3.8"> <compounddef id="glut_8h" kind="file"> <compoundname>glut.h</compoundname> <includes refid="gl_8h" local="no">GL/gl.h</includes> <includes refid="glu_8h" local="no">GL/glu.h</includes> <incdepgraph> <node id="39"> <label>GL/glext.h</label> <link refid="glext_8h"/> </node> <node id="40"> <label>GL/glu.h</label> <link refid="glu_8h"/> <childnode refid="38" relation="include"> </childnode> </node> <node id="38"> <label>GL/gl.h</label> [...4200 lines suppressed...] <type>GLUTAPI void *</type> <definition>GLUTAPI void* glutBitmapHelvetica18</definition> <argsstring></argsstring> <name>glutBitmapHelvetica18</name> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <inbodydescription> </inbodydescription> <location file="/usr/include/GL/glut.h" line="384" bodystart="384" bodyend="-1"/> </memberdef> </sectiondef> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> <location file="/usr/include/GL/glut.h"/> </compounddef> </doxygen> |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:21:55
|
Update of /cvsroot/csdopenglnet/csdOpenGL/Cg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31894/Cg Removed Files: cgGL_8h.xml cg_8h.xml Log Message: new files and loations --- cg_8h.xml DELETED --- --- cgGL_8h.xml DELETED --- |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:21:55
|
Update of /cvsroot/csdopenglnet/csdOpenGL/GL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31894/GL Removed Files: gl_8h.xml glu_8h.xml glut_8h.xml Log Message: new files and loations --- gl_8h.xml DELETED --- --- glu_8h.xml DELETED --- --- glut_8h.xml DELETED --- |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:14:22
|
Update of /cvsroot/csdopenglnet/csdOpenGL/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30720/scripts Log Message: Directory /cvsroot/csdopenglnet/csdOpenGL/scripts added to the repository |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:14:15
|
Update of /cvsroot/csdopenglnet/csdOpenGL/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30648/xml Log Message: Directory /cvsroot/csdopenglnet/csdOpenGL/xml added to the repository |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:55
|
Update of /cvsroot/csdopenglnet/csdOpenGL/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177/tools Modified Files: Makefile Log Message: new build system Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/tools/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 11 Sep 2004 08:10:42 -0000 1.7 --- Makefile 20 Oct 2004 09:12:14 -0000 1.8 *************** *** 1,11 **** FILES=ByteTexture2D.cs AssemblyInfo.cs - CC=mcs - DEBUG=/d:DEBUG - DEBUG= - OPTS=$(DEBUG) - MCS=$(CC) $(OPTS) - PACKAGE=csDragons - GAC=gacutil $(GACUTIL_FLAGS) DLL=csDragons.OpenGL.Tools.dll all: $(DLL) --- 1,7 ---- + include ../scripts/Makefile.Init + FILES=ByteTexture2D.cs AssemblyInfo.cs DLL=csDragons.OpenGL.Tools.dll + TARGET=../build/ all: $(DLL) *************** *** 13,16 **** --- 9,13 ---- $(DLL): $(FILES) $(MCS) -r:System.Drawing -target:library $(FILES) -out:$@ + $(CP) $@ $(TARGET) install: install-gac *************** *** 25,37 **** clean: ! rm -f *.exe ! rm -f *.dll ! ! .IGNORE: ! clean ! ! .EXPORT_ALL_VARIABLES: ! ! .PHONY: ! clean --- 22,25 ---- clean: ! $(RM) *.dll |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:55
|
Update of /cvsroot/csdopenglnet/csdOpenGL/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177/samples Modified Files: Makefile gears.cs texture.cs triangle.cs Log Message: new build system Index: gears.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/gears.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gears.cs 11 Sep 2004 18:52:46 -0000 1.8 --- gears.cs 20 Oct 2004 09:12:14 -0000 1.9 *************** *** 18,22 **** Debug.WriteLine( "Initializiing GLUT" ); ! glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE ); glutInitWindowSize( 480, 480 ); glutCreateWindow("Gears"); --- 18,22 ---- Debug.WriteLine( "Initializiing GLUT" ); ! glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); glutInitWindowSize( 480, 480 ); glutCreateWindow("Gears"); Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 11 Sep 2004 09:07:14 -0000 1.10 --- Makefile 20 Oct 2004 09:12:14 -0000 1.11 *************** *** 1,33 **** ! CC=mcs ! DEBUG=/d:DEBUG ! DEBUG= ! OPTS=$(DEBUG) LIBS=csDragons.OpenGL.dll csDragons.Math.dll csDragons.OpenGL.Tools.dll - MCS=$(CC) $(OPTS) -lib:/usr/lib/mono/gtk-sharp -lib:../GL -lib:../math -lib:../tools PACKAGE=csDragons DEMOS=triangle.exe texture.exe gears.exe LIBCONFIGS=$(foreach lib,$(LIBS),$(lib).config) LIBOPTS=$(foreach lib,$(LIBS),-r $(lib)) ! all: $(LIBS) $(DEMOS) ifeq ($(GTK),1) $(MAKE) -f Makefile.gtk endif - - csDragons.OpenGL.dll: - ln -sf ../GL/csDragons.OpenGL.dll . - ln -sf ../GL/csDragons.OpenGL.dll.config . - - csDragons.Math.dll: - ln -sf ../math/csDragons.Math.dll . - ln -sf ../math/csDragons.Math.dll.config . - - csDragons.OpenGL.Tools.dll: - ln -sf ../tools/csDragons.OpenGL.Tools.dll . - ln -sf ../tools/csDragons.OpenGL.Tools.dll.config . %.exe:%.cs ! $(MCS) $(LIBOPTS) -r:System.Drawing $^ -o $@ clean: --- 1,21 ---- ! include ../scripts/Makefile.Init ! LIBS=csDragons.OpenGL.dll csDragons.Math.dll csDragons.OpenGL.Tools.dll PACKAGE=csDragons DEMOS=triangle.exe texture.exe gears.exe + TARGET=../build LIBCONFIGS=$(foreach lib,$(LIBS),$(lib).config) LIBOPTS=$(foreach lib,$(LIBS),-r $(lib)) ! all: $(DEMOS) ! $(CP) Flag.bmp $(TARGET) ifeq ($(GTK),1) $(MAKE) -f Makefile.gtk endif %.exe:%.cs ! $(MCS) -lib:../build $(LIBOPTS) -r:System.Drawing $^ -o $@ ! $(CP) $@ $(TARGET) clean: *************** *** 35,45 **** rm -f $(DEMOS) rm -f $(LIBS) $(LIBCONFIGS) - - .IGNORE: - clean - - .EXPORT_ALL_VARIABLES: - - .PHONY: - clean --- 23,25 ---- Index: texture.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/texture.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** texture.cs 16 Aug 2004 15:44:10 -0000 1.4 --- texture.cs 20 Oct 2004 09:12:14 -0000 1.5 *************** *** 12,16 **** public TextureTest() { ! glutInitDisplayMode( 0 | 2 ); glutInitWindowSize( 600, 480 ); glutCreateWindow("Texture"); --- 12,16 ---- public TextureTest() { ! glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); glutInitWindowSize( 600, 480 ); glutCreateWindow("Texture"); Index: triangle.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/triangle.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** triangle.cs 6 Aug 2004 11:42:34 -0000 1.4 --- triangle.cs 20 Oct 2004 09:12:14 -0000 1.5 *************** *** 8,12 **** public Triangle() { ! glutInitDisplayMode( 0 | 2 ); glutInitWindowSize( 600, 480 ); glutCreateWindow("Triangle"); --- 8,12 ---- public Triangle() { ! glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); glutInitWindowSize( 600, 480 ); glutCreateWindow("Triangle"); |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:53
|
Update of /cvsroot/csdopenglnet/csdOpenGL/platform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177/platform Modified Files: Makefile Log Message: new build system Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/platform/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 11 Sep 2004 09:16:24 -0000 1.2 --- Makefile 20 Oct 2004 09:12:13 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + include ../scripts/Makefile.Init + all: ifeq ($(MONO),1) *************** *** 25,36 **** clean: $(MAKE) -C mono clean ! $(MAKE) -C windows clean ! ! .IGNORE: ! clean ! ! .EXPORT_ALL_VARIABLES: ! ! .PHONY: ! clean ! --- 27,29 ---- clean: $(MAKE) -C mono clean ! $(MAKE) -C windows clean \ No newline at end of file |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:53
|
Update of /cvsroot/csdopenglnet/csdOpenGL/math In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177/math Modified Files: Makefile Log Message: new build system Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/math/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 11 Sep 2004 08:10:41 -0000 1.4 --- Makefile 20 Oct 2004 09:12:13 -0000 1.5 *************** *** 1,17 **** LIBFILES=FVector.cs F4Vector.cs F3Vector.cs FMatrix.cs F4Matrix.cs F3Matrix.cs AssemblyInfo.cs Bezier.cs - CC=mcs - DEBUG=/d:DEBUG - DEBUG= - OPTS=$(DEBUG) - LIBS= - PACKAGE=csDragons - GAC=gacutil $(GACUTIL_FLAGS) DLL=csDragons.Math.dll all: $(DLL) $(DLL): $(LIBFILES) ! mcs -target:library $(LIBFILES) $(OPTS) -out:$@ ! install: install-gac --- 1,14 ---- + include ../scripts/Makefile.Init + LIBFILES=FVector.cs F4Vector.cs F3Vector.cs FMatrix.cs F4Matrix.cs F3Matrix.cs AssemblyInfo.cs Bezier.cs DLL=csDragons.Math.dll + TARGET=../build/ all: $(DLL) $(DLL): $(LIBFILES) ! $(MCS) -target:library $(LIBFILES) $(OPTS) -out:$@ ! $(CP) $@ $(TARGET) ! install: install-gac *************** *** 26,38 **** clean: ! rm -f $(DLL) ! ! .IGNORE: ! clean ! ! .EXPORT_ALL_VARIABLES: ! ! .PHONY: ! clean ! --- 23,26 ---- clean: ! $(RM) $(DLL) |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:53
|
Update of /cvsroot/csdopenglnet/csdOpenGL/platform/mono In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177/platform/mono Modified Files: Makefile Log Message: new build system Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/platform/mono/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 11 Sep 2004 09:07:13 -0000 1.2 --- Makefile 20 Oct 2004 09:12:14 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + include ../../scripts/Makefile.Init + FILES_SRC=GLXTokens.cs ../Exceptions.cs ifeq ($(GTK),1) *************** *** 6,28 **** FILES=$(FILES_SRC) $(FILES_GTK) ! DEBUG=/d:DEBUG ! DEBUG= ! ! OPTS_SRC=-lib:../../GL -r:csDragons.OpenGL ! OPTS=$(OPTS_SRC) $(OPTS_GTK) ! ! DLL=csDragons.OpenGL.Mono.dll ! ! GEN=mono ../../generator/csdGenerator.exe ! CC=mcs ! MCS=$(CC) $(OPTS) ! PACKAGE=csDragons ! GAC=gacutil $(GACUTIL_FLAGS) all: $(DLL) $(DLL): AssemblyInfo.cs $(FILES) ! $(MCS) -target:library $^ -out:$@ GLXTokens.cs: glxtokens_8h.xml glxtokens.xml --- 8,23 ---- FILES=$(FILES_SRC) $(FILES_GTK) ! OPTS_SRC=-lib:../../build -r:csDragons.OpenGL ! LIBOPTS=$(OPTS_SRC) $(OPTS_GTK) ! TARGET=../../build ! DLL=csDragons.OpenGL.Platform.dll ! GEN=$(RUN) ../../generator/csdGenerator.exe -q all: $(DLL) $(DLL): AssemblyInfo.cs $(FILES) ! $(MCS) $(LIBOPTS) -target:library $^ -out:$@ ! $(CP) $@ $(TARGET) GLXTokens.cs: glxtokens_8h.xml glxtokens.xml *************** *** 40,56 **** clean: ! rm -f *.exe ! rm -f *.dll ! rm -f csdGLBase.cs ! rm -f csdGLUBase.cs ! rm -f csdGLUTBase.cs ! rm -f csdGLXTokens.cs ! ! .IGNORE: ! clean ! ! .EXPORT_ALL_VARIABLES: ! ! .PHONY: ! clean ! --- 35,42 ---- clean: ! $(RM) *.exe ! $(RM) *.dll ! $(RM) csdGLBase.cs ! $(RM) csdGLUBase.cs ! $(RM) csdGLUTBase.cs ! $(RM) csdGLXTokens.cs |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:52
|
Update of /cvsroot/csdopenglnet/csdOpenGL/generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177/generator Modified Files: Makefile Log Message: new build system Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 13 Sep 2004 17:13:17 -0000 1.14 --- Makefile 20 Oct 2004 09:12:12 -0000 1.15 *************** *** 1,26 **** FILES=generator.cs AssemblyInfo.cs define.cs typedef.cs function.cs config.cs - CC=mcs - DEBUG=/d:DEBUG - DEBUG= - OPTS=$(DEBUG) - MCS=$(CC) $(OPTS) - PACKAGE=csDragons - GAC=gacutil $(GACUTIL_FLAGS) - all: generator.exe generator.exe: $(FILES) ! $(CC) $(OPTS) $(LIBOPTS) $(FILES) -out:$@ clean: ! rm -f generator.exe ! ! .IGNORE: ! clean ! ! .EXPORT_ALL_VARIABLES: ! ! .PHONY: ! clean ! --- 1,10 ---- + include ../scripts/Makefile.Init FILES=generator.cs AssemblyInfo.cs define.cs typedef.cs function.cs config.cs all: generator.exe generator.exe: $(FILES) ! $(MCS) $(LIBOPTS) $(FILES) -out:$@ clean: ! $(RM) generator.exe \ No newline at end of file |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:51
|
Update of /cvsroot/csdopenglnet/csdOpenGL/cbonding In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177/cbonding Modified Files: Makefile Log Message: new build system Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/cbonding/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 11 Sep 2004 08:23:04 -0000 1.8 --- Makefile 20 Oct 2004 09:12:12 -0000 1.9 *************** *** 1,2 **** --- 1,3 ---- + TARGETDIR = ../build INCPATH = -I /usr/X11R6/include/ LIBPATH = -L/usr/lib -L/usr/X11R6/lib/ -L. *************** *** 6,10 **** libcsdGL.so: csdGL.o ! gcc -shared -Wl,-soname,libcsdGL.so.1 $(LIBPATH) -lglut -lGLU -lGL -o libcsdGL.so -lpthread csdGL.o %.o:%.c --- 7,11 ---- libcsdGL.so: csdGL.o ! gcc -shared -Wl,-soname,libcsdGL.so.1 $(LIBPATH) -lglut -lGLU -lGL -o $(TARGETDIR)/libcsdGL.so -lpthread csdGL.o %.o:%.c |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:51
|
Update of /cvsroot/csdopenglnet/csdOpenGL/Cg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177/Cg Modified Files: Makefile cg.xml cgGL.xml Log Message: new build system Index: cg.xml =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/Cg/cg.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** cg.xml 11 Sep 2004 12:27:21 -0000 1.4 --- cg.xml 20 Oct 2004 09:12:10 -0000 1.5 *************** *** 1,4 **** <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>cg_8h.xml</xmlInput> <linkLibrary>cg.dll</linkLibrary> <className>csdCgBase</className> --- 1,4 ---- <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>../xml/cg_8h.xml</xmlInput> <linkLibrary>cg.dll</linkLibrary> <className>csdCgBase</className> Index: cgGL.xml =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/Cg/cgGL.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cgGL.xml 11 Sep 2004 12:27:21 -0000 1.5 --- cgGL.xml 20 Oct 2004 09:12:10 -0000 1.6 *************** *** 1,4 **** <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>cgGL_8h.xml</xmlInput> <linkLibrary>cgGL.dll</linkLibrary> <className>csdCgGLBase</className> --- 1,4 ---- <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>../xml/cgGL_8h.xml</xmlInput> <linkLibrary>cgGL.dll</linkLibrary> <className>csdCgGLBase</className> *************** *** 9,14 **** <writeDefines>false</writeDefines> <TypeDefs> ! <File>cg_8h.xml</File> ! <File>../GL/gl_8h.xml</File> </TypeDefs> <BaseTypes> --- 9,14 ---- <writeDefines>false</writeDefines> <TypeDefs> ! <File>../xml/cg_8h.xml</File> ! <File>../xml/gl_8h.xml</File> </TypeDefs> <BaseTypes> Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/Cg/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile 13 Sep 2004 17:13:17 -0000 1.18 --- Makefile 20 Oct 2004 09:12:10 -0000 1.19 *************** *** 1,13 **** FILES=cg.xml.cs cgGL.xml.cs AssemblyInfo.cs csdCg.cs cgType.cs cgRessource.cs cgProfile.cs cgError.cs cgEnums.cs cgGLEnum.cs ! GEN=mono ../generator/generator.exe ! CC=mcs - DEBUG=/d:DEBUG - DEBUG= - OPTS=$(DEBUG) - MCS=$(CC) $(OPTS) -lib:../GL -r:csDragons.OpenGL.dll - PACKAGE=csDragons - GAC=gacutil $(GACUTIL_FLAGS) DLL=csDragons.OpenGL.Cg.dll DEMOS=demoCg.exe --- 1,10 ---- + include ../scripts/Makefile.Init + FILES=cg.xml.cs cgGL.xml.cs AssemblyInfo.cs csdCg.cs cgType.cs cgRessource.cs cgProfile.cs cgError.cs cgEnums.cs cgGLEnum.cs ! GEN=$(RUN) ../generator/generator.exe ! TARGETDIR=../build ! LIBS=-r:csDragons.OpenGL.dll DLL=csDragons.OpenGL.Cg.dll DEMOS=demoCg.exe *************** *** 16,33 **** $(DLL): $(FILES) ! $(MCS) -target:library $(FILES) -out:$@ ! ! ! gl_8h.xml: ! ln -sf ../GL/gl_8h.xml . %.xml.cs:%.xml ! $(GEN) $^ ! ! demo: $(DEMOS) csDragons.OpenGL.dll ! csDragons.OpenGL.dll: ! ln -sf ../GL/csDragons.OpenGL.dll . ! ln -sf ../GL/csDragons.OpenGL.dll.config . %.exe:%.cs --- 13,23 ---- $(DLL): $(FILES) ! $(MCS) -target:library -lib:../build $(FILES) $(LIBS) -out:$@ ! $(CP) $@ $@.config $(TARGETDIR) %.xml.cs:%.xml ! $(GEN) -q $^ ! demo: $(DEMOS) %.exe:%.cs *************** *** 45,59 **** clean: ! rm -f $(DEMOS) ! rm -f csDragons.OpenGL.dll* ! rm -f $(DLL) ! rm -f *.xml.cs ! ! .IGNORE: ! clean ! ! .EXPORT_ALL_VARIABLES: ! ! .PHONY: ! clean ! --- 35,40 ---- clean: ! $(RM) $(DEMOS) ! $(RM) csDragons.OpenGL.dll* ! $(RM) $(DLL) ! $(RM) *.xml.cs |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:51
|
Update of /cvsroot/csdopenglnet/csdOpenGL/doxygen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177/doxygen Modified Files: Makefile Log Message: new build system Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/doxygen/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 13 Aug 2004 12:27:05 -0000 1.6 --- Makefile 20 Oct 2004 09:12:12 -0000 1.7 *************** *** 17,22 **** install: ! cp xml/gl_8h.xml xml/glu_8h.xml xml/glut_8h.xml xml/glxtokens_8h.xml ../GL ! cp cg_xml/cgGL_8h.xml cg_xml/cg_8h.xml ../Cg clean: --- 17,22 ---- install: ! cp xml/gl_8h.xml xml/glu_8h.xml xml/glut_8h.xml xml/glxtokens_8h.xml ../xml ! cp cg_xml/cgGL_8h.xml cg_xml/cg_8h.xml ../xml clean: |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:49
|
Update of /cvsroot/csdopenglnet/csdOpenGL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177 Modified Files: ChangeLog Makefile Log Message: new build system Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 11 Sep 2004 09:11:49 -0000 1.11 --- Makefile 20 Oct 2004 09:12:10 -0000 1.12 *************** *** 1,5 **** ! MONO=1 ! WINDOWS=0 ! GTK=1 all: --- 1,3 ---- ! include scripts/Makefile.Init all: *************** *** 12,16 **** $(MAKE) -C platform - doc: $(MAKE) -C doc --- 10,13 ---- *************** *** 50,60 **** $(MAKE) -C platform clean $(MAKE) -C platform clean ! ! .IGNORE: ! clean ! ! .EXPORT_ALL_VARIABLES: ! ! .PHONY: ! clean ! --- 47,49 ---- $(MAKE) -C platform clean $(MAKE) -C platform clean ! $(RM) build/* \ No newline at end of file Index: ChangeLog =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ChangeLog 12 Sep 2004 11:41:59 -0000 1.11 --- ChangeLog 20 Oct 2004 09:12:10 -0000 1.12 *************** *** 3,8 **** disjunctin between GL/CG and plattform specific bindings Gtk# widget is now located in the platform.mono.dll, because X calls are used inside it ! compile process now uses NAnt ! basic windows support 0.2.0: --- 3,7 ---- disjunctin between GL/CG and plattform specific bindings Gtk# widget is now located in the platform.mono.dll, because X calls are used inside it ! compile process now uses Makefile, with GELANTEM Windows, Linux, MS.NET, Mono, PNet support 0.2.0: |
|
From: Tim R. <ti...@us...> - 2004-10-20 09:12:38
|
Update of /cvsroot/csdopenglnet/csdOpenGL/GL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177/GL Modified Files: Makefile gl.xml glext.xml glu.xml glut.xml glxtokens.xml Log Message: new build system Index: glext.xml =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/GL/glext.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** glext.xml 13 Aug 2004 12:27:05 -0000 1.1 --- glext.xml 20 Oct 2004 09:12:11 -0000 1.2 *************** *** 1,4 **** <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>glext_8h.xml</xmlInput> <linkLibrary>libGL.so</linkLibrary> <className>csdGLExtBase</className> --- 1,4 ---- <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>../xml/glext_8h.xml</xmlInput> <linkLibrary>libGL.so</linkLibrary> <className>csdGLExtBase</className> Index: gl.xml =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/GL/gl.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gl.xml 11 Sep 2004 18:52:45 -0000 1.5 --- gl.xml 20 Oct 2004 09:12:11 -0000 1.6 *************** *** 1,4 **** <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>gl_8h.xml</xmlInput> <linkLibrary>opengl32.dll</linkLibrary> <className>csdGLBase</className> --- 1,4 ---- <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>../xml/gl_8h.xml</xmlInput> <linkLibrary>opengl32.dll</linkLibrary> <className>csdGLBase</className> Index: glut.xml =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/GL/glut.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** glut.xml 11 Sep 2004 19:36:36 -0000 1.7 --- glut.xml 20 Oct 2004 09:12:11 -0000 1.8 *************** *** 1,4 **** <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>glut_8h.xml</xmlInput> <linkLibrary>glut32.dll</linkLibrary> <className>csdGLUTBase</className> --- 1,4 ---- <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>../xml/glut_8h.xml</xmlInput> <linkLibrary>glut32.dll</linkLibrary> <className>csdGLUTBase</className> *************** *** 11,15 **** </BaseTypes> <TypeDefs> ! <File>gl_8h.xml</File> </TypeDefs> <Namespace>csDragons.OpenGL</Namespace> --- 11,15 ---- </BaseTypes> <TypeDefs> ! <File>../xml/gl_8h.xml</File> </TypeDefs> <Namespace>csDragons.OpenGL</Namespace> Index: glu.xml =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/GL/glu.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** glu.xml 11 Sep 2004 18:52:45 -0000 1.5 --- glu.xml 20 Oct 2004 09:12:11 -0000 1.6 *************** *** 1,4 **** <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>glu_8h.xml</xmlInput> <linkLibrary>glu32.dll</linkLibrary> <className>csdGLUBase</className> --- 1,4 ---- <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>../xml/glu_8h.xml</xmlInput> <linkLibrary>glu32.dll</linkLibrary> <className>csdGLUBase</className> *************** *** 11,15 **** </BaseTypes> <TypeDefs> ! <File>gl_8h.xml</File> </TypeDefs> <Namespace>csDragons.OpenGL</Namespace> --- 11,15 ---- </BaseTypes> <TypeDefs> ! <File>../xml/gl_8h.xml</File> </TypeDefs> <Namespace>csDragons.OpenGL</Namespace> Index: Makefile =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/GL/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 13 Sep 2004 17:13:17 -0000 1.10 --- Makefile 20 Oct 2004 09:12:11 -0000 1.11 *************** *** 1,13 **** ! FILES=gl.xml.cs csdGL.cs glu.xml.cs glut.xml.cs Exceptions.cs DelegateCallingConventionCdeclAttribute.cs ! GEN=mono ../generator/generator.exe ! CC=mcs - DEBUG=/d:DEBUG - DEBUG= - OPTS=$(DEBUG) - MCS=$(CC) $(OPTS) - PACKAGE=csDragons - GAC=gacutil $(GACUTIL_FLAGS) DLL=csDragons.OpenGL.dll --- 1,8 ---- ! include ../scripts/Makefile.Init ! FILES=gl.xml.cs csdGL.cs glu.xml.cs glut.xml.cs Exceptions.cs DelegateCallingConventionCdeclAttribute.cs ! TARGETDIR=../build ! GEN=$(RUN) ../generator/generator.exe DLL=csDragons.OpenGL.dll *************** *** 16,22 **** $(DLL): AssemblyInfo.cs $(FILES) $(MCS) -target:library $^ -out:$@ %.xml.cs:%.xml ! $(GEN) $^ install: install-gac --- 11,18 ---- $(DLL): AssemblyInfo.cs $(FILES) $(MCS) -target:library $^ -out:$@ + $(CP) $@ $@.config $(TARGETDIR) %.xml.cs:%.xml ! $(GEN) -q $^ install: install-gac *************** *** 32,45 **** clean: ! rm -f *.exe ! rm -f *.dll ! rm -f *.xml.cs ! ! .IGNORE: ! clean ! ! .EXPORT_ALL_VARIABLES: ! ! .PHONY: ! clean ! --- 28,32 ---- clean: ! $(RM) *.exe ! $(RM) *.dll ! $(RM) *.xml.cs Index: glxtokens.xml =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/GL/glxtokens.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** glxtokens.xml 17 Aug 2004 09:09:06 -0000 1.3 --- glxtokens.xml 20 Oct 2004 09:12:11 -0000 1.4 *************** *** 1,4 **** <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>glxtokens_8h.xml</xmlInput> <linkLibrary>libcsdGL.so</linkLibrary> <className>csdGLXTokens</className> --- 1,4 ---- <Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> ! <xmlInput>../xml/glxtokens_8h.xml</xmlInput> <linkLibrary>libcsdGL.so</linkLibrary> <className>csdGLXTokens</className> |
|
From: Tim R. <ti...@us...> - 2004-09-19 18:51:12
|
Update of /cvsroot/csdopenglnet/csdOpenGL/generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7211/generator Modified Files: define.cs function.cs generator.cs typedef.cs Log Message: n/a Index: typedef.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/typedef.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** typedef.cs 11 Sep 2004 19:36:36 -0000 1.6 --- typedef.cs 19 Sep 2004 18:51:03 -0000 1.7 *************** *** 28,31 **** --- 28,33 ---- protected SortedList dList; + protected bool quiet = false; + protected string delegateAttribute = ""; *************** *** 35,42 **** * @param w StreamWriter instance for output */ ! public TypeDef( StreamWriter w ) { Debug.Indent(); Debug.WriteLine( "Entering TypeDef.Define(StreamWriter)" ); writer = w; tList = new SortedList( System.Collections.Comparer.Default ); --- 37,45 ---- * @param w StreamWriter instance for output */ ! public TypeDef( StreamWriter w, bool _quiet ) { Debug.Indent(); Debug.WriteLine( "Entering TypeDef.Define(StreamWriter)" ); + quiet = _quiet; writer = w; tList = new SortedList( System.Collections.Comparer.Default ); *************** *** 61,65 **** } ! public TypeDef( StreamWriter w, ArrayList typedefs, string delAttr ) : this ( w ) { delegateAttribute = delAttr; IEnumerator e = typedefs.GetEnumerator(); --- 64,68 ---- } ! public TypeDef( StreamWriter w, ArrayList typedefs, string delAttr, bool _quiet ) : this ( w, _quiet ) { delegateAttribute = delAttr; IEnumerator e = typedefs.GetEnumerator(); *************** *** 265,272 **** // print information to console ! Console.Write( "TypeDef: " ); ! Console.Write( n ); ! Console.Write( " -> " ); ! Console.WriteLine( t ); try { --- 268,277 ---- // print information to console ! if (!quiet) { ! Console.Write( "TypeDef: " ); ! Console.Write( n ); ! Console.Write( " -> " ); ! Console.WriteLine( t ); ! } try { Index: function.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/function.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** function.cs 11 Sep 2004 20:48:09 -0000 1.8 --- function.cs 19 Sep 2004 18:51:03 -0000 1.9 *************** *** 25,29 **** */ protected ArrayList list; ! protected ArrayList listWrap; protected SortedList attrList; --- 25,30 ---- */ protected ArrayList list; ! ! protected bool quiet = false; protected ArrayList listWrap; protected SortedList attrList; *************** *** 58,65 **** * @param l the name of the library to be wrapped */ ! public Function( StreamWriter w, TypeDef t, string df, string da, string l, ArrayList _ignoreFunctions ) { Debug.Indent(); Debug.WriteLine( "Entering Function.Function(StreamWriter)" ); dllFlags = df; dllAttr = da; --- 59,67 ---- * @param l the name of the library to be wrapped */ ! public Function( StreamWriter w, TypeDef t, string df, string da, string l, ArrayList _ignoreFunctions, bool _quiet ) { Debug.Indent(); Debug.WriteLine( "Entering Function.Function(StreamWriter)" ); + quiet = _quiet; dllFlags = df; dllAttr = da; *************** *** 186,194 **** if (valid(n)) { list.Add( new FunctionSet( t, n, p ) ); // add function declaration ! Console.Write( "Function: " ); } else { Console.Write( "Ignored function: " ); } - Console.WriteLine( n ); Debug.WriteLine( "Exiting Function.add(string)" ); --- 188,199 ---- if (valid(n)) { list.Add( new FunctionSet( t, n, p ) ); // add function declaration ! if (!quiet) { ! Console.Write( "Function: " ); ! Console.WriteLine( n ); ! } } else { Console.Write( "Ignored function: " ); + Console.WriteLine( n ); } Debug.WriteLine( "Exiting Function.add(string)" ); *************** *** 340,348 **** for ( int i=0; i<fs.parameters.Count; i++ ) { ps = (ParamSet)fs.parameters[i]; ! writer.WriteLine( " " ); ! writer.WriteLine( "par_"+fs.name+i.ToString() ); ! writer.WriteLine( " = " ); ! writer.WriteLine( ps.name ); ! writer.WriteLine( ";\n" ); } writer.Write( " " ); --- 345,353 ---- for ( int i=0; i<fs.parameters.Count; i++ ) { ps = (ParamSet)fs.parameters[i]; ! writer.Write( " " ); ! writer.Write( "par_"+fs.name+i.ToString() ); ! writer.Write( " = " ); ! writer.Write( ps.name ); ! writer.Write( ";\n" ); } writer.Write( " " ); *************** *** 356,360 **** if (i<fs.parameters.Count-1) writer.Write( ", " ); } ! writer.Write( " );" ); writer.WriteLine( " }" ); --- 361,365 ---- if (i<fs.parameters.Count-1) writer.Write( ", " ); } ! writer.WriteLine( " );" ); writer.WriteLine( " }" ); Index: define.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/define.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** define.cs 12 Jul 2004 17:17:56 -0000 1.1.1.1 --- define.cs 19 Sep 2004 18:51:03 -0000 1.2 *************** *** 15,18 **** --- 15,20 ---- public class Define { + protected bool quiet=false; + /** \brief StreamWriter for ouput. * *************** *** 32,39 **** * @param w the StreamWriter instance which is used for output. */ ! public Define( StreamWriter w ) { Debug.Indent(); Debug.WriteLine( "Entering Define.Define(StreamWriter)" ); writer = w; list = new SortedList( System.Collections.Comparer.Default ); --- 34,42 ---- * @param w the StreamWriter instance which is used for output. */ ! public Define( StreamWriter w, bool _quiet ) { Debug.Indent(); Debug.WriteLine( "Entering Define.Define(StreamWriter)" ); + quiet = _quiet; writer = w; list = new SortedList( System.Collections.Comparer.Default ); *************** *** 67,72 **** while (q.Count>0) { s = (string)q.Dequeue(); // get nonrelevant key ! Console.Write( "Remove nonrelevant define: "); ! Console.WriteLine( s ); list.Remove( s ); // remove statement --- 70,77 ---- while (q.Count>0) { s = (string)q.Dequeue(); // get nonrelevant key ! if (!quiet) { ! Console.Write( "Remove nonrelevant define: "); ! Console.WriteLine( s ); ! } list.Remove( s ); // remove statement *************** *** 187,194 **** if (!list.ContainsKey(n)) { list.Add( n, i ); ! Console.Write( "Define: " ); ! Console.Write( n ); ! Console.Write( " := " ); ! Console.WriteLine( i ); } --- 192,201 ---- if (!list.ContainsKey(n)) { list.Add( n, i ); ! if (!quiet) { ! Console.Write( "Define: " ); ! Console.Write( n ); ! Console.Write( " := " ); ! Console.WriteLine( i ); ! } } Index: generator.cs =================================================================== RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/generator.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** generator.cs 11 Sep 2004 19:36:36 -0000 1.9 --- generator.cs 19 Sep 2004 18:51:03 -0000 1.10 *************** *** 43,47 **** protected Configuration config; ! /** \brief The constructor Generator is the main entry point. --- 43,47 ---- protected Configuration config; ! protected bool quiet = false; /** \brief The constructor Generator is the main entry point. *************** *** 64,68 **** createClass(); } ! } Debug.WriteLine( "Exiting Generator.Generator(string[])" ); --- 64,75 ---- createClass(); } ! } else if (args.Length==2) { ! if ( (args[0] == "-q") || (args[0]=="--quiet") ) { ! quiet = true; ! Debug.WriteLine( "Loading Configuration" ); ! loadConfig( args[1] ); ! createClass(); ! } ! } Debug.WriteLine( "Exiting Generator.Generator(string[])" ); *************** *** 80,86 **** FileStream fs = new FileStream( config.outputFile, FileMode.Create, FileAccess.Write ); // Open or create file with write access writer = new StreamWriter( fs ); // bind stream to file ! define = new Define( writer ); // initialize define compiler ! typedef = new TypeDef( writer, config.baseTypes, config.DelegateAttribute ); // initialize typedef compiler ! function = new Function( writer, typedef, config.DllImportFlags, config.DllImportAttributes, config.linkLibrary, config.ignoreFunctions ); // initiaize function compiler writeHeader(); // write file header --- 87,93 ---- FileStream fs = new FileStream( config.outputFile, FileMode.Create, FileAccess.Write ); // Open or create file with write access writer = new StreamWriter( fs ); // bind stream to file ! define = new Define( writer, quiet ); // initialize define compiler ! typedef = new TypeDef( writer, config.baseTypes, config.DelegateAttribute, quiet ); // initialize typedef compiler ! function = new Function( writer, typedef, config.DllImportFlags, config.DllImportAttributes, config.linkLibrary, config.ignoreFunctions, quiet ); // initiaize function compiler writeHeader(); // write file header *************** *** 121,125 **** Debug.WriteLine( "Loading typdef statements" ); ! Console.Write( "Laoding typedef statements in " ); Console.WriteLine( (string)config.typedefFiles[i] ); try { --- 128,132 ---- Debug.WriteLine( "Loading typdef statements" ); ! Console.Write( "Loading typedef statements in " ); Console.WriteLine( (string)config.typedefFiles[i] ); try { |