Merge remote-tracking branch 'refs/remotes/origin/Emb_tower'

2.5DHero/2.5DHero/2.5DHero.vbproj

@@ -1635,6 +1635,8 @@
     <Compile Include="Resources\Models\Blocks\BlockModel.vb" />
     <Compile Include="Resources\Models\Blocks\CornerModel.vb" />
     <Compile Include="Resources\Models\Blocks\CubeModel.vb" />
+    <Compile Include="Resources\Models\Blocks\DiagonalWallModel.vb" />
+    <Compile Include="Resources\Models\Blocks\HalfDiagonalWallModel.vb" />
     <Compile Include="Resources\Models\Blocks\InsideCornerModel.vb" />
     <Compile Include="Resources\Models\Blocks\PyramidModel.vb" />
     <Compile Include="Resources\Models\Blocks\SlideModel.vb" />

2.5DHero/2.5DHero/Resources/Models/BaseModel.vb

@@ -98,6 +98,8 @@
     Public Shared DoubleFloorModel As DoubleFloorModel = New DoubleFloorModel()
     Public Shared PyramidModel As PyramidModel = New PyramidModel()
     Public Shared StairsModel As StairsModel = New StairsModel()
+    Public Shared DiagonalWallModel As DiagonalWallModel = New DiagonalWallModel()
+    Public Shared HalfDiagonalWallModel As HalfDiagonalWallModel = New HalfDiagonalWallModel()
 
     Public Shared Function getModelbyID(ByVal ID As Integer) As BaseModel
         Select Case ID
@@ -135,6 +137,10 @@
                 Return PyramidModel
             Case 16
                 Return StairsModel
+			Case 17
+                Return DiagonalWallModel
+			Case 18
+                Return HalfDiagonalWallModel
             Case Else
                 Return BlockModel
         End Select

2.5DHero/2.5DHero/Resources/Models/Blocks/DiagonalWallModel.vb

@@ -0,0 +1,33 @@
+Public Class DiagonalWallModel
+
+    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()
+    End Sub
+
+End Class

2.5DHero/2.5DHero/Resources/Models/Blocks/HalfDiagonalWallModel.vb

@@ -0,0 +1,33 @@
+Public Class HalfDiagonalWallModel
+
+    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()
+    End Sub
+
+End Class

2.5DHero/2.5DHeroContent/Content/Content.mgcb

@@ -46192,3 +46192,24 @@
 /processorParam:TextureFormat=Compressed
 /build:Models/truck2/Truck.obj
 
+#begin maps/TestMaps/EmbeddedTower.dat
+/copy:maps/TestMaps/EmbeddedTower.dat
+
+#begin maps/TestMaps/test4models.dat
+/copy:maps/TestMaps/test4models.dat
+
+#begin maps/TestMaps/Kings_Landing.dat
+/copy:maps/TestMaps/Kings_Landing.dat
+
+#begin Content/Textures/EmbeddedTower.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Content/Textures/EmbeddedTower.png
+