Skip to content

Commit

Permalink
Beta Build 5
Browse files Browse the repository at this point in the history
Beta Build 5 Changelog:

Changes by Pilzinsel64:
* Added support for ROMs made in SM64 ROM Manager (Thanks Pilz!)

Changes by Davideesk:
* Added themes
- Themes are customizable JSON files that can change the RGB colors of
the GUI.
- Located under /data/themes/
- Currently only 2 themes: "Quad64 Light" and "Quad64 Dark"
- Please give me any kind of feedback on both of these themes. I
probably do need to adjust them in future builds.

* Fixed some bugs that caused ROMs to crash
- Fixed the TreeView duplication bug introduced in Beta build 4
- Added a sanity check with decoding textures
- Added a sanity check for reading collision data
- Fixed a bug from Pilz' unoffical release, where non-ROM Manager hacks
would have missing geometry after a ROM Manager hack was loaded
- Added a check for hacky 0xA segments in the texture editor, which
should prevent crashing in ROM Manager levels that have no background.

Special thanks to AloXado320 for finding & reporting these bugs.
  • Loading branch information
DavidSM64 committed Jul 14, 2018
1 parent 74e86b9 commit cf40dfe
Show file tree
Hide file tree
Showing 38 changed files with 2,495 additions and 384 deletions.
20 changes: 20 additions & 0 deletions Quad64.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,13 @@
<Compile Include="src\Forms\TextureEditorComponents\TabEditSkyBackground.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\Forms\ThemeSelector.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\Forms\ThemeSelector.Designer.cs">
<DependentUpon>ThemeSelector.cs</DependentUpon>
</Compile>
<Compile Include="src\Forms\ToolStripRenderer\MenuBarColorTable.cs" />
<Compile Include="src\Globals.cs" />
<Compile Include="src\JSON\BehaviorNameEntry.cs" />
<Compile Include="src\JSON\ModelCombo.cs" />
Expand All @@ -193,6 +200,7 @@
<Compile Include="src\Scripts\ModelBuilder.cs" />
<Compile Include="src\Scripts\TextureFormats.cs" />
<Compile Include="src\TestROM\LaunchROM.cs" />
<Compile Include="src\Theme.cs" />
<Compile Include="src\Viewer\BoundingBox.cs" />
<Compile Include="src\Viewer\Camera.cs" />
<Compile Include="src\Viewer\ContentPipe.cs" />
Expand Down Expand Up @@ -253,6 +261,9 @@
<EmbeddedResource Include="src\Forms\TextureEditor.resx">
<DependentUpon>TextureEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="src\Forms\ThemeSelector.resx">
<DependentUpon>ThemeSelector.cs</DependentUpon>
</EmbeddedResource>
<None Include="data\BehaviorNames.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand All @@ -271,6 +282,9 @@
<None Include="data\OtherTextures_NA.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="data\themes\light.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="OpenTK.dll.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
Expand All @@ -282,6 +296,9 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<None Include="data\themes\dark.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
Expand All @@ -305,6 +322,9 @@
<None Include="images\RotateObject_Y.png" />
</ItemGroup>
<ItemGroup>
<Content Include="data\themes\Making Themes.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="icon_KtQ_icon.ico" />
<None Include="Resources\icon_Star1_gray.png" />
<None Include="Resources\icon_Star1.png" />
Expand Down
136 changes: 136 additions & 0 deletions data/themes/Making Themes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
As of Quad64 v0.2 (Beta Build 5) you can now customize the look of the entire program. Currently it only supports changing RGB colors, but I might expand it in the future if enough people ask for it.

You can look at "dark.json" to see how the data should be layed out. Make a copy and play around with the colors to see what you can make of it.

Do note that if you don't specify a color, a default color will be chosen instead.

------------------
Modifiable colors
------------------

[Defaults]
Background
Text
Panel-Background
ListBox-Background
ListBox-Text
ListBox-Highlight
ListBox-HighlightedText
TextBox-Background
TextBox-Text
TextBox-Comments
DropDown-Background
DropDown-Text
Button-Background
Button-Text
NumericUpDown-Background
NumericUpDown-Text

[Main]
Background
Controls-Background
Controls-Text
Controls-Button-Background
Controls-Button-Text
Controls-DropDown-Background
Controls-DropDown-Text
Controls-NumericUpDown-Background
Controls-NumericUpDown-Text
MenuBar-Background
MenuBar-Text
MenuBar-Item-Border
MenuBar-Item-Selected
MenuBar-Item-Highlight
Properties-Background
Properties-Text
Properties-Lines
TreeView-Background
TreeView-Text
TreeView-Highlight
TreeView-3DObjectsLabel
TreeView-MacroObjectsLabel
TreeView-SpecialObjectsLabel
TreeView-WarpsLabel

[TextureEditor]
Background
LevelTab-Background-Left
LevelTab-Background-Middle
LevelTab-Background-Right
LevelTab-Text
LevelTab-Button-Background
LevelTab-Button-Text
OtherTab-Background-Left
OtherTab-Background-Middle
OtherTab-Background-Right
OtherTab-Text
OtherTab-Button-Background
OtherTab-Button-Text
SkyTab-Background-Left
SkyTab-Background-Right
SkyTab-Text
SkyTab-Button-Background
SkyTab-Button-Text

[ObjectCombos]
Background
Text
3DObjects-Title
3DObjects-Item
3DObjects-Item-Alt
3DObjects-Item-Highlight
3DObjects-Item-Highlight-Text
MacroObjects-Title
MacroObjects-Item
MacroObjects-Item-Alt
MacroObjects-Item-Highlight
MacroObjects-Item-Highlight-Text
SpecialObjects-Title
SpecialObjects-Item
SpecialObjects-Item-Alt
SpecialObjects-Item-Highlight
SpecialObjects-Item-Highlight-Text
Other-Title
Other-Item
Other-Item-Alt
Other-Item-Highlight
Other-Item-Highlight-Text

[ScriptDumps]
Background
Text
Panel-Background
DropDown-Background
DropDown-Text
GeoLayoutScripts-AreaPanel-Background
GeoLayoutScripts-AreaPanel-Text
Fast3DScripts-AreaPanel-Background
Fast3DScripts-AreaPanel-Text
Objects-ListBox-Background
Objects-ListBox-Background
Objects-ListBox-Highlight
Objects-ListBox-HighlightedText
Fast3DScripts-ListBox-Background
Fast3DScripts-ListBox-Text
Fast3DScripts-ListBox-Highlight
Fast3DScripts-ListBox-HighlightedText
LevelScripts-Background
LevelScripts-Text
LevelScripts-Comments
GeoLayoutScripts-Background
GeoLayoutScripts-Text
GeoLayoutScripts-Comments
Fast3DScripts-Background
Fast3DScripts-Text
Fast3DScripts-Comments
BehaviorScripts-Background
BehaviorScripts-Text
BehaviorScripts-Comments








113 changes: 113 additions & 0 deletions data/themes/dark.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"Info" : {
"Name" : "Quad64 Dark Theme",
"Author" : "Davideesk",
"Note" : "This dark theme does not show every possible option you can change, so please look at 'Making Themes.txt' for more information!"
},

"Defaults" : {
"Background" : { "R":40, "G":40, "B":40 },
"Text" : { "R":240, "G":240, "B":240 },
"Panel-Background" : { "R":70, "G":70, "B":70 },
"ListBox-Background" : { "R":40, "G":40, "B":40 },
"ListBox-Text" : { "R":240, "G":240, "B":240 },
"ListBox-Highlight" : { "R":0, "G":80, "B":140 },
"ListBox-HighlightedText" : { "R":240, "G":240, "B":240 },
"TextBox-Background" : { "R":40, "G":40, "B":40 },
"TextBox-Text" : { "R":240, "G":240, "B":240 },
"TextBox-Comments" : { "R":0, "G":240, "B":0 },
"DropDown-Background" : { "R":40, "G":40, "B":40 },
"DropDown-Text" : { "R":240, "G":240, "B":240 },
"Button-Background" : { "R":40, "G":40, "B":40 },
"Button-Text" : { "R":240, "G":240, "B":240 },
"NumericUpDown-Background" : { "R":40, "G":40, "B":40 },
"NumericUpDown-Text" : { "R":240, "G":240, "B":240 }
},

"Main" : {
"Controls-Background" : { "R":70, "G":70, "B":70 },

"MenuBar-Item-Border" : { "R":0, "G":0, "B":0 },
"MenuBar-Item-Selected" : { "R":0x90, "G":0x90, "B":0x90 },
"MenuBar-Item-Highlight" : { "R":0xA9, "G":0xA9, "B":0xA9 },

"Properties-Background" : { "R":70, "G":70, "B":70 },
"Properties-Text" : { "R":240, "G":240, "B":240 },
"Properties-Lines" : { "R":120, "G":120, "B":120 },

"TreeView-Highlight" : { "R":110, "G":110, "B":160 },
"TreeView-3DObjectsLabel" : { "R":220, "G":140, "B":140 },
"TreeView-MacroObjectsLabel" : { "R":140, "G":140, "B":220 },
"TreeView-SpecialObjectsLabel" : { "R":140, "G":220, "B":140 },
"TreeView-WarpsLabel" : { "R":220, "G":220, "B":220 }
},

"TextureEditor" : {
"LevelTab-Background-Left" : { "R":80, "G":60, "B":60 },
"LevelTab-Background-Middle" : { "R":60, "G":80, "B":60 },
"LevelTab-Background-Right" : { "R":60, "G":60, "B":80 },
"LevelTab-Text" : { "R":240, "G":240, "B": 240 },
"LevelTab-Button-Background" : { "R":60, "G":60, "B":60 },
"LevelTab-Button-Text" : { "R":240, "G":240, "B":240 },

"OtherTab-Background-Left" : { "R":80, "G":60, "B":60 },
"OtherTab-Background-Middle" : { "R":60, "G":80, "B":60 },
"OtherTab-Background-Right" : { "R":60, "G":60, "B":80 },
"OtherTab-Text" : { "R":240, "G":240, "B": 240 },
"OtherTab-Button-Background" : { "R":60, "G":60, "B":60 },
"OtherTab-Button-Text" : { "R":240, "G":240, "B":240 },

"SkyTab-Background-Left" : { "R":20, "G":70, "B":80 },
"SkyTab-Background-Right" : { "R":60, "G":60, "B":80 },
"SkyTab-Text" : { "R":240, "G":240, "B":240 },
"SkyTab-Button-Background" : { "R":60, "G":60, "B":60 },
"SkyTab-Button-Text" : { "R":240, "G":240, "B":240 }
},

"ObjectCombos" : {
"Background" : { "R":40, "G":40, "B":40 },
"Text" : { "R":240, "G":240, "B":240 },

"3DObjects-Title" : { "R":200, "G":170, "B":170 },
"3DObjects-Item" : { "R":50, "G":50, "B":50 },
"3DObjects-Item-Alt" : { "R":50, "G":40, "B":40 },
"3DObjects-Item-Highlight" : { "R":60, "G":100, "B":150 },
"3DObjects-Item-Highlight-Text" : { "R":240, "G":240, "B":240 },

"MacroObjects-Title" : { "R":170, "G":170, "B":200 },
"MacroObjects-Item" : { "R":50, "G":50, "B":50 },
"MacroObjects-Item-Alt" : { "R":40, "G":40, "B":50 },
"MacroObjects-Item-Highlight" : { "R":60, "G":100, "B":150 },
"MacroObjects-Item-Highlight-Text" : { "R":240, "G":240, "B":240 },

"SpecialObjects-Title" : { "R":170, "G":200, "B":170 },
"SpecialObjects-Item" : { "R":50, "G":50, "B":50 },
"SpecialObjects-Item-Alt" : { "R":40, "G":50, "B":40 },
"SpecialObjects-Item-Highlight" : { "R":60, "G":100, "B":150 },
"SpecialObjects-Item-Highlight-Text" : { "R":240, "G":240, "B":240 },

"Other-Title" : { "R":200, "G":200, "B":200 },
"Other-Item" : { "R":50, "G":50, "B":50 },
"Other-Item-Alt" : { "R":40, "G":40, "B":40 },
"Other-Item-Highlight" : { "R":60, "G":100, "B":150 },
"Other-Item-Highlight-Text" : { "R":240, "G":240, "B":240 }
},

"ScriptDumps" : {
"LevelScripts-Background" : { "R":40, "G":10, "B":10 },
"LevelScripts-Text" : { "R":240, "G":180, "B":180 },
"LevelScripts-Comments" : { "R":200, "G":100, "B":0 },

"GeoLayoutScripts-Background" : { "R":10, "G":40, "B":10 },
"GeoLayoutScripts-Text" : { "R":180, "G":240, "B":180 },
"GeoLayoutScripts-Comments" : { "R":0, "G":200, "B":0 },

"Fast3DScripts-Background" : { "R":10, "G":10, "B":40 },
"Fast3DScripts-Text" : { "R":180, "G":180, "B":240 },
"Fast3DScripts-Comments" : { "R":0, "G":100, "B":200 },

"BehaviorScripts-Background" : { "R":25, "G":10, "B":40 },
"BehaviorScripts-Text" : { "R":200, "G":180, "B":240 },
"BehaviorScripts-Comments" : { "R":150, "G":80, "B":200 }
}
}
13 changes: 13 additions & 0 deletions data/themes/light.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"Info" : {
"Name" : "Quad64 Light Theme",
"Author" : "Davideesk",
"Note" : "The light theme is hard-coded as the default theme, and this file is here to show up in the theme's menu. Make absolutely sure not to remove the 5 categories below, as they are needed."
},

"Defaults" : {},
"Main" : {},
"TextureEditor" : {},
"ObjectCombos" : {},
"ScriptDumps" : {}
}
7 changes: 5 additions & 2 deletions src/Forms/EditWarp.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cf40dfe

Please sign in to comment.