ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-26 00:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed several code instances that relies on C# 3.0 features.

Browse source
This commit is contained in:
the_fiddler 2009-09-07 23:28:59 +00:00
parent 837604a1a6
commit 856e13fcb8
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Source/Examples/OpenGL/EXT/GeometryShaderAdvanced.cs
View file

@ -82,6 +82,13 @@ namespace Examples.Tutorial
{ {
public Vector3 Position, Normal; public Vector3 Position, Normal;
public Vector2 Texture; public Vector2 Texture;
public VertexPositionNormalTexture(Vector3 position, Vector3 normal, Vector2 texture)
{
Position = position;
Normal = normal;
Texture = texture;
}
} }
#region Fields #region Fields
@ -1015,7 +1022,7 @@ namespace Examples.Tutorial
static VertexPositionNormalTexture[] CalculateSphereVertices(float radius, float height, byte segments, byte rings) static VertexPositionNormalTexture[] CalculateSphereVertices(float radius, float height, byte segments, byte rings)
{ {
var data = new VertexPositionNormalTexture[segments * rings]; VertexPositionNormalTexture[] data = new VertexPositionNormalTexture[segments * rings];
int i = 0; int i = 0;
@ -1026,20 +1033,16 @@ namespace Examples.Tutorial
{ {
double theta = (x / (segments - 1)) * 2 * Math.PI; double theta = (x / (segments - 1)) * 2 * Math.PI;
Vector3 v = new Vector3() Vector3 v = new Vector3(
{ (float)(radius * Math.Sin(phi) * Math.Cos(theta)),
X = (float)(radius * Math.Sin(phi) * Math.Cos(theta)), (float)(height * Math.Cos(phi)),
Y = (float)(height * Math.Cos(phi)), (float)(radius * Math.Sin(phi) * Math.Sin(theta)));
Z = (float)(radius * Math.Sin(phi) * Math.Sin(theta)),
};
Vector3 n = Vector3.Normalize(v); Vector3 n = Vector3.Normalize(v);
Vector2 uv = new Vector2() Vector2 uv = new Vector2(
{ (float)(x / (segments - 1)),
X = (float)(x / (segments - 1)), (float)(y / (rings - 1)));
Y = (float)(y / (rings - 1))
};
// Using data[i++] causes i to be incremented multiple times in Mono 2.2 (bug #479506). // Using data[i++] causes i to be incremented multiple times in Mono 2.2 (bug #479506).
data[i] = new VertexPositionNormalTexture() { Position = v, Normal = n, Texture = uv }; data[i] = new VertexPositionNormalTexture(v, n, uv);
i++; i++;
} }
@ -1050,8 +1053,8 @@ namespace Examples.Tutorial
static ushort[] CalculateSphereElements(float radius, float height, byte segments, byte rings) static ushort[] CalculateSphereElements(float radius, float height, byte segments, byte rings)
{ {
var num_vertices = segments * rings; int num_vertices = segments * rings;
var data = new ushort[num_vertices * 6]; ushort[] data = new ushort[num_vertices * 6];
ushort i = 0; ushort i = 0;