diff --git a/2.5DHero/2.5DHero/Entites/Entity.vb b/2.5DHero/2.5DHero/Entites/Entity.vb index df8d2d450..172cd90f9 100644 --- a/2.5DHero/2.5DHero/Entites/Entity.vb +++ b/2.5DHero/2.5DHero/Entites/Entity.vb @@ -359,7 +359,7 @@ Return Me.Position + Me.GetCenter() End Function - Protected Overridable Function CalculateCameraDistance(CPosition As Vector3) as Single + Protected Overridable Function CalculateCameraDistance(CPosition As Vector3) As Single Return Vector3.Distance(Me.GetCameraDistanceCenterPoint(), CPosition) End Function @@ -377,11 +377,11 @@ CameraDistance = CalculateCameraDistance(CPosition) - + If Me.DropUpdateUnlessDrawn = True And Me.DrawnLastFrame = False And Me.Visible = True And ActionScriptActive = False Then Exit Sub End If - + If Me.Moved > 0.0F And Me.CanMove = True Then Me.Moved -= Me.Speed @@ -609,4 +609,4 @@ Return Nothing End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/2D/BillModel.vb b/2.5DHero/2.5DHero/Resources/Models/2D/BillModel.vb index e04d2dad7..58f02dac7 100644 --- a/2.5DHero/2.5DHero/Resources/Models/2D/BillModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/2D/BillModel.vb @@ -3,19 +3,18 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), Vector3.Backward, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), Vector3.Backward, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), Vector3.Backward, New Vector2(1, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), Vector3.Backward, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0), Vector3.Backward, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), Vector3.Backward, New Vector2(0, 1))) - Me.ID = 3 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), Vector3.Backward, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), Vector3.Backward, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), Vector3.Backward, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), Vector3.Backward, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0), Vector3.Backward, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), Vector3.Backward, New Vector2(0, 1)) + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/2D/CrossModel.vb b/2.5DHero/2.5DHero/Resources/Models/2D/CrossModel.vb index 866337a70..04344d135 100644 --- a/2.5DHero/2.5DHero/Resources/Models/2D/CrossModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/2D/CrossModel.vb @@ -3,35 +3,30 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), Vector3.Backward, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), Vector3.Backward, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), Vector3.Backward, New Vector2(1, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), Vector3.Backward, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0), Vector3.Backward, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), Vector3.Backward, New Vector2(0, 1))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, 0.5, -0.5), Vector3.Backward, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, -0.5, -0.5), Vector3.Backward, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, -0.5, 0), Vector3.Backward, New Vector2(1, 1))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, -0.5, 0), Vector3.Backward, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), Vector3.Backward, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, 0.5, -0.5), Vector3.Backward, New Vector2(0, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), Vector3.Backward, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, -0.5, 0), Vector3.Backward, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, -0.5, 0.5), Vector3.Backward, New Vector2(1, 1))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, -0.5, 0.5), Vector3.Backward, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, 0.5, 0.5), Vector3.Backward, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), Vector3.Backward, New Vector2(0, 0))) - Me.ID = 13 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), Vector3.Backward, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), Vector3.Backward, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), Vector3.Backward, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), Vector3.Backward, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0), Vector3.Backward, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), Vector3.Backward, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(0, 0.5, -0.5), Vector3.Backward, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0, -0.5, -0.5), Vector3.Backward, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(0, -0.5, 0), Vector3.Backward, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(0, -0.5, 0), Vector3.Backward, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), Vector3.Backward, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0, 0.5, -0.5), Vector3.Backward, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), Vector3.Backward, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0, -0.5, 0), Vector3.Backward, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(0, -0.5, 0.5), Vector3.Backward, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(0, -0.5, 0.5), Vector3.Backward, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(0, 0.5, 0.5), Vector3.Backward, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), Vector3.Backward, New Vector2(0, 0)) + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/2D/DoubleFloorModel.vb b/2.5DHero/2.5DHero/Resources/Models/2D/DoubleFloorModel.vb index 593595e8b..13d0794d8 100644 --- a/2.5DHero/2.5DHero/Resources/Models/2D/DoubleFloorModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/2D/DoubleFloorModel.vb @@ -3,27 +3,24 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Up, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Up, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), Vector3.Up, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), Vector3.Up, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - Me.ID = 14 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Up, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Up, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), Vector3.Up, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), Vector3.Up, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1)) + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/2D/FloorModel.vb b/2.5DHero/2.5DHero/Resources/Models/2D/FloorModel.vb index 75c1ba012..4833b50ae 100644 --- a/2.5DHero/2.5DHero/Resources/Models/2D/FloorModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/2D/FloorModel.vb @@ -3,19 +3,18 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Up, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Up, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - Me.ID = 0 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Up, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Up, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1)) + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/BaseModel.vb b/2.5DHero/2.5DHero/Resources/Models/BaseModel.vb index 3207df978..38c073197 100644 --- a/2.5DHero/2.5DHero/Resources/Models/BaseModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/BaseModel.vb @@ -1,12 +1,9 @@ Public Class BaseModel - Public Shared vertexData As New List(Of VertexPositionNormalTexture) - + Public ID As Integer = 0 Public vertexBuffer As VertexBuffer - Public ID As Integer = 0 - - Public Sub Setup() + Protected Sub Setup(ByVal vertexData As VertexPositionNormalTexture()) vertexBuffer = New VertexBuffer(Core.GraphicsDevice, GetType(VertexPositionNormalTexture), vertexData.Count, BufferUsage.WriteOnly) vertexBuffer.SetData(vertexData.ToArray()) End Sub @@ -137,13 +134,13 @@ Return PyramidModel Case 16 Return StairsModel - Case 17 + Case 17 Return DiagonalWallModel - Case 18 + Case 18 Return HalfDiagonalWallModel Case Else Return BlockModel End Select End Function -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Blocks/BlockModel.vb b/2.5DHero/2.5DHero/Resources/Models/Blocks/BlockModel.vb index 807812cc9..0276b1170 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Blocks/BlockModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Blocks/BlockModel.vb @@ -3,51 +3,42 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'e - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'h - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'f - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0))) 'g - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'd - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'f - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0))) 'g - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), Vector3.Up, New Vector2(0, 0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0))) 'g - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0))) 'g - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), Vector3.Up, New Vector2(1, 1))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1))) 'd - Me.ID = 1 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'h + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0)), 'h + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'f + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'f + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0)), 'h + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0)), 'g + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'f + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'f + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0)), 'g + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1)), 'd + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), Vector3.Up, New Vector2(0, 0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0)), 'g + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0)), 'g + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), Vector3.Up, New Vector2(1, 1)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1)) 'd + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Blocks/CornerModel.vb b/2.5DHero/2.5DHero/Resources/Models/Blocks/CornerModel.vb index f10e82d8e..387a6fdf3 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Blocks/CornerModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Blocks/CornerModel.vb @@ -3,27 +3,24 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0))) 'e - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'b - Me.ID = 5 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)) 'b + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Blocks/CubeModel.vb b/2.5DHero/2.5DHero/Resources/Models/Blocks/CubeModel.vb index 0e752a20b..839505a8c 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Blocks/CubeModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Blocks/CubeModel.vb @@ -3,59 +3,48 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'd - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0))) 'g - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0))) 'g - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'f - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), Vector3.Up, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), Vector3.Up, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Down, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Down, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Down, New Vector2(1, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Down, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Down, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Down, New Vector2(0, 1))) - Me.ID = 12 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0)), 'g + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0)), 'f + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'f + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0)), 'g + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'f + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), Vector3.Up, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), Vector3.Up, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Down, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Down, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Down, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Down, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Down, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Down, New Vector2(0, 1)) + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Blocks/DiagonalWallModel.vb b/2.5DHero/2.5DHero/Resources/Models/Blocks/DiagonalWallModel.vb index 7572c23b1..00db607d7 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Blocks/DiagonalWallModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Blocks/DiagonalWallModel.vb @@ -3,31 +3,24 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - 'This wall will start from 1 point and end at the opposite point diagonally - - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'A - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'H - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'C - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'A - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'F - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'H - - 'These will be the same triangles but from the opposite direction, this way it can be rendered from both directions or just from one direction - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'A - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0))) 'C - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'H - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'A - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'H - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'F - Me.ID = 17 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'A + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'H + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'C + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'A + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'F + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'H + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'A + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0)), 'C + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'H + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'A + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'H + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)) 'F + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Blocks/HalfDiagonalWallModel.vb b/2.5DHero/2.5DHero/Resources/Models/Blocks/HalfDiagonalWallModel.vb index bb6bdef77..608d2d82f 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Blocks/HalfDiagonalWallModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Blocks/HalfDiagonalWallModel.vb @@ -3,31 +3,24 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - 'This wall will start from 1 point and end at the opposite middle point diagonally - - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'AB - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'H - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'CD - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'AB - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'F - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'H - - 'These will be the same triangles but from the opposite direction, this way it can be rendered from both directions or just from one direction - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'AB - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), New Vector3(0, 0, -1), New Vector2(0.0, 0.0))) 'CD - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'H - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'AB - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'H - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'F - Me.ID = 18 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'AB + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'H + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'CD + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'AB + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'F + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'H + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'AB + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0), New Vector3(0, 0, -1), New Vector2(0.0, 0.0)), 'CD + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'H + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'AB + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'H + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)) 'F + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Blocks/InsideCornerModel.vb b/2.5DHero/2.5DHero/Resources/Models/Blocks/InsideCornerModel.vb index 121c2b405..bf38e6d0f 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Blocks/InsideCornerModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Blocks/InsideCornerModel.vb @@ -3,43 +3,36 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'd - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'e - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0))) 'f - Me.ID = 6 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0)), 'f + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0)), 'f + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0)) 'f + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Blocks/PyramidModel.vb b/2.5DHero/2.5DHero/Resources/Models/Blocks/PyramidModel.vb index 9cb832429..16e1b1d37 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Blocks/PyramidModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Blocks/PyramidModel.vb @@ -3,27 +3,24 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), New Vector3(-1, 0, 0), New Vector2(0.5, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), New Vector3(0, 0, 1), New Vector2(0.5, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), New Vector3(1, 0, 0), New Vector2(0.5, 0.0))) 'e - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), New Vector3(0, 0, -1), New Vector2(0.5, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'b - Me.ID = 15 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), New Vector3(-1, 0, 0), New Vector2(0.5, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), New Vector3(0, 0, 1), New Vector2(0.5, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), New Vector3(1, 0, 0), New Vector2(0.5, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0, 0.5, 0), New Vector3(0, 0, -1), New Vector2(0.5, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)) 'b + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Blocks/SlideModel.vb b/2.5DHero/2.5DHero/Resources/Models/Blocks/SlideModel.vb index fc3178750..98642dea5 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Blocks/SlideModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Blocks/SlideModel.vb @@ -3,35 +3,30 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'd - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0, 1))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(1, 0))) - Me.ID = 2 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.5), New Vector3(0, 0, -1), New Vector2(1, 0)) + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Blocks/StairsModel.vb b/2.5DHero/2.5DHero/Resources/Models/Blocks/StairsModel.vb index f65a12c68..745921fe0 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Blocks/StairsModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Blocks/StairsModel.vb @@ -3,101 +3,66 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - 'Lower stair, front: - 'left vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) - 'right vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) - - 'Lower stair, top: - 'Left vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0), New Vector3(0, 1, 0), New Vector2(0.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, 0), New Vector3(0, 1, 0), New Vector2(1.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0.5), New Vector3(0, 1, 0), New Vector2(0.0, 0.5))) - 'Right vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, 0), New Vector3(0, 1, 0), New Vector2(1.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, 0.5), New Vector3(0, 1, 0), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0.5), New Vector3(0, 1, 0), New Vector2(0.0, 0.5))) - - 'Upper stair, front: - 'left vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 0, 1), New Vector2(0.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), New Vector3(0, 0, 1), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) - 'right vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), New Vector3(0, 0, 1), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, 0), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) - - 'Upper stair, top: - 'Left vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 1, 0), New Vector2(0.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 1, 0), New Vector2(1.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 1, 0), New Vector2(0.0, 0.5))) - 'Right vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 1, 0), New Vector2(1.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), New Vector3(0, 1, 0), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 1, 0), New Vector2(0.0, 0.5))) - - 'Back: - 'Left vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) - 'Right vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) - - 'Left side, lower: - 'Left vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) - 'Right vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) - - 'Left side, upper: - 'Left vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(-1, 0, 0), New Vector2(0.5, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.5))) - 'Right vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(-1, 0, 0), New Vector2(0.5, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0), New Vector3(-1, 0, 0), New Vector2(0.5, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.5))) - - 'Right side, lower: - 'Left vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) - 'Right vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) - - 'Right side, upper: - 'Left vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), New Vector3(1, 0, 0), New Vector2(0.5, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, 0), New Vector3(1, 0, 0), New Vector2(0.5, 0.5))) - 'Right vertex: - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.5))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0, 0), New Vector3(1, 0, 0), New Vector2(0.5, 0.5))) - Me.ID = 16 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0), New Vector3(0, 1, 0), New Vector2(0.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, 0), New Vector3(0, 1, 0), New Vector2(1.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0.5), New Vector3(0, 1, 0), New Vector2(0.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, 0), New Vector3(0, 1, 0), New Vector2(1.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, 0.5), New Vector3(0, 1, 0), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0.5), New Vector3(0, 1, 0), New Vector2(0.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 0, 1), New Vector2(0.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), New Vector3(0, 0, 1), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), New Vector3(0, 0, 1), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, 0), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 1, 0), New Vector2(0.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 1, 0), New Vector2(1.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 1, 0), New Vector2(0.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 1, 0), New Vector2(1.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), New Vector3(0, 1, 0), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(0, 1, 0), New Vector2(0.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(-1, 0, 0), New Vector2(0.5, 0.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0), New Vector3(-1, 0, 0), New Vector2(0.5, 0.0)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, 0), New Vector3(-1, 0, 0), New Vector2(0.5, 0.5)), + New VertexPositionNormalTexture(New Vector3(-0.5, 0, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0), New Vector3(1, 0, 0), New Vector2(0.5, 0.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, 0), New Vector3(1, 0, 0), New Vector2(0.5, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.5)), + New VertexPositionNormalTexture(New Vector3(0.5, 0, 0), New Vector3(1, 0, 0), New Vector2(0.5, 0.5)) + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffCornerModel.vb b/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffCornerModel.vb index ab37ab1bc..590bbae9e 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffCornerModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffCornerModel.vb @@ -3,35 +3,30 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Up, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Up, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.25), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, 0.25), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0))) 'e - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.25), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, 0.25), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'b - Me.ID = 11 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Up, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Up, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.25), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, 0.25), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.25), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, 0.25), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)) 'b + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffInsideModel.vb b/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffInsideModel.vb index 95295aeaf..2bd758504 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffInsideModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffInsideModel.vb @@ -3,35 +3,30 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Up, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Up, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.25), Vector3.Forward, New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), Vector3.Forward, New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.25), Vector3.Forward, New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.25), Vector3.Forward, New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), Vector3.Forward, New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), Vector3.Forward, New Vector2(1.0, 0.0))) 'd - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - Me.ID = 10 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Up, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Up, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.25), Vector3.Forward, New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), Vector3.Forward, New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.25), Vector3.Forward, New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.25), Vector3.Forward, New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), Vector3.Forward, New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), Vector3.Forward, New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.25, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0)), 'f + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)) 'e + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffModel.vb b/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffModel.vb index c6bff4cc2..da49a2f57 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Cliffs/CliffModel.vb @@ -3,27 +3,24 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Up, New Vector2(0, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Up, New Vector2(1, 1))) - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1))) - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.25), Vector3.Forward, New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), Vector3.Forward, New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.25), Vector3.Forward, New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.25), Vector3.Forward, New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), Vector3.Forward, New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), Vector3.Forward, New Vector2(1.0, 0.0))) 'd - Me.ID = 9 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), Vector3.Up, New Vector2(0, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), Vector3.Up, New Vector2(1, 0)), + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), Vector3.Up, New Vector2(1, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), Vector3.Up, New Vector2(0, 1)), + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.25), Vector3.Forward, New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), Vector3.Forward, New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.25), Vector3.Forward, New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.25), Vector3.Forward, New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), Vector3.Forward, New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), Vector3.Forward, New Vector2(1.0, 0.0)) 'd + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Other/SignModel.vb b/2.5DHero/2.5DHero/Resources/Models/Other/SignModel.vb index 0840bec06..c01f4d69f 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Other/SignModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Other/SignModel.vb @@ -3,43 +3,36 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.1), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.1), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.1), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.1), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.1), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.1), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'd - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.1), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.1), New Vector3(1, 0, 0), New Vector2(0.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.1), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.1), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.1), New Vector3(1, 0, 0), New Vector2(0.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.1), New Vector3(1, 0, 0), New Vector2(1.0, 0.0))) 'g - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.1), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.1), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.1), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.1), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.1), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.1), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.1), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.1), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.1), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.1), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.1), New Vector3(0, 0, -1), New Vector2(0.0, 0.0))) 'g - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.1), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'f - Me.ID = 4 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.1), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.1), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.1), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.1), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.1), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.1), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.1), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.1), New Vector3(1, 0, 0), New Vector2(0.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.1), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.1), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, 0.1), New Vector3(1, 0, 0), New Vector2(0.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.1), New Vector3(1, 0, 0), New Vector2(1.0, 0.0)), 'g + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.1), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.1), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.1), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.1), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.1), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0)), 'f + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, 0.1), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.1), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'f + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.1), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.1), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.1), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, 0.5, -0.1), New Vector3(0, 0, -1), New Vector2(0.0, 0.0)), 'g + New VertexPositionNormalTexture(New Vector3(-0.5, 0.5, -0.1), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)) 'f + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Steps/InsideStepModel.vb b/2.5DHero/2.5DHero/Resources/Models/Steps/InsideStepModel.vb index fa126a689..5006f0a21 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Steps/InsideStepModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Steps/InsideStepModel.vb @@ -3,43 +3,36 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'd - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0))) 'f - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0))) 'e - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'f - Me.ID = 8 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 0.0)), 'f + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 0.0)), 'f + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(1.0, 1.0)), 'd + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)) 'f + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class diff --git a/2.5DHero/2.5DHero/Resources/Models/Steps/StepModel.vb b/2.5DHero/2.5DHero/Resources/Models/Steps/StepModel.vb index 6f899b418..253ab7f5e 100644 --- a/2.5DHero/2.5DHero/Resources/Models/Steps/StepModel.vb +++ b/2.5DHero/2.5DHero/Resources/Models/Steps/StepModel.vb @@ -3,35 +3,30 @@ Inherits BaseModel Public Sub New() - vertexData.Clear() - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0))) 'd - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0))) 'c - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0))) 'h - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0))) 'a - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(1, 0))) 'e - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1, 1))) 'a - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0, 1))) 'b - - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0, 1))) 'b - vertexData.Add(New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(0, 0))) 'd - vertexData.Add(New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(1, 0))) 'e - Me.ID = 7 - Setup() + Dim vertexData = New VertexPositionNormalTexture() { + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(0.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(0, 0, 1), New Vector2(1.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 1.0)), 'c + New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(1, 0, 0), New Vector2(0.0, 0.0)), 'd + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(1, 0, 0), New Vector2(1.0, 1.0)), 'b + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 0.0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, 0.5), New Vector3(-1, 0, 0), New Vector2(1.0, 1.0)), 'h + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(-1, 0, 0), New Vector2(0.0, 1.0)), 'a + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(1, 0)), 'e + New VertexPositionNormalTexture(New Vector3(-0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(1, 1)), 'a + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0, 1)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.5, -0.5), New Vector3(0, 0, -1), New Vector2(0, 1)), 'b + New VertexPositionNormalTexture(New Vector3(0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(0, 0)), 'd + New VertexPositionNormalTexture(New Vector3(-0.5, -0.25, 0.5), New Vector3(0, 0, -1), New Vector2(1, 0)) 'e + } + + Setup(vertexData) End Sub -End Class \ No newline at end of file +End Class