Skip to content

Commit b0b192d

Browse files
SuperHackioSuperHackio
committed
Added the TowerCameraPanel (unfinished)
updated version number Added some comments
1 parent 4ae863c commit b0b192d

9 files changed

+894
-33
lines changed

‎LaunchCamPlus/CameraPanels/PointFixCameraPanel.Designer.cs

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LaunchCamPlus/CameraPanels/TowerCameraPanel.Designer.cs

+684
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LaunchCamPlus/CameraPanels/TowerCameraPanel.cs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Drawing;
5+
using System.Data;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using System.Windows.Forms;
10+
11+
namespace LaunchCamPlus.CameraPanels
12+
{
13+
public partial class TowerCameraPanel : CameraPanelBase
14+
{
15+
public TowerCameraPanel()
16+
{
17+
InitializeComponent();
18+
}
19+
}
20+
}

‎LaunchCamPlus/CameraPanels/TowerCameraPanel.resx

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎LaunchCamPlus/Extra Controls/SettingsPanel.cs

-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel;
42
using System.Drawing;
5-
using System.Data;
6-
using System.Linq;
7-
using System.Text;
83
using System.Threading.Tasks;
94
using System.Windows.Forms;
105
using LaunchCamPlus.Properties;
11-
using System.Runtime.InteropServices;
126

137
namespace LaunchCamPlus
148
{

‎LaunchCamPlus/Formats/BCAM.cs

+48-24
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using System;
1+
using Hack.io.Util;
2+
using LaunchCamPlus;
3+
using LaunchCamPlus.Properties;
4+
using System;
5+
using System.Collections;
26
using System.Collections.Generic;
3-
using System.Linq;
47
using System.IO;
8+
using System.Linq;
59
using System.Text;
6-
using LaunchCamPlus;
7-
using System.Collections;
8-
using LaunchCamPlus.Properties;
9-
using Hack.io.Util;
1010
using System.Text.RegularExpressions;
1111

1212
namespace Hack.io.BCAM
@@ -977,6 +977,9 @@ public int TransitionTime
977977
Data.Add(0xAE79D1C0, value);
978978
}
979979
}
980+
/// <summary>
981+
/// Event value, only used by e: cameras
982+
/// </summary>
980983
public int TransitionEndTime
981984
{
982985
get
@@ -1290,6 +1293,9 @@ public float LowerBorder
12901293
}
12911294
}
12921295

1296+
/// <summary>
1297+
/// Event value, only used by e: cameras
1298+
/// </summary>
12931299
public int EventFrames
12941300
{
12951301
get
@@ -1312,6 +1318,9 @@ public int EventFrames
13121318
Data.Add(0x05C676D0, value);
13131319
}
13141320
}
1321+
/// <summary>
1322+
/// Event value, only used by e: cameras
1323+
/// </summary>
13151324
public int EventPriority
13161325
{
13171326
get
@@ -1678,6 +1687,9 @@ public bool DisableFirstPerson
16781687
Data.Add(0xBB74D6C1, value ? 1 : 0);
16791688
}
16801689
}
1690+
/// <summary>
1691+
/// Game Flag, only used by g: cameras
1692+
/// </summary>
16811693
public bool GFlagEndErpFrame
16821694
{
16831695
get
@@ -1700,6 +1712,9 @@ public bool GFlagEndErpFrame
17001712
Data.Add(0xDA484167, value ? 1 : 0);
17011713
}
17021714
}
1715+
/// <summary>
1716+
/// Game Flag, only used by g: cameras
1717+
/// </summary>
17031718
public bool GFlagThrough
17041719
{
17051720
get
@@ -1722,6 +1737,9 @@ public bool GFlagThrough
17221737
Data.Add(0xED8DD072, value ? 1 : 0);
17231738
}
17241739
}
1740+
/// <summary>
1741+
/// Game Flag, only used by g: cameras
1742+
/// </summary>
17251743
public int GFlagEndTime
17261744
{
17271745
get
@@ -1766,48 +1784,54 @@ public bool EnableVerticalPanAxis
17661784
Data.Add(0x26C8C3C0, value ? 1 : 0);
17671785
}
17681786
}
1787+
/// <summary>
1788+
/// Event Flag, only used by e: cameras
1789+
/// </summary>
17691790
public bool EventUseTransitionTime
17701791
{
17711792
get
17721793
{
1773-
if (Data.ContainsKey(0x45E50EE5))
1774-
return (int)Data[0x45E50EE5] > 0;
1794+
if (Data.ContainsKey(0x1BCD52AA))
1795+
return (int)Data[0x1BCD52AA] > 0;
17751796
else
1776-
return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5];
1797+
return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA];
17771798
}
17781799
set
17791800
{
1780-
if (Data.ContainsKey(0x45E50EE5))
1801+
if (Data.ContainsKey(0x1BCD52AA))
17811802
{
1782-
if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5])
1783-
Data.Remove(0x45E50EE5);
1803+
if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA])
1804+
Data.Remove(0x1BCD52AA);
17841805
else
1785-
Data[0x45E50EE5] = value ? 1 : 0;
1806+
Data[0x1BCD52AA] = value ? 1 : 0;
17861807
}
1787-
else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5])
1788-
Data.Add(0x45E50EE5, value ? 1 : 0);
1808+
else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA])
1809+
Data.Add(0x1BCD52AA, value ? 1 : 0);
17891810
}
17901811
}
1812+
/// <summary>
1813+
/// Event Flag, only used by e: cameras
1814+
/// </summary>
17911815
public bool EventUseTransitionEndTime
17921816
{
17931817
get
17941818
{
1795-
if (Data.ContainsKey(0x1BCD52AA))
1796-
return (int)Data[0x1BCD52AA] > 0;
1819+
if (Data.ContainsKey(0x45E50EE5))
1820+
return (int)Data[0x45E50EE5] > 0;
17971821
else
1798-
return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA];
1822+
return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5];
17991823
}
18001824
set
18011825
{
1802-
if (Data.ContainsKey(0x1BCD52AA))
1826+
if (Data.ContainsKey(0x45E50EE5))
18031827
{
1804-
if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA])
1805-
Data.Remove(0x1BCD52AA);
1828+
if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5])
1829+
Data.Remove(0x45E50EE5);
18061830
else
1807-
Data[0x1BCD52AA] = value ? 1 : 0;
1831+
Data[0x45E50EE5] = value ? 1 : 0;
18081832
}
1809-
else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA])
1810-
Data.Add(0x1BCD52AA, value ? 1 : 0);
1833+
else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5])
1834+
Data.Add(0x45E50EE5, value ? 1 : 0);
18111835
}
18121836
}
18131837

‎LaunchCamPlus/LaunchCamPlus.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@
7979
<Compile Include="CameraPanels\PointFixCameraPanel.Designer.cs">
8080
<DependentUpon>PointFixCameraPanel.cs</DependentUpon>
8181
</Compile>
82+
<Compile Include="CameraPanels\TowerCameraPanel.cs">
83+
<SubType>UserControl</SubType>
84+
</Compile>
85+
<Compile Include="CameraPanels\TowerCameraPanel.Designer.cs">
86+
<DependentUpon>TowerCameraPanel.cs</DependentUpon>
87+
</Compile>
8288
<Compile Include="CameraPanels\WanderPlanetCameraPanel.cs">
8389
<SubType>UserControl</SubType>
8490
</Compile>
@@ -182,6 +188,9 @@
182188
<EmbeddedResource Include="CameraPanels\PointFixCameraPanel.resx">
183189
<DependentUpon>PointFixCameraPanel.cs</DependentUpon>
184190
</EmbeddedResource>
191+
<EmbeddedResource Include="CameraPanels\TowerCameraPanel.resx">
192+
<DependentUpon>TowerCameraPanel.cs</DependentUpon>
193+
</EmbeddedResource>
185194
<EmbeddedResource Include="CameraPanels\WanderPlanetCameraPanel.resx">
186195
<DependentUpon>WanderPlanetCameraPanel.cs</DependentUpon>
187196
</EmbeddedResource>

‎LaunchCamPlus/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.3.8.8")]
36-
[assembly: AssemblyFileVersion("2.3.8.8")]
35+
[assembly: AssemblyVersion("2.3.8.9")]
36+
[assembly: AssemblyFileVersion("2.3.8.9")]

‎LaunchCamPlus/UpdateAlert.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.8.8
1+
2.3.8.9

0 commit comments

Comments
 (0)