[Agate-svn-commit] SF.net SVN: agate:[997] branches/agate3d-3.2
Status: Alpha
Brought to you by:
kanato
Menu
▾
▴
[Agate-svn-commit] SF.net SVN: agate:[997] branches/agate3d-3.2
|
From: <ka...@us...> - 2009-05-20 04:04:28
|
Revision: 997
http://agate.svn.sourceforge.net/agate/?rev=997&view=rev
Author: kanato
Date: 2009-05-20 04:04:18 +0000 (Wed, 20 May 2009)
Log Message:
-----------
Add RenderStates test.
Add support for ZBufferTest in SDX.
Modified Paths:
--------------
branches/agate3d-3.2/AgateLib/DisplayLib/RenderStateAdapter.cs
branches/agate3d-3.2/Drivers/AgateSDX/D3DDevice.cs
branches/agate3d-3.2/Drivers/AgateSDX/SDX_Display.cs
Added Paths:
-----------
branches/agate3d-3.2/Tests/DisplayTests/RenderStates/
branches/agate3d-3.2/Tests/DisplayTests/RenderStates/RenderStates.cs
branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.Designer.cs
branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.cs
branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.resx
Modified: branches/agate3d-3.2/AgateLib/DisplayLib/RenderStateAdapter.cs
===================================================================
--- branches/agate3d-3.2/AgateLib/DisplayLib/RenderStateAdapter.cs 2009-05-20 03:43:15 UTC (rev 996)
+++ branches/agate3d-3.2/AgateLib/DisplayLib/RenderStateAdapter.cs 2009-05-20 04:04:18 UTC (rev 997)
@@ -41,7 +41,6 @@
}
}
-
public bool ZBufferTest
{
get
Modified: branches/agate3d-3.2/Drivers/AgateSDX/D3DDevice.cs
===================================================================
--- branches/agate3d-3.2/Drivers/AgateSDX/D3DDevice.cs 2009-05-20 03:43:15 UTC (rev 996)
+++ branches/agate3d-3.2/Drivers/AgateSDX/D3DDevice.cs 2009-05-20 04:04:18 UTC (rev 997)
@@ -102,19 +102,8 @@
mDevice.Dispose();
mDevice = null;
}
- //if (mSurfaceVB != null)
- //{
- // mSurfaceVB.Dispose();
- // mSurfaceVB = null;
- //}
}
- //private void CreateSurfaceVB()
- //{
- // //mSurfaceVB = new VertexBuffer(mDevice, SurfaceVBSize,
- // // Usage.WriteOnly | Usage.Dynamic, CustomVertex.TransformedColoredTextured.Format,
- // // Pool.Default);
- //}
public Device Device
{
get { return mDevice; }
Modified: branches/agate3d-3.2/Drivers/AgateSDX/SDX_Display.cs
===================================================================
--- branches/agate3d-3.2/Drivers/AgateSDX/SDX_Display.cs 2009-05-20 03:43:15 UTC (rev 996)
+++ branches/agate3d-3.2/Drivers/AgateSDX/SDX_Display.cs 2009-05-20 04:04:18 UTC (rev 997)
@@ -1078,6 +1078,7 @@
switch (renderStateBool)
{
case RenderStateBool.WaitForVerticalBlank: return mVSync;
+ case RenderStateBool.ZBufferTest: return mDevice.Device.GetRenderState<bool>(RenderState.ZEnable);
default:
throw new NotSupportedException(string.Format(
"The specified render state, {0}, is not supported by this driver."));
@@ -1093,6 +1094,10 @@
OnVSyncChanged();
break;
+ case RenderStateBool.ZBufferTest:
+ mDevice.Device.SetRenderState(RenderState.ZEnable, value);
+ return;
+
default:
throw new NotSupportedException(string.Format(
"The specified render state, {0}, is not supported by this driver."));
Added: branches/agate3d-3.2/Tests/DisplayTests/RenderStates/RenderStates.cs
===================================================================
--- branches/agate3d-3.2/Tests/DisplayTests/RenderStates/RenderStates.cs (rev 0)
+++ branches/agate3d-3.2/Tests/DisplayTests/RenderStates/RenderStates.cs 2009-05-20 04:04:18 UTC (rev 997)
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AgateLib;
+
+namespace Tests.DisplayTests.RenderStates
+{
+ class RenderStates : IAgateTest
+ {
+
+ #region IAgateTest Members
+
+ public string Name
+ {
+ get { return "Render States"; }
+ }
+
+ public string Category
+ {
+ get { return "Display"; }
+ }
+
+ public void Main(string[] args)
+ {
+ using (AgateSetup setup = new AgateSetup(args))
+ {
+ setup.Initialize(true, false, false);
+ if (setup.WasCanceled)
+ return;
+
+ frmRenderStateTest frm = new frmRenderStateTest();
+ frm.Show();
+
+ int count = 0;
+
+ while (frm.Visible)
+ {
+ frm.UpdateFrame();
+
+ count++;
+ if (count > 60)
+ frm.Text = string.Format("Render States - {0:0.00} FPS", AgateLib.DisplayLib.Display.FramesPerSecond);
+
+ Core.KeepAlive();
+
+
+ }
+ }
+ }
+
+ #endregion
+ }
+}
Added: branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.Designer.cs
===================================================================
--- branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.Designer.cs (rev 0)
+++ branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.Designer.cs 2009-05-20 04:04:18 UTC (rev 997)
@@ -0,0 +1,94 @@
+namespace Tests.DisplayTests.RenderStates
+{
+ partial class frmRenderStateTest
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.agateRenderTarget1 = new AgateLib.WinForms.AgateRenderTarget();
+ this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
+ this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.splitContainer1.Panel1.SuspendLayout();
+ this.splitContainer1.Panel2.SuspendLayout();
+ this.splitContainer1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // agateRenderTarget1
+ //
+ this.agateRenderTarget1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.agateRenderTarget1.Location = new System.Drawing.Point(0, 0);
+ this.agateRenderTarget1.Name = "agateRenderTarget1";
+ this.agateRenderTarget1.Size = new System.Drawing.Size(238, 374);
+ this.agateRenderTarget1.TabIndex = 0;
+ //
+ // propertyGrid1
+ //
+ this.propertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.propertyGrid1.Location = new System.Drawing.Point(0, 0);
+ this.propertyGrid1.Name = "propertyGrid1";
+ this.propertyGrid1.Size = new System.Drawing.Size(362, 374);
+ this.propertyGrid1.TabIndex = 1;
+ //
+ // splitContainer1
+ //
+ this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+ this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer1.Name = "splitContainer1";
+ //
+ // splitContainer1.Panel1
+ //
+ this.splitContainer1.Panel1.Controls.Add(this.agateRenderTarget1);
+ //
+ // splitContainer1.Panel2
+ //
+ this.splitContainer1.Panel2.Controls.Add(this.propertyGrid1);
+ this.splitContainer1.Size = new System.Drawing.Size(604, 374);
+ this.splitContainer1.SplitterDistance = 238;
+ this.splitContainer1.TabIndex = 2;
+ //
+ // frmRenderStateTest
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(604, 374);
+ this.Controls.Add(this.splitContainer1);
+ this.Name = "frmRenderStateTest";
+ this.Text = "frmRenderStateTest";
+ this.splitContainer1.Panel1.ResumeLayout(false);
+ this.splitContainer1.Panel2.ResumeLayout(false);
+ this.splitContainer1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private AgateLib.WinForms.AgateRenderTarget agateRenderTarget1;
+ private System.Windows.Forms.PropertyGrid propertyGrid1;
+ private System.Windows.Forms.SplitContainer splitContainer1;
+ }
+}
\ No newline at end of file
Added: branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.cs
===================================================================
--- branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.cs (rev 0)
+++ branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.cs 2009-05-20 04:04:18 UTC (rev 997)
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using AgateLib.DisplayLib;
+
+namespace Tests.DisplayTests.RenderStates
+{
+ public partial class frmRenderStateTest : Form
+ {
+ DisplayWindow wind;
+
+ public frmRenderStateTest()
+ {
+ InitializeComponent();
+
+ wind = DisplayWindow.CreateFromControl(agateRenderTarget1);
+
+ propertyGrid1.SelectedObject = Display.RenderState;
+ }
+
+ internal void UpdateFrame()
+ {
+ Display.BeginFrame();
+ Display.Clear(AgateLib.Geometry.Color.Green);
+ Display.EndFrame();
+ }
+ }
+}
Added: branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.resx
===================================================================
--- branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.resx (rev 0)
+++ branches/agate3d-3.2/Tests/DisplayTests/RenderStates/frmRenderStateTest.resx 2009-05-20 04:04:18 UTC (rev 997)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
