Commit MetaInfo

Révision55338af04824bfc7016e14a1380582ade6644684 (tree)
l'heure2019-11-07 02:27:28
Auteur <Kuddel@c0f5...>

Message de Log

Branch/Trunk unification attempt
- Mainly manual and only checked that it compiles; so this might break something.
- Checked Visual Studio 2017 builds.
- Checked Visual Studio 2019 builds.

Change Summary

Modification

diff -r 64da57d15fc6 -r 55338af04824 D3D9Client.cfg
--- a/D3D9Client.cfg Wed Nov 06 01:44:54 2019 +0000
+++ b/D3D9Client.cfg Wed Nov 06 17:27:28 2019 +0000
@@ -18,8 +18,8 @@
1818 EnvMapSize = 256
1919 EnvMapMode = 1
2020 EnvMapFaces = 1
21-ShadowMapMode = 2
22-ShadowMapFilter = 0
21+ShadowMapMode = 3
22+ShadowMapFilter = 2
2323 ShadowMapSize = 2048
2424 TerrainShadowing = 2
2525 EnableGlass = 1
@@ -31,7 +31,7 @@
3131 StereoConvergence = 0.2
3232 DebugLvl = 1
3333 VCNearPlane = 0.1
34-LightCongiguration = 2
34+LightConfiguration = 2
3535 DisableDrvMgm = 0
3636 NVPerfHUD = 0
3737 DebugLineFontSize = 18
@@ -39,13 +39,15 @@
3939 LODBias = 0
4040 MeshRes = 1
4141 MicroMode = 1
42-MicroFilter = 2
42+MicroFilter = 5
4343 BlendMode = 1
4444 MicroBias = 3
45+CloudMicro = 1
4546 PostProcess = 0
4647 ShaderDebug = 0
4748 PresentLocation = 1
4849 PlanetTileLoadFlags = 3
4950 LabelDisplayFlags = 3
51+OrbitalShadowMult = 0.85
5052 SolCfg = Sol
5153 DebugLineFont = Fixed
diff -r 64da57d15fc6 -r 55338af04824 Orbitersdk/D3D9Client/D3D9ClientVS2012.vcxproj
--- a/Orbitersdk/D3D9Client/D3D9ClientVS2012.vcxproj Wed Nov 06 01:44:54 2019 +0000
+++ b/Orbitersdk/D3D9Client/D3D9ClientVS2012.vcxproj Wed Nov 06 17:27:28 2019 +0000
@@ -14,7 +14,6 @@
1414 <ProjectName>D3D9Client</ProjectName>
1515 <ProjectGuid>{5B2C5D1A-7B8E-4343-BC33-836ABD122D3A}</ProjectGuid>
1616 <RootNamespace>D3D9Client</RootNamespace>
17- <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
1817 </PropertyGroup>
1918 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2019 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -38,6 +37,7 @@
3837 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
3938 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4039 <Import Project="$(ProjectDir)..\..\resources\Orbiter.props" />
40+ <Import Project="$(ProjectDir)..\..\resources\Orbiter debug.props" />
4141 </ImportGroup>
4242 <PropertyGroup Label="UserMacros" />
4343 <PropertyGroup>
@@ -93,7 +93,6 @@
9393 <TargetMachine>MachineX86</TargetMachine>
9494 <LargeAddressAware>true</LargeAddressAware>
9595 <SubSystem>Windows</SubSystem>
96- <OptimizeReferences>false</OptimizeReferences>
9796 </Link>
9897 <Bscmake>
9998 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -152,7 +151,6 @@
152151 <GenerateDebugInformation>No</GenerateDebugInformation>
153152 <LargeAddressAware>true</LargeAddressAware>
154153 <SubSystem>Windows</SubSystem>
155- <OptimizeReferences>false</OptimizeReferences>
156154 </Link>
157155 <Bscmake>
158156 <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -213,6 +211,7 @@
213211 <ClCompile Include="TileMgr.cpp" />
214212 <ClCompile Include="Tilemgr2.cpp" />
215213 <ClCompile Include="VBase.cpp" />
214+ <ClCompile Include="VideoTab.cpp" />
216215 <ClCompile Include="VObject.cpp" />
217216 <ClCompile Include="VPlanet.cpp" />
218217 <ClCompile Include="VStar.cpp" />
@@ -271,12 +270,12 @@
271270 <ClInclude Include="Tilemgr2.h" />
272271 <ClInclude Include="Tilemgr2_imp.hpp" />
273272 <ClInclude Include="VBase.h" />
273+ <ClInclude Include="VectorHelpers.h" />
274+ <ClInclude Include="VideoTab.h" />
274275 <ClInclude Include="VObject.h" />
275276 <ClInclude Include="VPlanet.h" />
276277 <ClInclude Include="VStar.h" />
277278 <ClInclude Include="VVessel.h" />
278- <ClInclude Include="VectorHelpers.h" />
279- <ClInclude Include="VideoTab.h" />
280279 <ClInclude Include="ZTreeMgr.h" />
281280 </ItemGroup>
282281 <ItemGroup>
diff -r 64da57d15fc6 -r 55338af04824 Orbitersdk/D3D9Client/D3D9Pad.cpp
--- a/Orbitersdk/D3D9Client/D3D9Pad.cpp Wed Nov 06 01:44:54 2019 +0000
+++ b/Orbitersdk/D3D9Client/D3D9Pad.cpp Wed Nov 06 17:27:28 2019 +0000
@@ -884,12 +884,6 @@
884884 return true;
885885 }
886886
887-// ===============================================================================================
888-//
889-//bool D3D9Pad::TextW(int x, int y, const LPCWSTR str, int len)
890-//{
891-// return Text(x, y, (char *)str, len);
892-//}
893887
894888 // ===============================================================================================
895889 //
diff -r 64da57d15fc6 -r 55338af04824 Orbitersdk/D3D9Client/doc/images/D3D9Guide7.psd
Binary file Orbitersdk/D3D9Client/doc/images/D3D9Guide7.psd has changed
diff -r 64da57d15fc6 -r 55338af04824 Orbitersdk/D3D9Client/doc/images/Guide to D3D9Client.docx
Binary file Orbitersdk/D3D9Client/doc/images/Guide to D3D9Client.docx has changed
diff -r 64da57d15fc6 -r 55338af04824 Orbitersdk/D3D9Client/doc/images/PBR2.psd
Binary file Orbitersdk/D3D9Client/doc/images/PBR2.psd has changed
diff -r 64da57d15fc6 -r 55338af04824 Orbitersdk/D3D9Client/gcAPI/gcAPI.vs2008.sln
--- a/Orbitersdk/D3D9Client/gcAPI/gcAPI.vs2008.sln Wed Nov 06 01:44:54 2019 +0000
+++ b/Orbitersdk/D3D9Client/gcAPI/gcAPI.vs2008.sln Wed Nov 06 17:27:28 2019 +0000
@@ -8,8 +8,8 @@
88 Release|Win32 = Release|Win32
99 EndGlobalSection
1010 GlobalSection(ProjectConfigurationPlatforms) = postSolution
11- {E31E97CA-377A-4882-8C5C-C5781700CD43}.Debug|Win32.ActiveCfg = Release|Win32
12- {E31E97CA-377A-4882-8C5C-C5781700CD43}.Debug|Win32.Build.0 = Release|Win32
11+ {E31E97CA-377A-4882-8C5C-C5781700CD43}.Debug|Win32.ActiveCfg = Debug|Win32
12+ {E31E97CA-377A-4882-8C5C-C5781700CD43}.Debug|Win32.Build.0 = Debug|Win32
1313 {E31E97CA-377A-4882-8C5C-C5781700CD43}.Release|Win32.ActiveCfg = Release|Win32
1414 {E31E97CA-377A-4882-8C5C-C5781700CD43}.Release|Win32.Build.0 = Release|Win32
1515 EndGlobalSection
diff -r 64da57d15fc6 -r 55338af04824 Orbitersdk/samples/GenericCamera/GenericCamera.vcxproj
--- a/Orbitersdk/samples/GenericCamera/GenericCamera.vcxproj Wed Nov 06 01:44:54 2019 +0000
+++ b/Orbitersdk/samples/GenericCamera/GenericCamera.vcxproj Wed Nov 06 17:27:28 2019 +0000
@@ -71,9 +71,6 @@
7171 <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7272 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
7373 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
74- <PrecompiledHeaderOutputFile>
75- </PrecompiledHeaderOutputFile>
76-
7774 <WarningLevel>Level3</WarningLevel>
7875 <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7976 <BufferSecurityCheck>true</BufferSecurityCheck>
@@ -87,11 +84,11 @@
8784 <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
8885 <GenerateDebugInformation>true</GenerateDebugInformation>
8986 <ProgramDatabaseFile>$(Configuration)\$(TargetName).pdb</ProgramDatabaseFile>
90-
9187 <ImportLibrary>$(Configuration)\$(TargetName).lib</ImportLibrary>
9288 <TargetMachine>MachineX86</TargetMachine>
9389 <SubSystem>Windows</SubSystem>
9490 <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
91+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
9592 </Link>
9693 </ItemDefinitionGroup>
9794 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -100,9 +97,6 @@
10097 <IntrinsicFunctions>true</IntrinsicFunctions>
10198 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
10299 <FunctionLevelLinking>true</FunctionLevelLinking>
103- <PrecompiledHeaderOutputFile>
104- </PrecompiledHeaderOutputFile>
105-
106100 <WarningLevel>Level3</WarningLevel>
107101 <DebugInformationFormat>None</DebugInformationFormat>
108102 <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -119,10 +113,10 @@
119113 </IgnoreSpecificDefaultLibraries>
120114 <ImportLibrary>$(Configuration)\$(TargetName).lib</ImportLibrary>
121115 <TargetMachine>MachineX86</TargetMachine>
116+ <GenerateDebugInformation>No</GenerateDebugInformation>
117+ <SubSystem>Windows</SubSystem>
122118 <ProgramDatabaseFile>$(Configuration)\$(TargetName).pdb</ProgramDatabaseFile>
123119 <FullProgramDatabaseFile>false</FullProgramDatabaseFile>
124- <GenerateDebugInformation>No</GenerateDebugInformation>
125- <SubSystem>Windows</SubSystem>
126120 <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
127121 </Link>
128122 </ItemDefinitionGroup>
diff -r 64da57d15fc6 -r 55338af04824 Orbitersdk/samples/GenericCamera/MFD.h
--- a/Orbitersdk/samples/GenericCamera/MFD.h Wed Nov 06 01:44:54 2019 +0000
+++ b/Orbitersdk/samples/GenericCamera/MFD.h Wed Nov 06 17:27:28 2019 +0000
@@ -55,11 +55,10 @@
5555
5656 void WriteStatus(FILEHANDLE scn) const;
5757 void ReadStatus(FILEHANDLE scn);
58-
58+
5959 static bool DataInput(void *id, char *str, void *data);
6060 static void DrawOverlay(oapi::Sketchpad *pSkp, void *pParam);
6161
62-
6362 oapi::Font * font;
6463 SURFHANDLE hRenderSrf;
6564 SURFHANDLE hTexture;
diff -r 64da57d15fc6 -r 55338af04824 Utils/D3D9Client/bump_version.bat
--- a/Utils/D3D9Client/bump_version.bat Wed Nov 06 01:44:54 2019 +0000
+++ b/Utils/D3D9Client/bump_version.bat Wed Nov 06 17:27:28 2019 +0000
@@ -66,7 +66,7 @@
6666 }, {
6767 file : "Orbitersdk/D3D9Client/D3D9Client.rc",
6868 rexp : /PRODUCTVERSION\s+((\d+),(\d+),(\d+),(\d+))/,
69- subst : "{Major},0,0,0"
69+ subst : "{Major},{Minor},0,0"
7070 }, {
7171 file : "Orbitersdk/D3D9Client/D3D9Client.rc",
7272 rexp : /VALUE\s+\"FileVersion\"\,\s+\"((\d+)\.(\d+)\.(\d+)\.(\d+))\"/,
@@ -74,7 +74,7 @@
7474 }, {
7575 file : "Orbitersdk/D3D9Client/D3D9Client.rc",
7676 rexp : /VALUE\s+\"ProductVersion\"\,\s+\"((\d+)\.(\d+)\.(\d+)\.(\d+))\"/,
77- subst : "{Major}.0.0.0"
77+ subst : "{Major}.{Minor}.0.0"
7878 }, {
7979 file : "Orbitersdk/D3D9Client/doc/Doxyfile",
8080 rexp : /PROJECT_NUMBER\s*=\s*\"(?:Beta|R)?\s*([\d\.]+)\"/,
diff -r 64da57d15fc6 -r 55338af04824 Utils/D3D9Client/html/index.html
--- a/Utils/D3D9Client/html/index.html Wed Nov 06 01:44:54 2019 +0000
+++ b/Utils/D3D9Client/html/index.html Wed Nov 06 17:27:28 2019 +0000
@@ -2,7 +2,7 @@
22 <html>
33
44 <head>
5- <title>D3D9Client for Orbiter</title>
5+ <title>D3D9Client for Orbiter</title>
66 <meta content="">
77 </head>
88
@@ -23,32 +23,32 @@
2323 <img src="Title.jpg" alt="Title">
2424
2525 <br><br><br>
26-<tr valign="top"><td>
27-<br><br><br>
26+<tr valign="top"><td>
27+<br><br><br>
2828 <center>
2929 <!-- LATEST -->
30-<a href = "D3D9ClientR3.7-forOrbiter2016(r1093).zip"><img src = "download.jpg"></a><br><br>Release Date 25-Feb-2019
30+<a href = "D3D9ClientR3.10-forOrbiter2016(r1162).zip"><img src = "download.jpg"></a><br><br>Release Date 6-Sep-2019
3131 <br>
3232 <br>
33-</center>
33+</center>
3434 <br>
3535 <hr>
3636 <h2>Installation</h2>
3737 This is a graphics client/engine project to <a href="http://orbit.medphys.ucl.ac.uk/">Orbiter Spaceflight Simulator</a>. To install the client you need to download a package from a list below and extract it in the <b>root</b> folder of the Orbiter.
38-Any previously existing files should be replaced. Also to use a graphics client in Orbiter you need to run "Orbiter_ng.exe" instead
38+Any previously existing files should be replaced. Also to use a graphics client in Orbiter you need to run "Orbiter_ng.exe" instead
3939 of "Orbiter.exe" which uses a build in DX7 Engine. The client must be activated from the Modules tab otherwise you will see
4040 a command console while trying to start a scenario. Read further information from /Doc/D3D9Client.pdf
4141 <br><br>D3D9Client development and support thread is located in <a href="https://www.orbiter-forum.com/index.php">Orbiter-Forum</a>
4242 <br><br><hr>
4343 <h2>DirectX Runtimes</h2>
44-You will need a DirectX June 2010 redistributable backage to run the client. If the redistributable package
44+You will need a DirectX June 2010 redistributable backage to run the client. If the redistributable package
4545 isn't installed in your computer you will receive an error message "The program can't start because d3dx9_43.dll is
46-missing from your computer". Or you may see a pop-up window in Orbiter LaunchPad telling about a missing runtimes.
47-If that happens then download the package from a link below and extract the content of the package in any empty directory
46+missing from your computer". Or you may see a pop-up window in Orbiter LaunchPad telling about a missing runtimes.
47+If that happens then download the package from a link below and extract the content of the package in any empty directory
4848 you want and then find a <b>Setup.exe</b> and <b>run it.</b><i> It is a common mistake to forget the run the Setup.exe</i>
4949 You can delete the contents of the directory after the setup is completed. The directory is just a
5050 temporary storage for the installation files.<br><br>
51-Here is a link: <a href="https://www.microsoft.com/en-us/download/details.aspx?id=8109">June 2010 Redistiburables</a>
51+Here is a link: <a href="https://www.microsoft.com/en-us/download/details.aspx?id=8109">June 2010 Redistiburables</a>
5252 <br><br><hr>
5353 <h2>Terms of Use and Warranty</h2>
5454 You can use the client and other downloads found from this site under the same terms as the Orbiter itself. <a href="http://orbit.medphys.ucl.ac.uk/terms.html">Terms of Use</a><br><br>
@@ -69,35 +69,39 @@
6969 <h3>Downloads for Orbiter 2016</h3>
7070 <table cellspacing="10">
7171 <!-- MAINSTART -->
72+<tr><td><a href = "D3D9ClientR3.11-forOrbiter2016(r1174).zip">D3D9ClientR3.11-forOrbiter2016(r1174).zip</a></td><td> [beta]</td><td> (22-Sep-2019)</td></tr>
73+<tr><td><a href = "D3D9ClientR3.10-forOrbiter2016(r1162).zip">D3D9ClientR3.10-forOrbiter2016(r1162).zip</a></td><td> [stable]</td><td> (6-Sep-2019)</td></tr>
74+<tr><td><a href = "D3D9ClientR3.9-forOrbiter2016(r1155).zip">D3D9ClientR3.9-forOrbiter2016(r1155).zip</a></td><td> [beta]</td><td> (27-Aug-2019)</td></tr>
75+<tr><td><a href = "D3D9ClientR3.8-forOrbiter2016(r1137).zip">D3D9ClientR3.8-forOrbiter2016(r1137).zip</a></td><td> [beta]</td><td> (6-Apr-2019)</td></tr>
7276 <tr><td><a href = "D3D9ClientR3.7-forOrbiter2016(r1093).zip">D3D9ClientR3.7-forOrbiter2016(r1093).zip</a></td><td> [stable]</td><td> (25-Feb-2019)</td></tr>
73-<tr><td><a href = "D3D9ClientR3.6-forOrbiter2016(r1069).zip">D3D9ClientR3.6-forOrbiter2016(r1069).zip</a></td><td> [beta]</td><td> (5-Feb-2019)</td></tr>
74-<tr><td><a href = "D3D9ClientR3.5-forOrbiter2016(r1061).zip">D3D9ClientR3.5-forOrbiter2016(r1061).zip</a></td><td> [stable]</td><td> (15-Jan-2019)</td></tr>
7577 <!-- MAINEND -->
7678 </table>
7779 <br><br>
7880 <h3>Downloads for Orbiter Beta</h3>
7981 <table cellspacing="10">
8082 <!-- BETASTART -->
83+<tr><td><a href = "D3D9ClientBeta28.11-forBETA r90(r1173).zip">D3D9ClientBeta28.11-forBETA r90(r1173).zip</a></td><td> [beta]</td><td> (22-Sep-2019)</td></tr>
84+<tr><td><a href = "D3D9ClientBeta28.10-forBETA r89(r1163).zip">D3D9ClientBeta28.10-forBETA r89(r1163).zip</a></td><td> [stable]</td><td> (6-Sep-2019)</td></tr>
85+<tr><td><a href = "D3D9ClientBeta28.9-for(r1155).zip">D3D9ClientBeta28.9-for(r1155).zip</a></td><td> [beta]</td><td> (27-Aug-2019)</td></tr>
86+<tr><td><a href = "D3D9ClientBeta28.8-forBETA r87(r1138).zip">D3D9ClientBeta28.8-forBETA r87(r1138).zip</a></td><td> [beta]</td><td> (6-Apr-2019)</td></tr>
8187 <tr><td><a href = "D3D9ClientBeta28.7-forBETA r85(r1089).zip">D3D9ClientBeta28.7-forBETA r85(r1089).zip</a></td><td> [beta]</td><td> (24-Feb-2019)</td></tr>
82-<tr><td><a href = "D3D9ClientBeta28.6-forBETA r84(r1064M).zip">D3D9ClientBeta28.6-forBETA r84(r1064M).zip</a></td><td> [beta]</td><td> (5-Feb-2019)</td></tr>
8388 <!-- BETAEND -->
8489 </table>
8590 <br><br>
8691 <h3>Downloads for Orbiter 2010-P1</h3>
8792 <table cellspacing="10">
88-<tr><td><a href = "D3D9ClientR16_5.zip">D3D9ClientR16_5.zip</a></td><td> [stable]</td><td> </td></tr>
93+<tr><td><a href = "D3D9ClientR16_8.zip">D3D9ClientR16_8.zip</a></td><td> [stable]</td><td>(27-Aug-2019)</td></tr>
8994 <tr><td><a href = "D3D9ClientR15.zip">D3D9ClientR15.zip</a></td><td> [stable]</td><td> </td></tr>
9095 </table>
91-<i>Discontinued</i>
9296 <br><br><br>
9397 <hr>
94-<h2>MicroTexture Pack for D3D9Client</h2>
98+<h2>MicroTexture Pack</h2>
9599 <br>
96-This is a planetary surface microtexture package for D3D9Client
97-The package contains textures for the Moon and the Mars.
100+This is a planetary surface microtexture package for D3D9Client.
101+The package contains textures for the Moon and the Mars.
98102 Here is a screen shot before and after installation.
99103 <br><br>
100-<a href="MicroTextures.zip">Download (~25MB)</a><br><br>
104+<a href="MicroTextures.zip">Download (~25MB)</a><br><br>
101105
102106 <center>
103107 <img src="Micro.jpg" alt="MicroTexture Shot">
@@ -109,7 +113,7 @@
109113 <center>
110114 <table border="0" cellspacing="9">
111115 <tr>
112- <td><a href="screenshot1.jpg"><img src="thumb1.jpg" title="International Spacestation. Models by Donamy and Thotron" border="0"></a></td>
116+ <td><a href="screenshot1.jpg"><img src="thumb1.jpg" title="International Space Station. Models by Donamy and Thorton" border="0"></a></td>
113117 <td><a href="screenshot2.jpg"><img src="thumb2.jpg" title="Dragon docking at ISS. Model by Donamy, Texture work by Felix24" border="0"></a></td>
114118 <td><a href="screenshot3.jpg"><img src="thumb3.jpg" title="We have an EVA going. Again a nice work from Donamy and Felix24" border="0"></a></td>
115119 </tr>
@@ -118,12 +122,12 @@
118122 <td><a href="screenshot5.jpg"><img src="thumb5.jpg" title="Spaceshuttle Atlantis on a launchpad waiting to launch" border="0"></a></td>
119123 <td></td>
120124 </tr>
121-</table>
125+</table>
122126 <br><br><br><br><br><br>
123127 </center>
124128 </td></tr>
125129 </table>
126-(All works are copyrighted)
130+(All works are copyrighted)
127131 </font>
128132 </center>
129133 </body>
Afficher sur ancien navigateur de dépôt.