Skip to content

Commit

Permalink
Update everything
Browse files Browse the repository at this point in the history
  • Loading branch information
@LagoLunatic
LagoLunatic committed Aug 12, 2020
1 parent e594173 commit 25c9ac3
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 22 deletions.
13 changes: 8 additions & 5 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
[submodule "JStudio"]
path = JStudio
url = https://github.com/LagoLunatic/JStudio.git
url = https://github.com/LordNed/JStudio.git
[submodule "WCommon"]
path = WCommon
url = https://github.com/LordNed/WCommon.git
[submodule "WArchiveTools"]
path = WArchiveTools
url = https://github.com/LordNed/WArchive-Tools.git
branch = ISO_Opening_Experiments
[submodule "WArchive-Tools"]
path = WArchive-Tools
url = https://github.com/LagoLunatic/WArchive-Tools.git
branch = master
[submodule "GameFormatReader"]
path = GameFormatReader
url = https://github.com/LagoLunatic/GameFormatReader
1 change: 1 addition & 0 deletions GameFormatReader
Submodule GameFormatReader added at 62a940
22 changes: 19 additions & 3 deletions J3DModelViewer.sln
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio Version 16
VisualStudioVersion = 16.0.30002.166
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "J3DModelViewer", "J3DModelViewer\J3DModelViewer.csproj", "{9325A8F9-924C-4A20-982A-7142F14BF833}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JStudio", "JStudio\JStudio.csproj", "{B90410AE-BB67-4D7A-B4F5-7209CB357A44}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCommon", "WCommon\WCommon.csproj", "{E8AF46CC-76DC-4541-A578-5067EAD07087}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchiveToolsLib", "WArchiveTools\ArchiveToolsLib\ArchiveToolsLib.csproj", "{B715685D-1603-4CE3-8EA1-552B01C2BA4B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchiveToolsLib", "WArchive-Tools\ArchiveToolsLib\ArchiveToolsLib.csproj", "{B715685D-1603-4CE3-8EA1-552B01C2BA4B}"
ProjectSection(ProjectDependencies) = postProject
{E8AF46CC-76DC-4541-A578-5067EAD07087} = {E8AF46CC-76DC-4541-A578-5067EAD07087}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameFormatReader", "GameFormatReader\GameFormatReader\GameFormatReader.csproj", "{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -51,8 +56,19 @@ Global
{B715685D-1603-4CE3-8EA1-552B01C2BA4B}.Release|Any CPU.Build.0 = Release|Any CPU
{B715685D-1603-4CE3-8EA1-552B01C2BA4B}.Release|x64.ActiveCfg = Release|Any CPU
{B715685D-1603-4CE3-8EA1-552B01C2BA4B}.Release|x64.Build.0 = Release|Any CPU
{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Debug|x64.ActiveCfg = Debug|Any CPU
{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Debug|x64.Build.0 = Debug|Any CPU
{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Release|Any CPU.Build.0 = Release|Any CPU
{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Release|x64.ActiveCfg = Release|Any CPU
{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {70B6BC9C-21D8-44D3-9D8B-1C6C43F1BDE8}
EndGlobalSection
EndGlobal
12 changes: 6 additions & 6 deletions J3DModelViewer/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="J3DModelViewer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="J3DRenderer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="J3DModelViewer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="J3DRenderer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
<userSettings>
<J3DModelViewer.Properties.Settings>
Expand Down Expand Up @@ -63,4 +63,4 @@
</setting>
</J3DRenderer.Properties.Settings>
</userSettings>
</configuration>
</configuration>
10 changes: 6 additions & 4 deletions J3DModelViewer/J3DModelViewer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>J3DModelViewer</RootNamespace>
<AssemblyName>J3DModelViewer</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
Expand All @@ -28,6 +28,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -73,9 +74,10 @@
<ApplicationIcon>resources\application_icon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="GameFormatReader">
<HintPath>..\lib\GameFormatReader.dll</HintPath>
</Reference>
<ProjectReference Include="$(SolutionDir)\GameFormatReader\GameFormatReader\GameFormatReader.csproj">
<Project>{afce536d-92ff-4ee5-8536-731d2cd5fbca}</Project>
<Name>GameFormatReader</Name>
</ProjectReference>
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.WindowsAPICodePack.Core.1.1.0\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
<Private>True</Private>
Expand Down
2 changes: 1 addition & 1 deletion J3DModelViewer/Properties/Resources.Designer.cs
View file

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

2 changes: 1 addition & 1 deletion J3DModelViewer/Properties/Settings.Designer.cs
View file

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

2 changes: 1 addition & 1 deletion JStudio
Submodule JStudio updated 16 files
+4 −0 .gitignore
+2 −2 Framework/ObjExporter.cs
+13 −5 JStudio.csproj
+12 −12 JStudio/GXToOpenGL.cs
+3 −3 JStudio/J3D/Animation/BRK.cs
+1 −1 JStudio/J3D/Animation/BTK.cs
+5 −0 JStudio/J3D/Animation/BaseJ3DAnimation.cs
+38 −0 JStudio/J3D/DRW1.cs
+8 −0 JStudio/J3D/ExternalTypes/BMT.cs
+228 −134 JStudio/J3D/J3D.cs
+24 −0 JStudio/J3D/JNT1.cs
+3 −6 JStudio/J3D/MAT3.cs
+13 −9 JStudio/J3D/Materials.cs
+175 −80 JStudio/J3D/SHP1.cs
+6 −6 JStudio/J3D/ShaderGen/FragmentShaderGen.cs
+3 −1 JStudio/J3D/ShaderGen/VertexShaderGen.cs
1 change: 1 addition & 0 deletions WArchive-Tools
Submodule WArchive-Tools added at f5c091
1 change: 0 additions & 1 deletion WArchiveTools
Submodule WArchiveTools deleted from fe5392

0 comments on commit 25c9ac3

Please sign in to comment.