even more dead code removal
This commit is contained in:
nilllzz
parent
4a8d249f64
commit
de646d5030
|
|
@ -109,7 +109,6 @@
|
|||
<Compile Include="Dialogues\PokemonImageView.vb" />
|
||||
<Compile Include="Dialogues\TextBox.vb" />
|
||||
<Compile Include="Entites\Entity.vb" />
|
||||
<Compile Include="Entites\EntityGroup.vb" />
|
||||
<Compile Include="Entites\Enviroment\AllSidesObject.vb" />
|
||||
<Compile Include="Entites\Enviroment\ApricornPlant.vb" />
|
||||
<Compile Include="Entites\Enviroment\BerryPlant.vb" />
|
||||
|
|
@ -137,7 +136,6 @@
|
|||
<Compile Include="Entites\Enviroment\Water.vb" />
|
||||
<Compile Include="Entites\Enviroment\Waterfall.vb" />
|
||||
<Compile Include="Entites\Enviroment\Whirlpool.vb" />
|
||||
<Compile Include="Entites\OcclusionCulling.vb" />
|
||||
<Compile Include="Entites\Other\MessageBulb.vb" />
|
||||
<Compile Include="Entites\Other\NetworkPlayer.vb" />
|
||||
<Compile Include="Entites\Other\NetworkPokemon.vb" />
|
||||
|
|
@ -145,11 +143,6 @@
|
|||
<Compile Include="Entites\Other\OverworldPokemon.vb" />
|
||||
<Compile Include="Entites\Other\OwnPlayer.vb" />
|
||||
<Compile Include="Entites\Other\Particle.vb" />
|
||||
<Compile Include="Exceptions\InvalidEntityTypeException.vb" />
|
||||
<Compile Include="Global Interfaces\ICopyAble.vb" />
|
||||
<Compile Include="Global Interfaces\IDrawAble.vb" />
|
||||
<Compile Include="Global Interfaces\IFocusAble.vb" />
|
||||
<Compile Include="Global Interfaces\IUpdateAble.vb" />
|
||||
<Compile Include="HelperClasses\Animation.vb" />
|
||||
<Compile Include="HelperClasses\BasicObject.vb" />
|
||||
<Compile Include="HelperClasses\Camera.vb" />
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
Public Class BattleAnimationController
|
||||
|
||||
Implements IUpdateAble
|
||||
Implements IDrawAble
|
||||
|
||||
Private _battleScreenInstance As BattleScreen
|
||||
|
||||
'Background:
|
||||
|
|
@ -22,11 +19,11 @@
|
|||
Me.DeApplyShader()
|
||||
End Sub
|
||||
|
||||
Public Sub Update() Implements IUpdateAble.Update
|
||||
Public Sub Update()
|
||||
|
||||
End Sub
|
||||
|
||||
Public Sub Draw() Implements IDrawAble.Draw
|
||||
Public Sub Draw()
|
||||
|
||||
End Sub
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
Public Class EntityGroup
|
||||
|
||||
Inherits Entity
|
||||
|
||||
Public Size As Size
|
||||
Public GroupPosition As Vector3
|
||||
|
||||
Public Sub New(ByVal Entity As Entity, ByVal Rotation As Integer, ByVal Position As Vector3, ByVal Size As Size)
|
||||
'MyBase.New(Position.X, Position.Y, Position.Y, Entity.EntityID, Entity.Textures, Entity.TextureIndex, Entity.Collision, Rotation, Entity.Scale, Entity.Model, Entity.ActionValue, Entity.AdditionalValue, New Vector3(1.0F))
|
||||
|
||||
Me.GroupPosition = Position
|
||||
Me.Size = Size
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
Public Class OcclusionCulling
|
||||
|
||||
Public Shared Sub Draw()
|
||||
If Screen.Level.Entities.Count > 0 Then
|
||||
Dim r As Rectangle = GetTransformed(Screen.Level.OwnPlayer)
|
||||
Debug.Print(r.ToString())
|
||||
Canvas.DrawRectangle(r, Color.Red)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Shared Sub DoCulling(ByVal list As List(Of Entity))
|
||||
Dim pixels(Core.windowSize.Width * Core.windowSize.Height - 1) As Color
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Shared Function GetTransformed(ByVal Entity As Entity) As Rectangle
|
||||
Dim min As Vector2 = ProjectPoint(Entity.ViewBox.Min)
|
||||
Dim max As Vector2 = ProjectPoint(Entity.ViewBox.Max)
|
||||
|
||||
Debug.Print(min.ToString() & max.ToString())
|
||||
|
||||
Return New Rectangle(CInt(min.X), CInt(min.Y), CInt(max.X - min.X), CInt(max.Y - min.Y))
|
||||
End Function
|
||||
|
||||
Private Shared Function ProjectPoint(ByVal Position As Vector3) As Vector2
|
||||
Dim mat As Matrix = Matrix.Identity * Screen.Camera.View * Screen.Camera.Projection
|
||||
|
||||
Dim v4 As Vector4 = Vector4.Transform(Position, mat)
|
||||
|
||||
Return New Vector2(CSng(((v4.X / v4.W + 1) * (Core.windowSize.Width / 2))), CSng(((1 - v4.Y / v4.W) * (Core.windowSize.Height / 2))))
|
||||
End Function
|
||||
|
||||
End Class
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
Namespace Exceptions
|
||||
|
||||
''' <summary>
|
||||
''' An exception to be thrown when an entity conversion encounters a type error.
|
||||
''' </summary>
|
||||
Public Class InvalidEntityTypeException
|
||||
|
||||
Inherits Exception
|
||||
|
||||
Public Sub New(ByVal FromType As String, ByVal ToType As String)
|
||||
MyBase.New("Invalid conversion from entity type """ & FromType & """ to type """ & ToType & """.")
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
End Namespace
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
''' <summary>
|
||||
''' An interface for classes to implement that can create a copied instance member.
|
||||
''' </summary>
|
||||
Public Interface ICopyAble
|
||||
|
||||
''' <summary>
|
||||
''' Returns a new instance of the class in use.
|
||||
''' </summary>
|
||||
Function Copy() As Object
|
||||
|
||||
End Interface
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
Public Interface IDrawAble
|
||||
|
||||
Sub Draw()
|
||||
|
||||
End Interface
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
Public Interface IFocusAble
|
||||
|
||||
Sub Focus()
|
||||
|
||||
Sub DeFocus()
|
||||
|
||||
Function IsFocused() As Boolean
|
||||
|
||||
End Interface
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
Public Interface IUpdateAble
|
||||
|
||||
Sub Update()
|
||||
|
||||
End Interface
|
||||
|
|
@ -215,10 +215,6 @@ Public Class KeyboardInput
|
|||
''' </summary>
|
||||
Public Class Textbox
|
||||
|
||||
Implements IUpdateAble
|
||||
Implements IDrawAble
|
||||
Implements IFocusAble
|
||||
|
||||
Private _text As String = String.Empty
|
||||
|
||||
Dim _inputHandler As New KeyboardInput()
|
||||
|
|
@ -368,7 +364,7 @@ Public Class KeyboardInput
|
|||
|
||||
#Region "Update"
|
||||
|
||||
Public Sub Update() Implements IUpdateAble.Update
|
||||
Public Sub Update()
|
||||
If Me._isFocused = True Then
|
||||
If Controls.CtrlPressed() = True Then
|
||||
'Select All (Ctrl + A)
|
||||
|
|
@ -474,7 +470,7 @@ Public Class KeyboardInput
|
|||
|
||||
#Region "Rendering"
|
||||
|
||||
Public Sub Draw() Implements IDrawAble.Draw
|
||||
Public Sub Draw()
|
||||
Dim contentHeight As Integer = Me._height
|
||||
If contentHeight < 0 Then
|
||||
contentHeight = CInt(Me._font.MeasureString(TESTFORHEIGHTCHARS).Y) + 2
|
||||
|
|
@ -508,18 +504,18 @@ Public Class KeyboardInput
|
|||
|
||||
#Region "Focus"
|
||||
|
||||
Public Sub Focus() Implements IFocusAble.Focus
|
||||
Public Sub Focus()
|
||||
Me._isFocused = True
|
||||
End Sub
|
||||
|
||||
Public Sub DeFocus() Implements IFocusAble.DeFocus
|
||||
Public Sub DeFocus()
|
||||
Me._isFocused = False
|
||||
|
||||
Me._selectionStart = 0
|
||||
Me._selectionLength = 0
|
||||
End Sub
|
||||
|
||||
Public Function IsFocused() As Boolean Implements IFocusAble.IsFocused
|
||||
Public Function IsFocused() As Boolean
|
||||
Return Me._isFocused
|
||||
End Function
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
''' </summary>
|
||||
Public Class Attack
|
||||
|
||||
Implements ICopyAble
|
||||
|
||||
#Region "Fields"
|
||||
|
||||
Public Const MOVE_COUNT As Integer = 560
|
||||
|
|
@ -1488,7 +1486,7 @@
|
|||
'Try to load a GameMode move.
|
||||
Dim gameModeMove As Attack = GameModeAttackLoader.GetAttackByID(ID)
|
||||
If Not gameModeMove Is Nothing And GameModeManager.ActiveGameMode.IsDefaultGamemode = False Then
|
||||
returnMove = CType(gameModeMove.Copy(), Attack)
|
||||
returnMove = gameModeMove.Copy()
|
||||
Else
|
||||
returnMove = New Moves.Normal.Pound()
|
||||
returnMove.IsDefaultMove = True
|
||||
|
|
@ -1768,7 +1766,7 @@
|
|||
''' <summary>
|
||||
''' Returns a copy of this move.
|
||||
''' </summary>
|
||||
Public Function Copy() As Object Implements ICopyAble.Copy
|
||||
Public Function Copy() As Attack
|
||||
Dim m As Attack
|
||||
|
||||
If Me.IsGameModeMove = True Then
|
||||
|
|
|
|||
Loading…
Reference in New Issue