Added the TowerCameraPanel (unfinished)

updated version number Added some comments
SuperHackio · Sep 16, 2020 · b0b192d · b0b192d
1 parent 4ae863c
commit b0b192d
Show file tree

Hide file tree

Showing 9 changed files with 894 additions and 33 deletions.
diff --git a/LaunchCamPlus/CameraPanels/PointFixCameraPanel.Designer.cs b/LaunchCamPlus/CameraPanels/PointFixCameraPanel.Designer.cs
diff --git a/LaunchCamPlus/CameraPanels/TowerCameraPanel.Designer.cs b/LaunchCamPlus/CameraPanels/TowerCameraPanel.Designer.cs
diff --git a/LaunchCamPlus/CameraPanels/TowerCameraPanel.cs b/LaunchCamPlus/CameraPanels/TowerCameraPanel.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LaunchCamPlus.CameraPanels
+{
+    public partial class TowerCameraPanel : CameraPanelBase
+    {
+        public TowerCameraPanel()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/LaunchCamPlus/CameraPanels/TowerCameraPanel.resx b/LaunchCamPlus/CameraPanels/TowerCameraPanel.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
diff --git a/LaunchCamPlus/Extra Controls/SettingsPanel.cs b/LaunchCamPlus/Extra Controls/SettingsPanel.cs
@@ -1,14 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using LaunchCamPlus.Properties;
-using System.Runtime.InteropServices;
 
 namespace LaunchCamPlus
 {

diff --git a/LaunchCamPlus/Formats/BCAM.cs b/LaunchCamPlus/Formats/BCAM.cs
@@ -1,12 +1,12 @@
-using System;
+using Hack.io.Util;
+using LaunchCamPlus;
+using LaunchCamPlus.Properties;
+using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.IO;
+using System.Linq;
 using System.Text;
-using LaunchCamPlus;
-using System.Collections;
-using LaunchCamPlus.Properties;
-using Hack.io.Util;
 using System.Text.RegularExpressions;
 
 namespace Hack.io.BCAM
@@ -977,6 +977,9 @@ public int TransitionTime
                     Data.Add(0xAE79D1C0, value);
             }
         }
+        /// <summary>
+        /// Event value, only used by e: cameras
+        /// </summary>
         public int TransitionEndTime
         {
             get
@@ -1290,6 +1293,9 @@ public float LowerBorder
             }
         }
 
+        /// <summary>
+        /// Event value, only used by e: cameras
+        /// </summary>
         public int EventFrames
         {
             get
@@ -1312,6 +1318,9 @@ public int EventFrames
                     Data.Add(0x05C676D0, value);
             }
         }
+        /// <summary>
+        /// Event value, only used by e: cameras
+        /// </summary>
         public int EventPriority
         {
             get
@@ -1678,6 +1687,9 @@ public bool DisableFirstPerson
                     Data.Add(0xBB74D6C1, value ? 1 : 0);
             }
         }
+        /// <summary>
+        /// Game Flag, only used by g: cameras
+        /// </summary>
         public bool GFlagEndErpFrame
         {
             get
@@ -1700,6 +1712,9 @@ public bool GFlagEndErpFrame
                     Data.Add(0xDA484167, value ? 1 : 0);
             }
         }
+        /// <summary>
+        /// Game Flag, only used by g: cameras
+        /// </summary>
         public bool GFlagThrough
         {
             get
@@ -1722,6 +1737,9 @@ public bool GFlagThrough
                     Data.Add(0xED8DD072, value ? 1 : 0);
             }
         }
+        /// <summary>
+        /// Game Flag, only used by g: cameras
+        /// </summary>
         public int GFlagEndTime
         {
             get
@@ -1766,48 +1784,54 @@ public bool EnableVerticalPanAxis
                     Data.Add(0x26C8C3C0, value ? 1 : 0);
             }
         }
+        /// <summary>
+        /// Event Flag, only used by e: cameras
+        /// </summary>
         public bool EventUseTransitionTime
         {
             get
             {
-                if (Data.ContainsKey(0x45E50EE5))
-                    return (int)Data[0x45E50EE5] > 0;
+                if (Data.ContainsKey(0x1BCD52AA))
+                    return (int)Data[0x1BCD52AA] > 0;
                 else
-                    return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5];
+                    return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA];
             }
             set
             {
-                if (Data.ContainsKey(0x45E50EE5))
+                if (Data.ContainsKey(0x1BCD52AA))
                 {
-                    if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5])
-                        Data.Remove(0x45E50EE5);
+                    if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA])
+                        Data.Remove(0x1BCD52AA);
                     else
-                        Data[0x45E50EE5] = value ? 1 : 0;
+                        Data[0x1BCD52AA] = value ? 1 : 0;
                 }
-                else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5])
-                    Data.Add(0x45E50EE5, value ? 1 : 0);
+                else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA])
+                    Data.Add(0x1BCD52AA, value ? 1 : 0);
             }
         }
+        /// <summary>
+        /// Event Flag, only used by e: cameras
+        /// </summary>
         public bool EventUseTransitionEndTime
         {
             get
             {
-                if (Data.ContainsKey(0x1BCD52AA))
-                    return (int)Data[0x1BCD52AA] > 0;
+                if (Data.ContainsKey(0x45E50EE5))
+                    return (int)Data[0x45E50EE5] > 0;
                 else
-                    return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA];
+                    return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5];
             }
             set
             {
-                if (Data.ContainsKey(0x1BCD52AA))
+                if (Data.ContainsKey(0x45E50EE5))
                 {
-                    if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA])
-                        Data.Remove(0x1BCD52AA);
+                    if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5])
+                        Data.Remove(0x45E50EE5);
                     else
-                        Data[0x1BCD52AA] = value ? 1 : 0;
+                        Data[0x45E50EE5] = value ? 1 : 0;
                 }
-                else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA])
-                    Data.Add(0x1BCD52AA, value ? 1 : 0);
+                else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5])
+                    Data.Add(0x45E50EE5, value ? 1 : 0);
             }
         }
 

diff --git a/LaunchCamPlus/LaunchCamPlus.csproj b/LaunchCamPlus/LaunchCamPlus.csproj
@@ -79,6 +79,12 @@
     <Compile Include="CameraPanels\PointFixCameraPanel.Designer.cs">
       <DependentUpon>PointFixCameraPanel.cs</DependentUpon>
     </Compile>
+    <Compile Include="CameraPanels\TowerCameraPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CameraPanels\TowerCameraPanel.Designer.cs">
+      <DependentUpon>TowerCameraPanel.cs</DependentUpon>
+    </Compile>
     <Compile Include="CameraPanels\WanderPlanetCameraPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -182,6 +188,9 @@
     <EmbeddedResource Include="CameraPanels\PointFixCameraPanel.resx">
       <DependentUpon>PointFixCameraPanel.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CameraPanels\TowerCameraPanel.resx">
+      <DependentUpon>TowerCameraPanel.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CameraPanels\WanderPlanetCameraPanel.resx">
       <DependentUpon>WanderPlanetCameraPanel.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/LaunchCamPlus/Properties/AssemblyInfo.cs b/LaunchCamPlus/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.8.8")]
-[assembly: AssemblyFileVersion("2.3.8.8")]
+[assembly: AssemblyVersion("2.3.8.9")]
+[assembly: AssemblyFileVersion("2.3.8.9")]
diff --git a/LaunchCamPlus/UpdateAlert.txt b/LaunchCamPlus/UpdateAlert.txt
@@ -1 +1 @@
-2.3.8.8
+2.3.8.9