Skip to content

Commit d523941

Browse files
committed
Changed deprecated methods and Monodevelop files added to gitignore
1 parent af729f5 commit d523941

12 files changed

Lines changed: 25 additions & 15 deletions

File tree

.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ publish/
124124
# Publish Web Output
125125
*.[Pp]ublish.xml
126126
*.azurePubxml
127-
# TODO: Comment the next line if you want to checkin your web deploy settings
127+
# TODO: Comment the next line if you want to checkin your web deploy settings
128128
# but database connection strings (with potential passwords) will be unencrypted
129129
*.pubxml
130130
*.publishproj
@@ -181,3 +181,13 @@ UpgradeLog*.htm
181181

182182
# Microsoft Fakes
183183
FakesAssemblies/
184+
185+
#MonoDevelop
186+
#User Specific
187+
*.userprefs
188+
*.usertasks
189+
190+
#Mono Project Files
191+
*.pidb
192+
*.resources
193+
test-results/

OpenTKTutorial1/OpenTKTutorial1/Game.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected override void OnRenderFrame(FrameEventArgs e)
3636
* The first step is to tell OpenGL we want to draw something. We do this with the GL.Begin function.
3737
* This takes a single parameter, which is the drawing mode to use.
3838
* There are options to draw quadrilaterals, triangles, points, polygons, and "strips".*/
39-
GL.Begin(BeginMode.Triangles);
39+
GL.Begin(PrimitiveType.Triangles);
4040

4141
/* Now that we've told it how we want to draw, we need to give it the vertices for our shape.
4242
* To do this, we use the GL.Vertex3 function. It takes three floats as coordinates for a single point in 3D space.*/

OpenTKTutorial4/OpenTKTutorial4/Cube.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public override Vector3[] GetColorData()
7777

7878
public override void CalculateModelMatrix()
7979
{
80-
ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
80+
ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
8181
}
8282
}
8383
}

OpenTKTutorial4/OpenTKTutorial4/Sierpinski.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public override int[] GetIndices(int offset = 0)
6767

6868
public override void CalculateModelMatrix()
6969
{
70-
ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
70+
ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
7171
}
7272

7373
}

OpenTKTutorial4/OpenTKTutorial4/Tetra.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public override Vector3[] GetColorData()
9393

9494
public override void CalculateModelMatrix()
9595
{
96-
ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
96+
ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
9797
}
9898
}
9999
}

OpenTKTutorial5/OpenTKTutorial5/Cube.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public override Vector3[] GetColorData()
7777

7878
public override void CalculateModelMatrix()
7979
{
80-
ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
80+
ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
8181
}
8282
}
8383
}

OpenTKTutorial6/OpenTKTutorial6/Cube.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public override Vector3[] GetColorData()
7777

7878
public override void CalculateModelMatrix()
7979
{
80-
ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
80+
ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
8181
}
8282

8383
public override Vector2[] GetTextureCoords()

OpenTKTutorial6/OpenTKTutorial6/ShaderProgram.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public void Link()
6666

6767
Console.WriteLine(GL.GetProgramInfoLog(ProgramID));
6868

69-
GL.GetProgram(ProgramID, ProgramParameter.ActiveAttributes, out AttributeCount);
70-
GL.GetProgram(ProgramID, ProgramParameter.ActiveUniforms, out UniformCount);
69+
GL.GetProgram(ProgramID, GetProgramParameterName.ActiveAttributes, out AttributeCount);
70+
GL.GetProgram(ProgramID, GetProgramParameterName.ActiveUniforms, out UniformCount);
7171

7272
for (int i = 0; i < AttributeCount; i++)
7373
{

OpenTKTutorial8-1/OpenTKTutorial8/Cube.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public override Vector3[] GetColorData()
7777

7878
public override void CalculateModelMatrix()
7979
{
80-
ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
80+
ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
8181
}
8282

8383
public override Vector2[] GetTextureCoords()

OpenTKTutorial8-1/OpenTKTutorial8/ObjVolume.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public override Vector2[] GetTextureCoords()
8080
/// </summary>
8181
public override void CalculateModelMatrix()
8282
{
83-
ModelMatrix = Matrix4.Scale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
83+
ModelMatrix = Matrix4.CreateScale(Scale) * Matrix4.CreateRotationX(Rotation.X) * Matrix4.CreateRotationY(Rotation.Y) * Matrix4.CreateRotationZ(Rotation.Z) * Matrix4.CreateTranslation(Position);
8484
}
8585

8686
/// <summary>

0 commit comments

Comments
 (0)