diff options
Diffstat (limited to 'libraries/irrlicht-1.8/examples/22.MaterialViewer')
8 files changed, 2308 insertions, 2308 deletions
diff --git a/libraries/irrlicht-1.8/examples/22.MaterialViewer/Makefile b/libraries/irrlicht-1.8/examples/22.MaterialViewer/Makefile index 8016988..77953eb 100644 --- a/libraries/irrlicht-1.8/examples/22.MaterialViewer/Makefile +++ b/libraries/irrlicht-1.8/examples/22.MaterialViewer/Makefile | |||
@@ -1,38 +1,38 @@ | |||
1 | # Makefile for Irrlicht Examples | 1 | # Makefile for Irrlicht Examples |
2 | # It's usually sufficient to change just the target name and source file list | 2 | # It's usually sufficient to change just the target name and source file list |
3 | # and be sure that CXX is set to a valid compiler | 3 | # and be sure that CXX is set to a valid compiler |
4 | Target = 22.MaterialViewer | 4 | Target = 22.MaterialViewer |
5 | Sources = main.cpp | 5 | Sources = main.cpp |
6 | 6 | ||
7 | # general compiler settings | 7 | # general compiler settings |
8 | CPPFLAGS = -I../../include -I/usr/X11R6/include | 8 | CPPFLAGS = -I../../include -I/usr/X11R6/include |
9 | #CXXFLAGS = -O3 -ffast-math | 9 | #CXXFLAGS = -O3 -ffast-math |
10 | CXXFLAGS = -g -Wall | 10 | CXXFLAGS = -g -Wall |
11 | 11 | ||
12 | #default target is Linux | 12 | #default target is Linux |
13 | all: all_linux | 13 | all: all_linux |
14 | 14 | ||
15 | ifeq ($(HOSTTYPE), x86_64) | 15 | ifeq ($(HOSTTYPE), x86_64) |
16 | LIBSELECT=64 | 16 | LIBSELECT=64 |
17 | endif | 17 | endif |
18 | 18 | ||
19 | # target specific settings | 19 | # target specific settings |
20 | all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor | 20 | all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor |
21 | all_linux clean_linux: SYSTEM=Linux | 21 | all_linux clean_linux: SYSTEM=Linux |
22 | all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm | 22 | all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm |
23 | all_win32 clean_win32: SYSTEM=Win32-gcc | 23 | all_win32 clean_win32: SYSTEM=Win32-gcc |
24 | all_win32 clean_win32: SUF=.exe | 24 | all_win32 clean_win32: SUF=.exe |
25 | # name of the binary - only valid for targets which set SYSTEM | 25 | # name of the binary - only valid for targets which set SYSTEM |
26 | DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) | 26 | DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) |
27 | 27 | ||
28 | all_linux all_win32: | 28 | all_linux all_win32: |
29 | $(warning Building...) | 29 | $(warning Building...) |
30 | $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(Sources) -o $(DESTPATH) $(LDFLAGS) | 30 | $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(Sources) -o $(DESTPATH) $(LDFLAGS) |
31 | 31 | ||
32 | clean: clean_linux clean_win32 | 32 | clean: clean_linux clean_win32 |
33 | $(warning Cleaning...) | 33 | $(warning Cleaning...) |
34 | 34 | ||
35 | clean_linux clean_win32: | 35 | clean_linux clean_win32: |
36 | @$(RM) $(DESTPATH) | 36 | @$(RM) $(DESTPATH) |
37 | 37 | ||
38 | .PHONY: all all_win32 clean clean_linux clean_win32 | 38 | .PHONY: all all_win32 clean clean_linux clean_win32 |
diff --git a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer.dev b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer.dev index dfd9d4d..5e160ad 100644 --- a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer.dev +++ b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer.dev | |||
@@ -1,59 +1,59 @@ | |||
1 | [Project] | 1 | [Project] |
2 | FileName=example.dev | 2 | FileName=example.dev |
3 | Name=Irrlicht Example 22 Material Viewer | 3 | Name=Irrlicht Example 22 Material Viewer |
4 | UnitCount=1 | 4 | UnitCount=1 |
5 | Type=1 | 5 | Type=1 |
6 | Ver=1 | 6 | Ver=1 |
7 | ObjFiles= | 7 | ObjFiles= |
8 | Includes=..\..\include | 8 | Includes=..\..\include |
9 | Libs= | 9 | Libs= |
10 | PrivateResource= | 10 | PrivateResource= |
11 | ResourceIncludes= | 11 | ResourceIncludes= |
12 | MakeIncludes= | 12 | MakeIncludes= |
13 | Compiler= | 13 | Compiler= |
14 | CppCompiler= | 14 | CppCompiler= |
15 | Linker=../../lib/Win32-gcc/libIrrlicht.a_@@_ | 15 | Linker=../../lib/Win32-gcc/libIrrlicht.a_@@_ |
16 | IsCpp=1 | 16 | IsCpp=1 |
17 | Icon= | 17 | Icon= |
18 | ExeOutput=../../bin/Win32-gcc | 18 | ExeOutput=../../bin/Win32-gcc |
19 | ObjectOutput=obj | 19 | ObjectOutput=obj |
20 | OverrideOutput=1 | 20 | OverrideOutput=1 |
21 | OverrideOutputName=22.MaterialViewer.exe | 21 | OverrideOutputName=22.MaterialViewer.exe |
22 | HostApplication= | 22 | HostApplication= |
23 | Folders= | 23 | Folders= |
24 | CommandLine= | 24 | CommandLine= |
25 | IncludeVersionInfo=0 | 25 | IncludeVersionInfo=0 |
26 | SupportXPThemes=0 | 26 | SupportXPThemes=0 |
27 | CompilerSet=0 | 27 | CompilerSet=0 |
28 | CompilerSettings=0000000000000000000000 | 28 | CompilerSettings=0000000000000000000000 |
29 | UseCustomMakefile=0 | 29 | UseCustomMakefile=0 |
30 | CustomMakefile= | 30 | CustomMakefile= |
31 | 31 | ||
32 | [Unit1] | 32 | [Unit1] |
33 | FileName=main.cpp | 33 | FileName=main.cpp |
34 | CompileCpp=1 | 34 | CompileCpp=1 |
35 | Folder=Projekt1 | 35 | Folder=Projekt1 |
36 | Compile=1 | 36 | Compile=1 |
37 | Link=1 | 37 | Link=1 |
38 | Priority=1000 | 38 | Priority=1000 |
39 | OverrideBuildCmd=0 | 39 | OverrideBuildCmd=0 |
40 | BuildCmd= | 40 | BuildCmd= |
41 | 41 | ||
42 | [VersionInfo] | 42 | [VersionInfo] |
43 | Major=0 | 43 | Major=0 |
44 | Minor=1 | 44 | Minor=1 |
45 | Release=1 | 45 | Release=1 |
46 | Build=1 | 46 | Build=1 |
47 | LanguageID=1033 | 47 | LanguageID=1033 |
48 | CharsetID=1252 | 48 | CharsetID=1252 |
49 | CompanyName= | 49 | CompanyName= |
50 | FileVersion= | 50 | FileVersion= |
51 | FileDescription=Irrlicht Engine example compiled using DevCpp and gcc | 51 | FileDescription=Irrlicht Engine example compiled using DevCpp and gcc |
52 | InternalName= | 52 | InternalName= |
53 | LegalCopyright= | 53 | LegalCopyright= |
54 | LegalTrademarks= | 54 | LegalTrademarks= |
55 | OriginalFilename= | 55 | OriginalFilename= |
56 | ProductName= | 56 | ProductName= |
57 | ProductVersion= | 57 | ProductVersion= |
58 | AutoIncBuildNr=0 | 58 | AutoIncBuildNr=0 |
59 | 59 | ||
diff --git a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer.vcproj b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer.vcproj index 7419359..d9d6a98 100644 --- a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer.vcproj +++ b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer.vcproj | |||
@@ -1,229 +1,229 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
2 | <VisualStudioProject | 2 | <VisualStudioProject |
3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
4 | Version="7.10" | 4 | Version="7.10" |
5 | Name="22.MaterialViewer" | 5 | Name="22.MaterialViewer" |
6 | ProjectGUID="{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}" | 6 | ProjectGUID="{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}" |
7 | TargetFrameworkVersion="131072" | 7 | TargetFrameworkVersion="131072" |
8 | > | 8 | > |
9 | <Platforms> | 9 | <Platforms> |
10 | <Platform | 10 | <Platform |
11 | Name="Win32" | 11 | Name="Win32" |
12 | /> | 12 | /> |
13 | </Platforms> | 13 | </Platforms> |
14 | <ToolFiles> | 14 | <ToolFiles> |
15 | </ToolFiles> | 15 | </ToolFiles> |
16 | <Configurations> | 16 | <Configurations> |
17 | <Configuration | 17 | <Configuration |
18 | Name="Release|Win32" | 18 | Name="Release|Win32" |
19 | OutputDirectory=".\Release" | 19 | OutputDirectory=".\Release" |
20 | IntermediateDirectory=".\Release" | 20 | IntermediateDirectory=".\Release" |
21 | ConfigurationType="1" | 21 | ConfigurationType="1" |
22 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 22 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
23 | UseOfMFC="0" | 23 | UseOfMFC="0" |
24 | ATLMinimizesCRunTimeLibraryUsage="false" | 24 | ATLMinimizesCRunTimeLibraryUsage="false" |
25 | CharacterSet="2" | 25 | CharacterSet="2" |
26 | > | 26 | > |
27 | <Tool | 27 | <Tool |
28 | Name="VCPreBuildEventTool" | 28 | Name="VCPreBuildEventTool" |
29 | /> | 29 | /> |
30 | <Tool | 30 | <Tool |
31 | Name="VCCustomBuildTool" | 31 | Name="VCCustomBuildTool" |
32 | /> | 32 | /> |
33 | <Tool | 33 | <Tool |
34 | Name="VCXMLDataGeneratorTool" | 34 | Name="VCXMLDataGeneratorTool" |
35 | /> | 35 | /> |
36 | <Tool | 36 | <Tool |
37 | Name="VCWebServiceProxyGeneratorTool" | 37 | Name="VCWebServiceProxyGeneratorTool" |
38 | /> | 38 | /> |
39 | <Tool | 39 | <Tool |
40 | Name="VCMIDLTool" | 40 | Name="VCMIDLTool" |
41 | TypeLibraryName=".\Release/MaterialViewer.tlb" | 41 | TypeLibraryName=".\Release/MaterialViewer.tlb" |
42 | HeaderFileName="" | 42 | HeaderFileName="" |
43 | /> | 43 | /> |
44 | <Tool | 44 | <Tool |
45 | Name="VCCLCompilerTool" | 45 | Name="VCCLCompilerTool" |
46 | Optimization="2" | 46 | Optimization="2" |
47 | InlineFunctionExpansion="1" | 47 | InlineFunctionExpansion="1" |
48 | AdditionalIncludeDirectories="..\..\include" | 48 | AdditionalIncludeDirectories="..\..\include" |
49 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | 49 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" |
50 | StringPooling="true" | 50 | StringPooling="true" |
51 | RuntimeLibrary="0" | 51 | RuntimeLibrary="0" |
52 | EnableFunctionLevelLinking="true" | 52 | EnableFunctionLevelLinking="true" |
53 | UsePrecompiledHeader="0" | 53 | UsePrecompiledHeader="0" |
54 | PrecompiledHeaderFile=".\Release/MaterialViewer.pch" | 54 | PrecompiledHeaderFile=".\Release/MaterialViewer.pch" |
55 | AssemblerListingLocation=".\Release/" | 55 | AssemblerListingLocation=".\Release/" |
56 | ObjectFile=".\Release/" | 56 | ObjectFile=".\Release/" |
57 | ProgramDataBaseFileName=".\Release/" | 57 | ProgramDataBaseFileName=".\Release/" |
58 | WarningLevel="3" | 58 | WarningLevel="3" |
59 | SuppressStartupBanner="true" | 59 | SuppressStartupBanner="true" |
60 | CompileAs="0" | 60 | CompileAs="0" |
61 | /> | 61 | /> |
62 | <Tool | 62 | <Tool |
63 | Name="VCManagedResourceCompilerTool" | 63 | Name="VCManagedResourceCompilerTool" |
64 | /> | 64 | /> |
65 | <Tool | 65 | <Tool |
66 | Name="VCResourceCompilerTool" | 66 | Name="VCResourceCompilerTool" |
67 | PreprocessorDefinitions="NDEBUG" | 67 | PreprocessorDefinitions="NDEBUG" |
68 | Culture="3079" | 68 | Culture="3079" |
69 | /> | 69 | /> |
70 | <Tool | 70 | <Tool |
71 | Name="VCPreLinkEventTool" | 71 | Name="VCPreLinkEventTool" |
72 | /> | 72 | /> |
73 | <Tool | 73 | <Tool |
74 | Name="VCLinkerTool" | 74 | Name="VCLinkerTool" |
75 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" | 75 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" |
76 | LinkIncremental="0" | 76 | LinkIncremental="0" |
77 | SuppressStartupBanner="true" | 77 | SuppressStartupBanner="true" |
78 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" | 78 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" |
79 | ProgramDatabaseFile=".\Release/MaterialViewer.pdb" | 79 | ProgramDatabaseFile=".\Release/MaterialViewer.pdb" |
80 | SubSystem="1" | 80 | SubSystem="1" |
81 | RandomizedBaseAddress="1" | 81 | RandomizedBaseAddress="1" |
82 | DataExecutionPrevention="0" | 82 | DataExecutionPrevention="0" |
83 | TargetMachine="1" | 83 | TargetMachine="1" |
84 | /> | 84 | /> |
85 | <Tool | 85 | <Tool |
86 | Name="VCALinkTool" | 86 | Name="VCALinkTool" |
87 | /> | 87 | /> |
88 | <Tool | 88 | <Tool |
89 | Name="VCManifestTool" | 89 | Name="VCManifestTool" |
90 | /> | 90 | /> |
91 | <Tool | 91 | <Tool |
92 | Name="VCXDCMakeTool" | 92 | Name="VCXDCMakeTool" |
93 | /> | 93 | /> |
94 | <Tool | 94 | <Tool |
95 | Name="VCBscMakeTool" | 95 | Name="VCBscMakeTool" |
96 | /> | 96 | /> |
97 | <Tool | 97 | <Tool |
98 | Name="VCFxCopTool" | 98 | Name="VCFxCopTool" |
99 | /> | 99 | /> |
100 | <Tool | 100 | <Tool |
101 | Name="VCAppVerifierTool" | 101 | Name="VCAppVerifierTool" |
102 | /> | 102 | /> |
103 | <Tool | 103 | <Tool |
104 | Name="VCPostBuildEventTool" | 104 | Name="VCPostBuildEventTool" |
105 | /> | 105 | /> |
106 | </Configuration> | 106 | </Configuration> |
107 | <Configuration | 107 | <Configuration |
108 | Name="Debug|Win32" | 108 | Name="Debug|Win32" |
109 | OutputDirectory=".\Debug" | 109 | OutputDirectory=".\Debug" |
110 | IntermediateDirectory=".\Debug" | 110 | IntermediateDirectory=".\Debug" |
111 | ConfigurationType="1" | 111 | ConfigurationType="1" |
112 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 112 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
113 | UseOfMFC="0" | 113 | UseOfMFC="0" |
114 | ATLMinimizesCRunTimeLibraryUsage="false" | 114 | ATLMinimizesCRunTimeLibraryUsage="false" |
115 | CharacterSet="2" | 115 | CharacterSet="2" |
116 | > | 116 | > |
117 | <Tool | 117 | <Tool |
118 | Name="VCPreBuildEventTool" | 118 | Name="VCPreBuildEventTool" |
119 | /> | 119 | /> |
120 | <Tool | 120 | <Tool |
121 | Name="VCCustomBuildTool" | 121 | Name="VCCustomBuildTool" |
122 | /> | 122 | /> |
123 | <Tool | 123 | <Tool |
124 | Name="VCXMLDataGeneratorTool" | 124 | Name="VCXMLDataGeneratorTool" |
125 | /> | 125 | /> |
126 | <Tool | 126 | <Tool |
127 | Name="VCWebServiceProxyGeneratorTool" | 127 | Name="VCWebServiceProxyGeneratorTool" |
128 | /> | 128 | /> |
129 | <Tool | 129 | <Tool |
130 | Name="VCMIDLTool" | 130 | Name="VCMIDLTool" |
131 | TypeLibraryName=".\Debug/MaterialViewer.tlb" | 131 | TypeLibraryName=".\Debug/MaterialViewer.tlb" |
132 | HeaderFileName="" | 132 | HeaderFileName="" |
133 | /> | 133 | /> |
134 | <Tool | 134 | <Tool |
135 | Name="VCCLCompilerTool" | 135 | Name="VCCLCompilerTool" |
136 | Optimization="0" | 136 | Optimization="0" |
137 | AdditionalIncludeDirectories="..\..\include" | 137 | AdditionalIncludeDirectories="..\..\include" |
138 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | 138 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" |
139 | BasicRuntimeChecks="3" | 139 | BasicRuntimeChecks="3" |
140 | RuntimeLibrary="1" | 140 | RuntimeLibrary="1" |
141 | UsePrecompiledHeader="0" | 141 | UsePrecompiledHeader="0" |
142 | PrecompiledHeaderFile=".\Debug/MaterialViewer.pch" | 142 | PrecompiledHeaderFile=".\Debug/MaterialViewer.pch" |
143 | AssemblerListingLocation=".\Debug/" | 143 | AssemblerListingLocation=".\Debug/" |
144 | ObjectFile=".\Debug/" | 144 | ObjectFile=".\Debug/" |
145 | ProgramDataBaseFileName=".\Debug/" | 145 | ProgramDataBaseFileName=".\Debug/" |
146 | WarningLevel="3" | 146 | WarningLevel="3" |
147 | SuppressStartupBanner="true" | 147 | SuppressStartupBanner="true" |
148 | DebugInformationFormat="4" | 148 | DebugInformationFormat="4" |
149 | CompileAs="0" | 149 | CompileAs="0" |
150 | /> | 150 | /> |
151 | <Tool | 151 | <Tool |
152 | Name="VCManagedResourceCompilerTool" | 152 | Name="VCManagedResourceCompilerTool" |
153 | /> | 153 | /> |
154 | <Tool | 154 | <Tool |
155 | Name="VCResourceCompilerTool" | 155 | Name="VCResourceCompilerTool" |
156 | PreprocessorDefinitions="_DEBUG" | 156 | PreprocessorDefinitions="_DEBUG" |
157 | Culture="3079" | 157 | Culture="3079" |
158 | /> | 158 | /> |
159 | <Tool | 159 | <Tool |
160 | Name="VCPreLinkEventTool" | 160 | Name="VCPreLinkEventTool" |
161 | /> | 161 | /> |
162 | <Tool | 162 | <Tool |
163 | Name="VCLinkerTool" | 163 | Name="VCLinkerTool" |
164 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" | 164 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" |
165 | LinkIncremental="0" | 165 | LinkIncremental="0" |
166 | SuppressStartupBanner="true" | 166 | SuppressStartupBanner="true" |
167 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" | 167 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" |
168 | GenerateDebugInformation="true" | 168 | GenerateDebugInformation="true" |
169 | ProgramDatabaseFile=".\Debug/MaterialViewer.pdb" | 169 | ProgramDatabaseFile=".\Debug/MaterialViewer.pdb" |
170 | SubSystem="1" | 170 | SubSystem="1" |
171 | RandomizedBaseAddress="1" | 171 | RandomizedBaseAddress="1" |
172 | DataExecutionPrevention="0" | 172 | DataExecutionPrevention="0" |
173 | TargetMachine="1" | 173 | TargetMachine="1" |
174 | /> | 174 | /> |
175 | <Tool | 175 | <Tool |
176 | Name="VCALinkTool" | 176 | Name="VCALinkTool" |
177 | /> | 177 | /> |
178 | <Tool | 178 | <Tool |
179 | Name="VCManifestTool" | 179 | Name="VCManifestTool" |
180 | /> | 180 | /> |
181 | <Tool | 181 | <Tool |
182 | Name="VCXDCMakeTool" | 182 | Name="VCXDCMakeTool" |
183 | /> | 183 | /> |
184 | <Tool | 184 | <Tool |
185 | Name="VCBscMakeTool" | 185 | Name="VCBscMakeTool" |
186 | /> | 186 | /> |
187 | <Tool | 187 | <Tool |
188 | Name="VCFxCopTool" | 188 | Name="VCFxCopTool" |
189 | /> | 189 | /> |
190 | <Tool | 190 | <Tool |
191 | Name="VCAppVerifierTool" | 191 | Name="VCAppVerifierTool" |
192 | /> | 192 | /> |
193 | <Tool | 193 | <Tool |
194 | Name="VCPostBuildEventTool" | 194 | Name="VCPostBuildEventTool" |
195 | /> | 195 | /> |
196 | </Configuration> | 196 | </Configuration> |
197 | </Configurations> | 197 | </Configurations> |
198 | <References> | 198 | <References> |
199 | </References> | 199 | </References> |
200 | <Files> | 200 | <Files> |
201 | <File | 201 | <File |
202 | RelativePath="main.cpp" | 202 | RelativePath="main.cpp" |
203 | > | 203 | > |
204 | <FileConfiguration | 204 | <FileConfiguration |
205 | Name="Release|Win32" | 205 | Name="Release|Win32" |
206 | > | 206 | > |
207 | <Tool | 207 | <Tool |
208 | Name="VCCLCompilerTool" | 208 | Name="VCCLCompilerTool" |
209 | Optimization="2" | 209 | Optimization="2" |
210 | AdditionalIncludeDirectories="" | 210 | AdditionalIncludeDirectories="" |
211 | PreprocessorDefinitions="" | 211 | PreprocessorDefinitions="" |
212 | /> | 212 | /> |
213 | </FileConfiguration> | 213 | </FileConfiguration> |
214 | <FileConfiguration | 214 | <FileConfiguration |
215 | Name="Debug|Win32" | 215 | Name="Debug|Win32" |
216 | > | 216 | > |
217 | <Tool | 217 | <Tool |
218 | Name="VCCLCompilerTool" | 218 | Name="VCCLCompilerTool" |
219 | Optimization="0" | 219 | Optimization="0" |
220 | AdditionalIncludeDirectories="" | 220 | AdditionalIncludeDirectories="" |
221 | PreprocessorDefinitions="" | 221 | PreprocessorDefinitions="" |
222 | BasicRuntimeChecks="3" | 222 | BasicRuntimeChecks="3" |
223 | /> | 223 | /> |
224 | </FileConfiguration> | 224 | </FileConfiguration> |
225 | </File> | 225 | </File> |
226 | </Files> | 226 | </Files> |
227 | <Globals> | 227 | <Globals> |
228 | </Globals> | 228 | </Globals> |
229 | </VisualStudioProject> | 229 | </VisualStudioProject> |
diff --git a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc10.vcxproj b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc10.vcxproj index 6a8b5c8..8d18a86 100644 --- a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc10.vcxproj +++ b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc10.vcxproj | |||
@@ -1,231 +1,231 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
3 | <ItemGroup Label="ProjectConfigurations"> | 3 | <ItemGroup Label="ProjectConfigurations"> |
4 | <ProjectConfiguration Include="Debug|Win32"> | 4 | <ProjectConfiguration Include="Debug|Win32"> |
5 | <Configuration>Debug</Configuration> | 5 | <Configuration>Debug</Configuration> |
6 | <Platform>Win32</Platform> | 6 | <Platform>Win32</Platform> |
7 | </ProjectConfiguration> | 7 | </ProjectConfiguration> |
8 | <ProjectConfiguration Include="Debug|x64"> | 8 | <ProjectConfiguration Include="Debug|x64"> |
9 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
10 | <Platform>x64</Platform> | 10 | <Platform>x64</Platform> |
11 | </ProjectConfiguration> | 11 | </ProjectConfiguration> |
12 | <ProjectConfiguration Include="Release|Win32"> | 12 | <ProjectConfiguration Include="Release|Win32"> |
13 | <Configuration>Release</Configuration> | 13 | <Configuration>Release</Configuration> |
14 | <Platform>Win32</Platform> | 14 | <Platform>Win32</Platform> |
15 | </ProjectConfiguration> | 15 | </ProjectConfiguration> |
16 | <ProjectConfiguration Include="Release|x64"> | 16 | <ProjectConfiguration Include="Release|x64"> |
17 | <Configuration>Release</Configuration> | 17 | <Configuration>Release</Configuration> |
18 | <Platform>x64</Platform> | 18 | <Platform>x64</Platform> |
19 | </ProjectConfiguration> | 19 | </ProjectConfiguration> |
20 | </ItemGroup> | 20 | </ItemGroup> |
21 | <PropertyGroup Label="Globals"> | 21 | <PropertyGroup Label="Globals"> |
22 | <ProjectName>22.MaterialViewer</ProjectName> | 22 | <ProjectName>22.MaterialViewer</ProjectName> |
23 | <ProjectGuid>{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}</ProjectGuid> | 23 | <ProjectGuid>{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}</ProjectGuid> |
24 | <RootNamespace>MaterialViewer</RootNamespace> | 24 | <RootNamespace>MaterialViewer</RootNamespace> |
25 | </PropertyGroup> | 25 | </PropertyGroup> |
26 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 26 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
27 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | 27 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
28 | <ConfigurationType>Application</ConfigurationType> | 28 | <ConfigurationType>Application</ConfigurationType> |
29 | <CharacterSet>MultiByte</CharacterSet> | 29 | <CharacterSet>MultiByte</CharacterSet> |
30 | </PropertyGroup> | 30 | </PropertyGroup> |
31 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | 31 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
32 | <ConfigurationType>Application</ConfigurationType> | 32 | <ConfigurationType>Application</ConfigurationType> |
33 | <CharacterSet>MultiByte</CharacterSet> | 33 | <CharacterSet>MultiByte</CharacterSet> |
34 | </PropertyGroup> | 34 | </PropertyGroup> |
35 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 35 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
36 | <ConfigurationType>Application</ConfigurationType> | 36 | <ConfigurationType>Application</ConfigurationType> |
37 | <CharacterSet>MultiByte</CharacterSet> | 37 | <CharacterSet>MultiByte</CharacterSet> |
38 | </PropertyGroup> | 38 | </PropertyGroup> |
39 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | 39 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
40 | <ConfigurationType>Application</ConfigurationType> | 40 | <ConfigurationType>Application</ConfigurationType> |
41 | <CharacterSet>MultiByte</CharacterSet> | 41 | <CharacterSet>MultiByte</CharacterSet> |
42 | </PropertyGroup> | 42 | </PropertyGroup> |
43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
44 | <ImportGroup Label="ExtensionSettings"> | 44 | <ImportGroup Label="ExtensionSettings"> |
45 | </ImportGroup> | 45 | </ImportGroup> |
46 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | 46 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
47 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | 47 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
48 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | 48 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> |
49 | </ImportGroup> | 49 | </ImportGroup> |
50 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | 50 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
51 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | 51 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
52 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | 52 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> |
53 | </ImportGroup> | 53 | </ImportGroup> |
54 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | 54 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
55 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | 55 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
56 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | 56 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> |
57 | </ImportGroup> | 57 | </ImportGroup> |
58 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | 58 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> |
59 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | 59 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
60 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | 60 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> |
61 | </ImportGroup> | 61 | </ImportGroup> |
62 | <PropertyGroup Label="UserMacros" /> | 62 | <PropertyGroup Label="UserMacros" /> |
63 | <PropertyGroup> | 63 | <PropertyGroup> |
64 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | 64 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> |
65 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> | 65 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> |
66 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\Win64-VisualStudio\</OutDir> | 66 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\Win64-VisualStudio\</OutDir> |
67 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | 67 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> |
68 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | 68 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> |
69 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> | 69 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> |
70 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\Win64-VisualStudio\</OutDir> | 70 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\Win64-VisualStudio\</OutDir> |
71 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | 71 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> |
72 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | 72 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> |
73 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | 73 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> |
74 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | 74 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> |
75 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | 75 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> |
76 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | 76 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> |
77 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | 77 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> |
78 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | 78 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> |
79 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | 79 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> |
80 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | 80 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> |
81 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | 81 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> |
82 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | 82 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> |
83 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | 83 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> |
84 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | 84 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> |
85 | </PropertyGroup> | 85 | </PropertyGroup> |
86 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 86 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
87 | <Midl> | 87 | <Midl> |
88 | <TypeLibraryName>.\Release/MaterialViewer.tlb</TypeLibraryName> | 88 | <TypeLibraryName>.\Release/MaterialViewer.tlb</TypeLibraryName> |
89 | <HeaderFileName> | 89 | <HeaderFileName> |
90 | </HeaderFileName> | 90 | </HeaderFileName> |
91 | </Midl> | 91 | </Midl> |
92 | <ClCompile> | 92 | <ClCompile> |
93 | <Optimization>MaxSpeed</Optimization> | 93 | <Optimization>MaxSpeed</Optimization> |
94 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 94 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
95 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 95 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
96 | <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 96 | <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
97 | <StringPooling>true</StringPooling> | 97 | <StringPooling>true</StringPooling> |
98 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 98 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
99 | <FunctionLevelLinking>true</FunctionLevelLinking> | 99 | <FunctionLevelLinking>true</FunctionLevelLinking> |
100 | <PrecompiledHeader> | 100 | <PrecompiledHeader> |
101 | </PrecompiledHeader> | 101 | </PrecompiledHeader> |
102 | <WarningLevel>Level3</WarningLevel> | 102 | <WarningLevel>Level3</WarningLevel> |
103 | </ClCompile> | 103 | </ClCompile> |
104 | <ResourceCompile> | 104 | <ResourceCompile> |
105 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 105 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
106 | <Culture>0x0c07</Culture> | 106 | <Culture>0x0c07</Culture> |
107 | </ResourceCompile> | 107 | </ResourceCompile> |
108 | <Link> | 108 | <Link> |
109 | <OutputFile>..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe</OutputFile> | 109 | <OutputFile>..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe</OutputFile> |
110 | <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 110 | <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
111 | <ProgramDatabaseFile>.\Release/MaterialViewer.pdb</ProgramDatabaseFile> | 111 | <ProgramDatabaseFile>.\Release/MaterialViewer.pdb</ProgramDatabaseFile> |
112 | <SubSystem>Console</SubSystem> | 112 | <SubSystem>Console</SubSystem> |
113 | <DataExecutionPrevention> | 113 | <DataExecutionPrevention> |
114 | </DataExecutionPrevention> | 114 | </DataExecutionPrevention> |
115 | </Link> | 115 | </Link> |
116 | </ItemDefinitionGroup> | 116 | </ItemDefinitionGroup> |
117 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 117 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
118 | <Midl> | 118 | <Midl> |
119 | <TypeLibraryName>.\Release/MaterialViewer.tlb</TypeLibraryName> | 119 | <TypeLibraryName>.\Release/MaterialViewer.tlb</TypeLibraryName> |
120 | <HeaderFileName> | 120 | <HeaderFileName> |
121 | </HeaderFileName> | 121 | </HeaderFileName> |
122 | </Midl> | 122 | </Midl> |
123 | <ClCompile> | 123 | <ClCompile> |
124 | <Optimization>MaxSpeed</Optimization> | 124 | <Optimization>MaxSpeed</Optimization> |
125 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 125 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
126 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 126 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
127 | <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 127 | <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
128 | <StringPooling>true</StringPooling> | 128 | <StringPooling>true</StringPooling> |
129 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 129 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
130 | <FunctionLevelLinking>true</FunctionLevelLinking> | 130 | <FunctionLevelLinking>true</FunctionLevelLinking> |
131 | <PrecompiledHeader> | 131 | <PrecompiledHeader> |
132 | </PrecompiledHeader> | 132 | </PrecompiledHeader> |
133 | <WarningLevel>Level3</WarningLevel> | 133 | <WarningLevel>Level3</WarningLevel> |
134 | </ClCompile> | 134 | </ClCompile> |
135 | <ResourceCompile> | 135 | <ResourceCompile> |
136 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 136 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
137 | <Culture>0x0c07</Culture> | 137 | <Culture>0x0c07</Culture> |
138 | </ResourceCompile> | 138 | </ResourceCompile> |
139 | <Link> | 139 | <Link> |
140 | <OutputFile>..\..\bin\Win64-VisualStudio\22.MaterialViewer.exe</OutputFile> | 140 | <OutputFile>..\..\bin\Win64-VisualStudio\22.MaterialViewer.exe</OutputFile> |
141 | <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 141 | <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
142 | <ProgramDatabaseFile>.\Release/MaterialViewer.pdb</ProgramDatabaseFile> | 142 | <ProgramDatabaseFile>.\Release/MaterialViewer.pdb</ProgramDatabaseFile> |
143 | <SubSystem>Console</SubSystem> | 143 | <SubSystem>Console</SubSystem> |
144 | <DataExecutionPrevention> | 144 | <DataExecutionPrevention> |
145 | </DataExecutionPrevention> | 145 | </DataExecutionPrevention> |
146 | </Link> | 146 | </Link> |
147 | </ItemDefinitionGroup> | 147 | </ItemDefinitionGroup> |
148 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | 148 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
149 | <Midl> | 149 | <Midl> |
150 | <TypeLibraryName>.\Debug/MaterialViewer.tlb</TypeLibraryName> | 150 | <TypeLibraryName>.\Debug/MaterialViewer.tlb</TypeLibraryName> |
151 | <HeaderFileName> | 151 | <HeaderFileName> |
152 | </HeaderFileName> | 152 | </HeaderFileName> |
153 | </Midl> | 153 | </Midl> |
154 | <ClCompile> | 154 | <ClCompile> |
155 | <Optimization>Disabled</Optimization> | 155 | <Optimization>Disabled</Optimization> |
156 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 156 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
157 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 157 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
158 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 158 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
159 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | 159 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
160 | <PrecompiledHeader> | 160 | <PrecompiledHeader> |
161 | </PrecompiledHeader> | 161 | </PrecompiledHeader> |
162 | <WarningLevel>Level3</WarningLevel> | 162 | <WarningLevel>Level3</WarningLevel> |
163 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | 163 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> |
164 | </ClCompile> | 164 | </ClCompile> |
165 | <ResourceCompile> | 165 | <ResourceCompile> |
166 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 166 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
167 | <Culture>0x0c07</Culture> | 167 | <Culture>0x0c07</Culture> |
168 | </ResourceCompile> | 168 | </ResourceCompile> |
169 | <Link> | 169 | <Link> |
170 | <OutputFile>..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe</OutputFile> | 170 | <OutputFile>..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe</OutputFile> |
171 | <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 171 | <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
172 | <GenerateDebugInformation>true</GenerateDebugInformation> | 172 | <GenerateDebugInformation>true</GenerateDebugInformation> |
173 | <ProgramDatabaseFile>.\Debug/MaterialViewer.pdb</ProgramDatabaseFile> | 173 | <ProgramDatabaseFile>.\Debug/MaterialViewer.pdb</ProgramDatabaseFile> |
174 | <SubSystem>Console</SubSystem> | 174 | <SubSystem>Console</SubSystem> |
175 | <DataExecutionPrevention> | 175 | <DataExecutionPrevention> |
176 | </DataExecutionPrevention> | 176 | </DataExecutionPrevention> |
177 | </Link> | 177 | </Link> |
178 | </ItemDefinitionGroup> | 178 | </ItemDefinitionGroup> |
179 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 179 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
180 | <Midl> | 180 | <Midl> |
181 | <TypeLibraryName>.\Debug/MaterialViewer.tlb</TypeLibraryName> | 181 | <TypeLibraryName>.\Debug/MaterialViewer.tlb</TypeLibraryName> |
182 | <HeaderFileName> | 182 | <HeaderFileName> |
183 | </HeaderFileName> | 183 | </HeaderFileName> |
184 | </Midl> | 184 | </Midl> |
185 | <ClCompile> | 185 | <ClCompile> |
186 | <Optimization>Disabled</Optimization> | 186 | <Optimization>Disabled</Optimization> |
187 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 187 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
188 | <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 188 | <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
189 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 189 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
190 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | 190 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
191 | <PrecompiledHeader> | 191 | <PrecompiledHeader> |
192 | </PrecompiledHeader> | 192 | </PrecompiledHeader> |
193 | <WarningLevel>Level3</WarningLevel> | 193 | <WarningLevel>Level3</WarningLevel> |
194 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 194 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
195 | </ClCompile> | 195 | </ClCompile> |
196 | <ResourceCompile> | 196 | <ResourceCompile> |
197 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 197 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
198 | <Culture>0x0c07</Culture> | 198 | <Culture>0x0c07</Culture> |
199 | </ResourceCompile> | 199 | </ResourceCompile> |
200 | <Link> | 200 | <Link> |
201 | <OutputFile>..\..\bin\Win64-VisualStudio\22.MaterialViewer.exe</OutputFile> | 201 | <OutputFile>..\..\bin\Win64-VisualStudio\22.MaterialViewer.exe</OutputFile> |
202 | <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 202 | <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
203 | <GenerateDebugInformation>true</GenerateDebugInformation> | 203 | <GenerateDebugInformation>true</GenerateDebugInformation> |
204 | <ProgramDatabaseFile>.\Debug/MaterialViewer.pdb</ProgramDatabaseFile> | 204 | <ProgramDatabaseFile>.\Debug/MaterialViewer.pdb</ProgramDatabaseFile> |
205 | <SubSystem>Console</SubSystem> | 205 | <SubSystem>Console</SubSystem> |
206 | <DataExecutionPrevention> | 206 | <DataExecutionPrevention> |
207 | </DataExecutionPrevention> | 207 | </DataExecutionPrevention> |
208 | </Link> | 208 | </Link> |
209 | </ItemDefinitionGroup> | 209 | </ItemDefinitionGroup> |
210 | <ItemGroup> | 210 | <ItemGroup> |
211 | <ClCompile Include="main.cpp"> | 211 | <ClCompile Include="main.cpp"> |
212 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> | 212 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> |
213 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> | 213 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> |
214 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 214 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
215 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 215 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
216 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> | 216 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> |
217 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> | 217 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> |
218 | <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> | 218 | <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> |
219 | <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> | 219 | <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> |
220 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> | 220 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> |
221 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> | 221 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> |
222 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 222 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
223 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 223 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
224 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> | 224 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> |
225 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> | 225 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> |
226 | </ClCompile> | 226 | </ClCompile> |
227 | </ItemGroup> | 227 | </ItemGroup> |
228 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 228 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
229 | <ImportGroup Label="ExtensionTargets"> | 229 | <ImportGroup Label="ExtensionTargets"> |
230 | </ImportGroup> | 230 | </ImportGroup> |
231 | </Project> \ No newline at end of file | 231 | </Project> \ No newline at end of file |
diff --git a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc11.vcxproj b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc11.vcxproj index 6ea9a2b..9958bfb 100644 --- a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc11.vcxproj +++ b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc11.vcxproj | |||
@@ -1,235 +1,235 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
3 | <ItemGroup Label="ProjectConfigurations"> | 3 | <ItemGroup Label="ProjectConfigurations"> |
4 | <ProjectConfiguration Include="Debug|Win32"> | 4 | <ProjectConfiguration Include="Debug|Win32"> |
5 | <Configuration>Debug</Configuration> | 5 | <Configuration>Debug</Configuration> |
6 | <Platform>Win32</Platform> | 6 | <Platform>Win32</Platform> |
7 | </ProjectConfiguration> | 7 | </ProjectConfiguration> |
8 | <ProjectConfiguration Include="Debug|x64"> | 8 | <ProjectConfiguration Include="Debug|x64"> |
9 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
10 | <Platform>x64</Platform> | 10 | <Platform>x64</Platform> |
11 | </ProjectConfiguration> | 11 | </ProjectConfiguration> |
12 | <ProjectConfiguration Include="Release|Win32"> | 12 | <ProjectConfiguration Include="Release|Win32"> |
13 | <Configuration>Release</Configuration> | 13 | <Configuration>Release</Configuration> |
14 | <Platform>Win32</Platform> | 14 | <Platform>Win32</Platform> |
15 | </ProjectConfiguration> | 15 | </ProjectConfiguration> |
16 | <ProjectConfiguration Include="Release|x64"> | 16 | <ProjectConfiguration Include="Release|x64"> |
17 | <Configuration>Release</Configuration> | 17 | <Configuration>Release</Configuration> |
18 | <Platform>x64</Platform> | 18 | <Platform>x64</Platform> |
19 | </ProjectConfiguration> | 19 | </ProjectConfiguration> |
20 | </ItemGroup> | 20 | </ItemGroup> |
21 | <PropertyGroup Label="Globals"> | 21 | <PropertyGroup Label="Globals"> |
22 | <ProjectName>22.MaterialViewer</ProjectName> | 22 | <ProjectName>22.MaterialViewer</ProjectName> |
23 | <ProjectGuid>{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}</ProjectGuid> | 23 | <ProjectGuid>{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}</ProjectGuid> |
24 | <RootNamespace>MaterialViewer</RootNamespace> | 24 | <RootNamespace>MaterialViewer</RootNamespace> |
25 | </PropertyGroup> | 25 | </PropertyGroup> |
26 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 26 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
27 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | 27 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
28 | <ConfigurationType>Application</ConfigurationType> | 28 | <ConfigurationType>Application</ConfigurationType> |
29 | <CharacterSet>MultiByte</CharacterSet> | 29 | <CharacterSet>MultiByte</CharacterSet> |
30 | <PlatformToolset>v110</PlatformToolset> | 30 | <PlatformToolset>v110</PlatformToolset> |
31 | </PropertyGroup> | 31 | </PropertyGroup> |
32 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | 32 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
33 | <ConfigurationType>Application</ConfigurationType> | 33 | <ConfigurationType>Application</ConfigurationType> |
34 | <CharacterSet>MultiByte</CharacterSet> | 34 | <CharacterSet>MultiByte</CharacterSet> |
35 | <PlatformToolset>v110</PlatformToolset> | 35 | <PlatformToolset>v110</PlatformToolset> |
36 | </PropertyGroup> | 36 | </PropertyGroup> |
37 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 37 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
38 | <ConfigurationType>Application</ConfigurationType> | 38 | <ConfigurationType>Application</ConfigurationType> |
39 | <CharacterSet>MultiByte</CharacterSet> | 39 | <CharacterSet>MultiByte</CharacterSet> |
40 | <PlatformToolset>v110</PlatformToolset> | 40 | <PlatformToolset>v110</PlatformToolset> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | 42 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
43 | <ConfigurationType>Application</ConfigurationType> | 43 | <ConfigurationType>Application</ConfigurationType> |
44 | <CharacterSet>MultiByte</CharacterSet> | 44 | <CharacterSet>MultiByte</CharacterSet> |
45 | <PlatformToolset>v110</PlatformToolset> | 45 | <PlatformToolset>v110</PlatformToolset> |
46 | </PropertyGroup> | 46 | </PropertyGroup> |
47 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 47 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
48 | <ImportGroup Label="ExtensionSettings"> | 48 | <ImportGroup Label="ExtensionSettings"> |
49 | </ImportGroup> | 49 | </ImportGroup> |
50 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | 50 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
51 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | 51 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
52 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | 52 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> |
53 | </ImportGroup> | 53 | </ImportGroup> |
54 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | 54 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
55 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | 55 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
56 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | 56 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> |
57 | </ImportGroup> | 57 | </ImportGroup> |
58 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | 58 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
59 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | 59 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
60 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | 60 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> |
61 | </ImportGroup> | 61 | </ImportGroup> |
62 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | 62 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> |
63 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | 63 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
64 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | 64 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> |
65 | </ImportGroup> | 65 | </ImportGroup> |
66 | <PropertyGroup Label="UserMacros" /> | 66 | <PropertyGroup Label="UserMacros" /> |
67 | <PropertyGroup> | 67 | <PropertyGroup> |
68 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | 68 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> |
69 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> | 69 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> |
70 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\Win64-VisualStudio\</OutDir> | 70 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\Win64-VisualStudio\</OutDir> |
71 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | 71 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> |
72 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | 72 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> |
73 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> | 73 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> |
74 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\Win64-VisualStudio\</OutDir> | 74 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\Win64-VisualStudio\</OutDir> |
75 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | 75 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> |
76 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | 76 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> |
77 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | 77 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> |
78 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | 78 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> |
79 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | 79 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> |
80 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | 80 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> |
81 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | 81 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> |
82 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | 82 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> |
83 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | 83 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> |
84 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | 84 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> |
85 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | 85 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> |
86 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | 86 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> |
87 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | 87 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> |
88 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | 88 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> |
89 | </PropertyGroup> | 89 | </PropertyGroup> |
90 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 90 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
91 | <Midl> | 91 | <Midl> |
92 | <TypeLibraryName>.\Release/MaterialViewer.tlb</TypeLibraryName> | 92 | <TypeLibraryName>.\Release/MaterialViewer.tlb</TypeLibraryName> |
93 | <HeaderFileName> | 93 | <HeaderFileName> |
94 | </HeaderFileName> | 94 | </HeaderFileName> |
95 | </Midl> | 95 | </Midl> |
96 | <ClCompile> | 96 | <ClCompile> |
97 | <Optimization>MaxSpeed</Optimization> | 97 | <Optimization>MaxSpeed</Optimization> |
98 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 98 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
99 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 99 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
100 | <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 100 | <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
101 | <StringPooling>true</StringPooling> | 101 | <StringPooling>true</StringPooling> |
102 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 102 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
103 | <FunctionLevelLinking>true</FunctionLevelLinking> | 103 | <FunctionLevelLinking>true</FunctionLevelLinking> |
104 | <PrecompiledHeader> | 104 | <PrecompiledHeader> |
105 | </PrecompiledHeader> | 105 | </PrecompiledHeader> |
106 | <WarningLevel>Level3</WarningLevel> | 106 | <WarningLevel>Level3</WarningLevel> |
107 | </ClCompile> | 107 | </ClCompile> |
108 | <ResourceCompile> | 108 | <ResourceCompile> |
109 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 109 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
110 | <Culture>0x0c07</Culture> | 110 | <Culture>0x0c07</Culture> |
111 | </ResourceCompile> | 111 | </ResourceCompile> |
112 | <Link> | 112 | <Link> |
113 | <OutputFile>..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe</OutputFile> | 113 | <OutputFile>..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe</OutputFile> |
114 | <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 114 | <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
115 | <ProgramDatabaseFile>.\Release/MaterialViewer.pdb</ProgramDatabaseFile> | 115 | <ProgramDatabaseFile>.\Release/MaterialViewer.pdb</ProgramDatabaseFile> |
116 | <SubSystem>Console</SubSystem> | 116 | <SubSystem>Console</SubSystem> |
117 | <DataExecutionPrevention> | 117 | <DataExecutionPrevention> |
118 | </DataExecutionPrevention> | 118 | </DataExecutionPrevention> |
119 | </Link> | 119 | </Link> |
120 | </ItemDefinitionGroup> | 120 | </ItemDefinitionGroup> |
121 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 121 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
122 | <Midl> | 122 | <Midl> |
123 | <TypeLibraryName>.\Release/MaterialViewer.tlb</TypeLibraryName> | 123 | <TypeLibraryName>.\Release/MaterialViewer.tlb</TypeLibraryName> |
124 | <HeaderFileName> | 124 | <HeaderFileName> |
125 | </HeaderFileName> | 125 | </HeaderFileName> |
126 | </Midl> | 126 | </Midl> |
127 | <ClCompile> | 127 | <ClCompile> |
128 | <Optimization>MaxSpeed</Optimization> | 128 | <Optimization>MaxSpeed</Optimization> |
129 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | 129 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> |
130 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 130 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
131 | <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 131 | <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
132 | <StringPooling>true</StringPooling> | 132 | <StringPooling>true</StringPooling> |
133 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 133 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
134 | <FunctionLevelLinking>true</FunctionLevelLinking> | 134 | <FunctionLevelLinking>true</FunctionLevelLinking> |
135 | <PrecompiledHeader> | 135 | <PrecompiledHeader> |
136 | </PrecompiledHeader> | 136 | </PrecompiledHeader> |
137 | <WarningLevel>Level3</WarningLevel> | 137 | <WarningLevel>Level3</WarningLevel> |
138 | </ClCompile> | 138 | </ClCompile> |
139 | <ResourceCompile> | 139 | <ResourceCompile> |
140 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 140 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
141 | <Culture>0x0c07</Culture> | 141 | <Culture>0x0c07</Culture> |
142 | </ResourceCompile> | 142 | </ResourceCompile> |
143 | <Link> | 143 | <Link> |
144 | <OutputFile>..\..\bin\Win64-VisualStudio\22.MaterialViewer.exe</OutputFile> | 144 | <OutputFile>..\..\bin\Win64-VisualStudio\22.MaterialViewer.exe</OutputFile> |
145 | <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 145 | <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
146 | <ProgramDatabaseFile>.\Release/MaterialViewer.pdb</ProgramDatabaseFile> | 146 | <ProgramDatabaseFile>.\Release/MaterialViewer.pdb</ProgramDatabaseFile> |
147 | <SubSystem>Console</SubSystem> | 147 | <SubSystem>Console</SubSystem> |
148 | <DataExecutionPrevention> | 148 | <DataExecutionPrevention> |
149 | </DataExecutionPrevention> | 149 | </DataExecutionPrevention> |
150 | </Link> | 150 | </Link> |
151 | </ItemDefinitionGroup> | 151 | </ItemDefinitionGroup> |
152 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | 152 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
153 | <Midl> | 153 | <Midl> |
154 | <TypeLibraryName>.\Debug/MaterialViewer.tlb</TypeLibraryName> | 154 | <TypeLibraryName>.\Debug/MaterialViewer.tlb</TypeLibraryName> |
155 | <HeaderFileName> | 155 | <HeaderFileName> |
156 | </HeaderFileName> | 156 | </HeaderFileName> |
157 | </Midl> | 157 | </Midl> |
158 | <ClCompile> | 158 | <ClCompile> |
159 | <Optimization>Disabled</Optimization> | 159 | <Optimization>Disabled</Optimization> |
160 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 160 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
161 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 161 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
162 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 162 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
163 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | 163 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
164 | <PrecompiledHeader> | 164 | <PrecompiledHeader> |
165 | </PrecompiledHeader> | 165 | </PrecompiledHeader> |
166 | <WarningLevel>Level3</WarningLevel> | 166 | <WarningLevel>Level3</WarningLevel> |
167 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | 167 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> |
168 | </ClCompile> | 168 | </ClCompile> |
169 | <ResourceCompile> | 169 | <ResourceCompile> |
170 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 170 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
171 | <Culture>0x0c07</Culture> | 171 | <Culture>0x0c07</Culture> |
172 | </ResourceCompile> | 172 | </ResourceCompile> |
173 | <Link> | 173 | <Link> |
174 | <OutputFile>..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe</OutputFile> | 174 | <OutputFile>..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe</OutputFile> |
175 | <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 175 | <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
176 | <GenerateDebugInformation>true</GenerateDebugInformation> | 176 | <GenerateDebugInformation>true</GenerateDebugInformation> |
177 | <ProgramDatabaseFile>.\Debug/MaterialViewer.pdb</ProgramDatabaseFile> | 177 | <ProgramDatabaseFile>.\Debug/MaterialViewer.pdb</ProgramDatabaseFile> |
178 | <SubSystem>Console</SubSystem> | 178 | <SubSystem>Console</SubSystem> |
179 | <DataExecutionPrevention> | 179 | <DataExecutionPrevention> |
180 | </DataExecutionPrevention> | 180 | </DataExecutionPrevention> |
181 | </Link> | 181 | </Link> |
182 | </ItemDefinitionGroup> | 182 | </ItemDefinitionGroup> |
183 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 183 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
184 | <Midl> | 184 | <Midl> |
185 | <TypeLibraryName>.\Debug/MaterialViewer.tlb</TypeLibraryName> | 185 | <TypeLibraryName>.\Debug/MaterialViewer.tlb</TypeLibraryName> |
186 | <HeaderFileName> | 186 | <HeaderFileName> |
187 | </HeaderFileName> | 187 | </HeaderFileName> |
188 | </Midl> | 188 | </Midl> |
189 | <ClCompile> | 189 | <ClCompile> |
190 | <Optimization>Disabled</Optimization> | 190 | <Optimization>Disabled</Optimization> |
191 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 191 | <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
192 | <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 192 | <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
193 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 193 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
194 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | 194 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
195 | <PrecompiledHeader> | 195 | <PrecompiledHeader> |
196 | </PrecompiledHeader> | 196 | </PrecompiledHeader> |
197 | <WarningLevel>Level3</WarningLevel> | 197 | <WarningLevel>Level3</WarningLevel> |
198 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 198 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
199 | </ClCompile> | 199 | </ClCompile> |
200 | <ResourceCompile> | 200 | <ResourceCompile> |
201 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 201 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
202 | <Culture>0x0c07</Culture> | 202 | <Culture>0x0c07</Culture> |
203 | </ResourceCompile> | 203 | </ResourceCompile> |
204 | <Link> | 204 | <Link> |
205 | <OutputFile>..\..\bin\Win64-VisualStudio\22.MaterialViewer.exe</OutputFile> | 205 | <OutputFile>..\..\bin\Win64-VisualStudio\22.MaterialViewer.exe</OutputFile> |
206 | <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 206 | <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
207 | <GenerateDebugInformation>true</GenerateDebugInformation> | 207 | <GenerateDebugInformation>true</GenerateDebugInformation> |
208 | <ProgramDatabaseFile>.\Debug/MaterialViewer.pdb</ProgramDatabaseFile> | 208 | <ProgramDatabaseFile>.\Debug/MaterialViewer.pdb</ProgramDatabaseFile> |
209 | <SubSystem>Console</SubSystem> | 209 | <SubSystem>Console</SubSystem> |
210 | <DataExecutionPrevention> | 210 | <DataExecutionPrevention> |
211 | </DataExecutionPrevention> | 211 | </DataExecutionPrevention> |
212 | </Link> | 212 | </Link> |
213 | </ItemDefinitionGroup> | 213 | </ItemDefinitionGroup> |
214 | <ItemGroup> | 214 | <ItemGroup> |
215 | <ClCompile Include="main.cpp"> | 215 | <ClCompile Include="main.cpp"> |
216 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> | 216 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> |
217 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> | 217 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> |
218 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 218 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
219 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 219 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
220 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> | 220 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> |
221 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> | 221 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> |
222 | <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> | 222 | <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> |
223 | <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> | 223 | <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> |
224 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> | 224 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> |
225 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> | 225 | <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> |
226 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 226 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
227 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 227 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
228 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> | 228 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> |
229 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> | 229 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> |
230 | </ClCompile> | 230 | </ClCompile> |
231 | </ItemGroup> | 231 | </ItemGroup> |
232 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 232 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
233 | <ImportGroup Label="ExtensionTargets"> | 233 | <ImportGroup Label="ExtensionTargets"> |
234 | </ImportGroup> | 234 | </ImportGroup> |
235 | </Project> \ No newline at end of file | 235 | </Project> \ No newline at end of file |
diff --git a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc8.vcproj b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc8.vcproj index 1e7c0db..853a8b4 100644 --- a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc8.vcproj +++ b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc8.vcproj | |||
@@ -1,231 +1,231 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
2 | <VisualStudioProject | 2 | <VisualStudioProject |
3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
4 | Version="8,00" | 4 | Version="8,00" |
5 | Name="22.MaterialViewer_vc8" | 5 | Name="22.MaterialViewer_vc8" |
6 | ProjectGUID="{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}" | 6 | ProjectGUID="{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}" |
7 | RootNamespace="MaterialViewer_vc8" | 7 | RootNamespace="MaterialViewer_vc8" |
8 | > | 8 | > |
9 | <Platforms> | 9 | <Platforms> |
10 | <Platform | 10 | <Platform |
11 | Name="Win32" | 11 | Name="Win32" |
12 | /> | 12 | /> |
13 | </Platforms> | 13 | </Platforms> |
14 | <ToolFiles> | 14 | <ToolFiles> |
15 | </ToolFiles> | 15 | </ToolFiles> |
16 | <Configurations> | 16 | <Configurations> |
17 | <Configuration | 17 | <Configuration |
18 | Name="Release|Win32" | 18 | Name="Release|Win32" |
19 | OutputDirectory=".\Release" | 19 | OutputDirectory=".\Release" |
20 | IntermediateDirectory=".\Release" | 20 | IntermediateDirectory=".\Release" |
21 | ConfigurationType="1" | 21 | ConfigurationType="1" |
22 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 22 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
23 | UseOfMFC="0" | 23 | UseOfMFC="0" |
24 | ATLMinimizesCRunTimeLibraryUsage="false" | 24 | ATLMinimizesCRunTimeLibraryUsage="false" |
25 | CharacterSet="2" | 25 | CharacterSet="2" |
26 | > | 26 | > |
27 | <Tool | 27 | <Tool |
28 | Name="VCPreBuildEventTool" | 28 | Name="VCPreBuildEventTool" |
29 | /> | 29 | /> |
30 | <Tool | 30 | <Tool |
31 | Name="VCCustomBuildTool" | 31 | Name="VCCustomBuildTool" |
32 | /> | 32 | /> |
33 | <Tool | 33 | <Tool |
34 | Name="VCXMLDataGeneratorTool" | 34 | Name="VCXMLDataGeneratorTool" |
35 | /> | 35 | /> |
36 | <Tool | 36 | <Tool |
37 | Name="VCWebServiceProxyGeneratorTool" | 37 | Name="VCWebServiceProxyGeneratorTool" |
38 | /> | 38 | /> |
39 | <Tool | 39 | <Tool |
40 | Name="VCMIDLTool" | 40 | Name="VCMIDLTool" |
41 | TypeLibraryName=".\Release/MaterialViewer.tlb" | 41 | TypeLibraryName=".\Release/MaterialViewer.tlb" |
42 | HeaderFileName="" | 42 | HeaderFileName="" |
43 | /> | 43 | /> |
44 | <Tool | 44 | <Tool |
45 | Name="VCCLCompilerTool" | 45 | Name="VCCLCompilerTool" |
46 | Optimization="2" | 46 | Optimization="2" |
47 | InlineFunctionExpansion="1" | 47 | InlineFunctionExpansion="1" |
48 | AdditionalIncludeDirectories="..\..\include" | 48 | AdditionalIncludeDirectories="..\..\include" |
49 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | 49 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" |
50 | StringPooling="true" | 50 | StringPooling="true" |
51 | RuntimeLibrary="0" | 51 | RuntimeLibrary="0" |
52 | EnableFunctionLevelLinking="true" | 52 | EnableFunctionLevelLinking="true" |
53 | UsePrecompiledHeader="0" | 53 | UsePrecompiledHeader="0" |
54 | PrecompiledHeaderFile=".\Release/MaterialViewer.pch" | 54 | PrecompiledHeaderFile=".\Release/MaterialViewer.pch" |
55 | AssemblerListingLocation=".\Release/" | 55 | AssemblerListingLocation=".\Release/" |
56 | ObjectFile=".\Release/" | 56 | ObjectFile=".\Release/" |
57 | ProgramDataBaseFileName=".\Release/" | 57 | ProgramDataBaseFileName=".\Release/" |
58 | WarningLevel="3" | 58 | WarningLevel="3" |
59 | SuppressStartupBanner="true" | 59 | SuppressStartupBanner="true" |
60 | CompileAs="0" | 60 | CompileAs="0" |
61 | /> | 61 | /> |
62 | <Tool | 62 | <Tool |
63 | Name="VCManagedResourceCompilerTool" | 63 | Name="VCManagedResourceCompilerTool" |
64 | /> | 64 | /> |
65 | <Tool | 65 | <Tool |
66 | Name="VCResourceCompilerTool" | 66 | Name="VCResourceCompilerTool" |
67 | PreprocessorDefinitions="NDEBUG" | 67 | PreprocessorDefinitions="NDEBUG" |
68 | Culture="3079" | 68 | Culture="3079" |
69 | /> | 69 | /> |
70 | <Tool | 70 | <Tool |
71 | Name="VCPreLinkEventTool" | 71 | Name="VCPreLinkEventTool" |
72 | /> | 72 | /> |
73 | <Tool | 73 | <Tool |
74 | Name="VCLinkerTool" | 74 | Name="VCLinkerTool" |
75 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" | 75 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" |
76 | LinkIncremental="0" | 76 | LinkIncremental="0" |
77 | SuppressStartupBanner="true" | 77 | SuppressStartupBanner="true" |
78 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" | 78 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" |
79 | ProgramDatabaseFile=".\Release/MaterialViewer.pdb" | 79 | ProgramDatabaseFile=".\Release/MaterialViewer.pdb" |
80 | SubSystem="1" | 80 | SubSystem="1" |
81 | TargetMachine="1" | 81 | TargetMachine="1" |
82 | /> | 82 | /> |
83 | <Tool | 83 | <Tool |
84 | Name="VCALinkTool" | 84 | Name="VCALinkTool" |
85 | /> | 85 | /> |
86 | <Tool | 86 | <Tool |
87 | Name="VCManifestTool" | 87 | Name="VCManifestTool" |
88 | /> | 88 | /> |
89 | <Tool | 89 | <Tool |
90 | Name="VCXDCMakeTool" | 90 | Name="VCXDCMakeTool" |
91 | /> | 91 | /> |
92 | <Tool | 92 | <Tool |
93 | Name="VCBscMakeTool" | 93 | Name="VCBscMakeTool" |
94 | /> | 94 | /> |
95 | <Tool | 95 | <Tool |
96 | Name="VCFxCopTool" | 96 | Name="VCFxCopTool" |
97 | /> | 97 | /> |
98 | <Tool | 98 | <Tool |
99 | Name="VCAppVerifierTool" | 99 | Name="VCAppVerifierTool" |
100 | /> | 100 | /> |
101 | <Tool | 101 | <Tool |
102 | Name="VCWebDeploymentTool" | 102 | Name="VCWebDeploymentTool" |
103 | /> | 103 | /> |
104 | <Tool | 104 | <Tool |
105 | Name="VCPostBuildEventTool" | 105 | Name="VCPostBuildEventTool" |
106 | /> | 106 | /> |
107 | </Configuration> | 107 | </Configuration> |
108 | <Configuration | 108 | <Configuration |
109 | Name="Debug|Win32" | 109 | Name="Debug|Win32" |
110 | OutputDirectory=".\Debug" | 110 | OutputDirectory=".\Debug" |
111 | IntermediateDirectory=".\Debug" | 111 | IntermediateDirectory=".\Debug" |
112 | ConfigurationType="1" | 112 | ConfigurationType="1" |
113 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 113 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
114 | UseOfMFC="0" | 114 | UseOfMFC="0" |
115 | ATLMinimizesCRunTimeLibraryUsage="false" | 115 | ATLMinimizesCRunTimeLibraryUsage="false" |
116 | CharacterSet="2" | 116 | CharacterSet="2" |
117 | > | 117 | > |
118 | <Tool | 118 | <Tool |
119 | Name="VCPreBuildEventTool" | 119 | Name="VCPreBuildEventTool" |
120 | /> | 120 | /> |
121 | <Tool | 121 | <Tool |
122 | Name="VCCustomBuildTool" | 122 | Name="VCCustomBuildTool" |
123 | /> | 123 | /> |
124 | <Tool | 124 | <Tool |
125 | Name="VCXMLDataGeneratorTool" | 125 | Name="VCXMLDataGeneratorTool" |
126 | /> | 126 | /> |
127 | <Tool | 127 | <Tool |
128 | Name="VCWebServiceProxyGeneratorTool" | 128 | Name="VCWebServiceProxyGeneratorTool" |
129 | /> | 129 | /> |
130 | <Tool | 130 | <Tool |
131 | Name="VCMIDLTool" | 131 | Name="VCMIDLTool" |
132 | TypeLibraryName=".\Debug/MaterialViewer.tlb" | 132 | TypeLibraryName=".\Debug/MaterialViewer.tlb" |
133 | HeaderFileName="" | 133 | HeaderFileName="" |
134 | /> | 134 | /> |
135 | <Tool | 135 | <Tool |
136 | Name="VCCLCompilerTool" | 136 | Name="VCCLCompilerTool" |
137 | Optimization="0" | 137 | Optimization="0" |
138 | AdditionalIncludeDirectories="..\..\include" | 138 | AdditionalIncludeDirectories="..\..\include" |
139 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | 139 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" |
140 | BasicRuntimeChecks="3" | 140 | BasicRuntimeChecks="3" |
141 | RuntimeLibrary="1" | 141 | RuntimeLibrary="1" |
142 | UsePrecompiledHeader="0" | 142 | UsePrecompiledHeader="0" |
143 | PrecompiledHeaderFile=".\Debug/MaterialViewer.pch" | 143 | PrecompiledHeaderFile=".\Debug/MaterialViewer.pch" |
144 | AssemblerListingLocation=".\Debug/" | 144 | AssemblerListingLocation=".\Debug/" |
145 | ObjectFile=".\Debug/" | 145 | ObjectFile=".\Debug/" |
146 | ProgramDataBaseFileName=".\Debug/" | 146 | ProgramDataBaseFileName=".\Debug/" |
147 | WarningLevel="3" | 147 | WarningLevel="3" |
148 | SuppressStartupBanner="true" | 148 | SuppressStartupBanner="true" |
149 | DebugInformationFormat="4" | 149 | DebugInformationFormat="4" |
150 | CompileAs="0" | 150 | CompileAs="0" |
151 | /> | 151 | /> |
152 | <Tool | 152 | <Tool |
153 | Name="VCManagedResourceCompilerTool" | 153 | Name="VCManagedResourceCompilerTool" |
154 | /> | 154 | /> |
155 | <Tool | 155 | <Tool |
156 | Name="VCResourceCompilerTool" | 156 | Name="VCResourceCompilerTool" |
157 | PreprocessorDefinitions="_DEBUG" | 157 | PreprocessorDefinitions="_DEBUG" |
158 | Culture="3079" | 158 | Culture="3079" |
159 | /> | 159 | /> |
160 | <Tool | 160 | <Tool |
161 | Name="VCPreLinkEventTool" | 161 | Name="VCPreLinkEventTool" |
162 | /> | 162 | /> |
163 | <Tool | 163 | <Tool |
164 | Name="VCLinkerTool" | 164 | Name="VCLinkerTool" |
165 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" | 165 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" |
166 | LinkIncremental="0" | 166 | LinkIncremental="0" |
167 | SuppressStartupBanner="true" | 167 | SuppressStartupBanner="true" |
168 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" | 168 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" |
169 | GenerateDebugInformation="true" | 169 | GenerateDebugInformation="true" |
170 | ProgramDatabaseFile=".\Debug/MaterialViewer.pdb" | 170 | ProgramDatabaseFile=".\Debug/MaterialViewer.pdb" |
171 | SubSystem="1" | 171 | SubSystem="1" |
172 | TargetMachine="1" | 172 | TargetMachine="1" |
173 | /> | 173 | /> |
174 | <Tool | 174 | <Tool |
175 | Name="VCALinkTool" | 175 | Name="VCALinkTool" |
176 | /> | 176 | /> |
177 | <Tool | 177 | <Tool |
178 | Name="VCManifestTool" | 178 | Name="VCManifestTool" |
179 | /> | 179 | /> |
180 | <Tool | 180 | <Tool |
181 | Name="VCXDCMakeTool" | 181 | Name="VCXDCMakeTool" |
182 | /> | 182 | /> |
183 | <Tool | 183 | <Tool |
184 | Name="VCBscMakeTool" | 184 | Name="VCBscMakeTool" |
185 | /> | 185 | /> |
186 | <Tool | 186 | <Tool |
187 | Name="VCFxCopTool" | 187 | Name="VCFxCopTool" |
188 | /> | 188 | /> |
189 | <Tool | 189 | <Tool |
190 | Name="VCAppVerifierTool" | 190 | Name="VCAppVerifierTool" |
191 | /> | 191 | /> |
192 | <Tool | 192 | <Tool |
193 | Name="VCWebDeploymentTool" | 193 | Name="VCWebDeploymentTool" |
194 | /> | 194 | /> |
195 | <Tool | 195 | <Tool |
196 | Name="VCPostBuildEventTool" | 196 | Name="VCPostBuildEventTool" |
197 | /> | 197 | /> |
198 | </Configuration> | 198 | </Configuration> |
199 | </Configurations> | 199 | </Configurations> |
200 | <References> | 200 | <References> |
201 | </References> | 201 | </References> |
202 | <Files> | 202 | <Files> |
203 | <File | 203 | <File |
204 | RelativePath="main.cpp" | 204 | RelativePath="main.cpp" |
205 | > | 205 | > |
206 | <FileConfiguration | 206 | <FileConfiguration |
207 | Name="Release|Win32" | 207 | Name="Release|Win32" |
208 | > | 208 | > |
209 | <Tool | 209 | <Tool |
210 | Name="VCCLCompilerTool" | 210 | Name="VCCLCompilerTool" |
211 | Optimization="2" | 211 | Optimization="2" |
212 | AdditionalIncludeDirectories="" | 212 | AdditionalIncludeDirectories="" |
213 | PreprocessorDefinitions="" | 213 | PreprocessorDefinitions="" |
214 | /> | 214 | /> |
215 | </FileConfiguration> | 215 | </FileConfiguration> |
216 | <FileConfiguration | 216 | <FileConfiguration |
217 | Name="Debug|Win32" | 217 | Name="Debug|Win32" |
218 | > | 218 | > |
219 | <Tool | 219 | <Tool |
220 | Name="VCCLCompilerTool" | 220 | Name="VCCLCompilerTool" |
221 | Optimization="0" | 221 | Optimization="0" |
222 | AdditionalIncludeDirectories="" | 222 | AdditionalIncludeDirectories="" |
223 | PreprocessorDefinitions="" | 223 | PreprocessorDefinitions="" |
224 | BasicRuntimeChecks="3" | 224 | BasicRuntimeChecks="3" |
225 | /> | 225 | /> |
226 | </FileConfiguration> | 226 | </FileConfiguration> |
227 | </File> | 227 | </File> |
228 | </Files> | 228 | </Files> |
229 | <Globals> | 229 | <Globals> |
230 | </Globals> | 230 | </Globals> |
231 | </VisualStudioProject> | 231 | </VisualStudioProject> |
diff --git a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc9.vcproj b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc9.vcproj index 8ce9803..9c26fb9 100644 --- a/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc9.vcproj +++ b/libraries/irrlicht-1.8/examples/22.MaterialViewer/MaterialViewer_vc9.vcproj | |||
@@ -1,230 +1,230 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
2 | <VisualStudioProject | 2 | <VisualStudioProject |
3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
4 | Version="9.00" | 4 | Version="9.00" |
5 | Name="22.MaterialViewer_vc9" | 5 | Name="22.MaterialViewer_vc9" |
6 | ProjectGUID="{F4C8112D-57A8-4D01-BB62-BAC6A09A6902}" | 6 | ProjectGUID="{F4C8112D-57A8-4D01-BB62-BAC6A09A6902}" |
7 | RootNamespace="MaterialViewer_vc9" | 7 | RootNamespace="MaterialViewer_vc9" |
8 | TargetFrameworkVersion="131072" | 8 | TargetFrameworkVersion="131072" |
9 | > | 9 | > |
10 | <Platforms> | 10 | <Platforms> |
11 | <Platform | 11 | <Platform |
12 | Name="Win32" | 12 | Name="Win32" |
13 | /> | 13 | /> |
14 | </Platforms> | 14 | </Platforms> |
15 | <ToolFiles> | 15 | <ToolFiles> |
16 | </ToolFiles> | 16 | </ToolFiles> |
17 | <Configurations> | 17 | <Configurations> |
18 | <Configuration | 18 | <Configuration |
19 | Name="Release|Win32" | 19 | Name="Release|Win32" |
20 | OutputDirectory=".\Release" | 20 | OutputDirectory=".\Release" |
21 | IntermediateDirectory=".\Release" | 21 | IntermediateDirectory=".\Release" |
22 | ConfigurationType="1" | 22 | ConfigurationType="1" |
23 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 23 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
24 | UseOfMFC="0" | 24 | UseOfMFC="0" |
25 | ATLMinimizesCRunTimeLibraryUsage="false" | 25 | ATLMinimizesCRunTimeLibraryUsage="false" |
26 | CharacterSet="2" | 26 | CharacterSet="2" |
27 | > | 27 | > |
28 | <Tool | 28 | <Tool |
29 | Name="VCPreBuildEventTool" | 29 | Name="VCPreBuildEventTool" |
30 | /> | 30 | /> |
31 | <Tool | 31 | <Tool |
32 | Name="VCCustomBuildTool" | 32 | Name="VCCustomBuildTool" |
33 | /> | 33 | /> |
34 | <Tool | 34 | <Tool |
35 | Name="VCXMLDataGeneratorTool" | 35 | Name="VCXMLDataGeneratorTool" |
36 | /> | 36 | /> |
37 | <Tool | 37 | <Tool |
38 | Name="VCWebServiceProxyGeneratorTool" | 38 | Name="VCWebServiceProxyGeneratorTool" |
39 | /> | 39 | /> |
40 | <Tool | 40 | <Tool |
41 | Name="VCMIDLTool" | 41 | Name="VCMIDLTool" |
42 | TypeLibraryName=".\Release/MaterialViewer.tlb" | 42 | TypeLibraryName=".\Release/MaterialViewer.tlb" |
43 | HeaderFileName="" | 43 | HeaderFileName="" |
44 | /> | 44 | /> |
45 | <Tool | 45 | <Tool |
46 | Name="VCCLCompilerTool" | 46 | Name="VCCLCompilerTool" |
47 | Optimization="2" | 47 | Optimization="2" |
48 | InlineFunctionExpansion="1" | 48 | InlineFunctionExpansion="1" |
49 | AdditionalIncludeDirectories="..\..\include" | 49 | AdditionalIncludeDirectories="..\..\include" |
50 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" | 50 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" |
51 | StringPooling="true" | 51 | StringPooling="true" |
52 | RuntimeLibrary="0" | 52 | RuntimeLibrary="0" |
53 | EnableFunctionLevelLinking="true" | 53 | EnableFunctionLevelLinking="true" |
54 | UsePrecompiledHeader="0" | 54 | UsePrecompiledHeader="0" |
55 | PrecompiledHeaderFile=".\Release/MaterialViewer.pch" | 55 | PrecompiledHeaderFile=".\Release/MaterialViewer.pch" |
56 | AssemblerListingLocation=".\Release/" | 56 | AssemblerListingLocation=".\Release/" |
57 | ObjectFile=".\Release/" | 57 | ObjectFile=".\Release/" |
58 | ProgramDataBaseFileName=".\Release/" | 58 | ProgramDataBaseFileName=".\Release/" |
59 | WarningLevel="3" | 59 | WarningLevel="3" |
60 | SuppressStartupBanner="true" | 60 | SuppressStartupBanner="true" |
61 | CompileAs="0" | 61 | CompileAs="0" |
62 | /> | 62 | /> |
63 | <Tool | 63 | <Tool |
64 | Name="VCManagedResourceCompilerTool" | 64 | Name="VCManagedResourceCompilerTool" |
65 | /> | 65 | /> |
66 | <Tool | 66 | <Tool |
67 | Name="VCResourceCompilerTool" | 67 | Name="VCResourceCompilerTool" |
68 | PreprocessorDefinitions="NDEBUG" | 68 | PreprocessorDefinitions="NDEBUG" |
69 | Culture="3079" | 69 | Culture="3079" |
70 | /> | 70 | /> |
71 | <Tool | 71 | <Tool |
72 | Name="VCPreLinkEventTool" | 72 | Name="VCPreLinkEventTool" |
73 | /> | 73 | /> |
74 | <Tool | 74 | <Tool |
75 | Name="VCLinkerTool" | 75 | Name="VCLinkerTool" |
76 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" | 76 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" |
77 | LinkIncremental="0" | 77 | LinkIncremental="0" |
78 | SuppressStartupBanner="true" | 78 | SuppressStartupBanner="true" |
79 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" | 79 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" |
80 | ProgramDatabaseFile=".\Release/MaterialViewer.pdb" | 80 | ProgramDatabaseFile=".\Release/MaterialViewer.pdb" |
81 | SubSystem="1" | 81 | SubSystem="1" |
82 | RandomizedBaseAddress="1" | 82 | RandomizedBaseAddress="1" |
83 | DataExecutionPrevention="0" | 83 | DataExecutionPrevention="0" |
84 | TargetMachine="1" | 84 | TargetMachine="1" |
85 | /> | 85 | /> |
86 | <Tool | 86 | <Tool |
87 | Name="VCALinkTool" | 87 | Name="VCALinkTool" |
88 | /> | 88 | /> |
89 | <Tool | 89 | <Tool |
90 | Name="VCManifestTool" | 90 | Name="VCManifestTool" |
91 | /> | 91 | /> |
92 | <Tool | 92 | <Tool |
93 | Name="VCXDCMakeTool" | 93 | Name="VCXDCMakeTool" |
94 | /> | 94 | /> |
95 | <Tool | 95 | <Tool |
96 | Name="VCBscMakeTool" | 96 | Name="VCBscMakeTool" |
97 | /> | 97 | /> |
98 | <Tool | 98 | <Tool |
99 | Name="VCFxCopTool" | 99 | Name="VCFxCopTool" |
100 | /> | 100 | /> |
101 | <Tool | 101 | <Tool |
102 | Name="VCAppVerifierTool" | 102 | Name="VCAppVerifierTool" |
103 | /> | 103 | /> |
104 | <Tool | 104 | <Tool |
105 | Name="VCPostBuildEventTool" | 105 | Name="VCPostBuildEventTool" |
106 | /> | 106 | /> |
107 | </Configuration> | 107 | </Configuration> |
108 | <Configuration | 108 | <Configuration |
109 | Name="Debug|Win32" | 109 | Name="Debug|Win32" |
110 | OutputDirectory=".\Debug" | 110 | OutputDirectory=".\Debug" |
111 | IntermediateDirectory=".\Debug" | 111 | IntermediateDirectory=".\Debug" |
112 | ConfigurationType="1" | 112 | ConfigurationType="1" |
113 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 113 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
114 | UseOfMFC="0" | 114 | UseOfMFC="0" |
115 | ATLMinimizesCRunTimeLibraryUsage="false" | 115 | ATLMinimizesCRunTimeLibraryUsage="false" |
116 | CharacterSet="2" | 116 | CharacterSet="2" |
117 | > | 117 | > |
118 | <Tool | 118 | <Tool |
119 | Name="VCPreBuildEventTool" | 119 | Name="VCPreBuildEventTool" |
120 | /> | 120 | /> |
121 | <Tool | 121 | <Tool |
122 | Name="VCCustomBuildTool" | 122 | Name="VCCustomBuildTool" |
123 | /> | 123 | /> |
124 | <Tool | 124 | <Tool |
125 | Name="VCXMLDataGeneratorTool" | 125 | Name="VCXMLDataGeneratorTool" |
126 | /> | 126 | /> |
127 | <Tool | 127 | <Tool |
128 | Name="VCWebServiceProxyGeneratorTool" | 128 | Name="VCWebServiceProxyGeneratorTool" |
129 | /> | 129 | /> |
130 | <Tool | 130 | <Tool |
131 | Name="VCMIDLTool" | 131 | Name="VCMIDLTool" |
132 | TypeLibraryName=".\Debug/MaterialViewer.tlb" | 132 | TypeLibraryName=".\Debug/MaterialViewer.tlb" |
133 | HeaderFileName="" | 133 | HeaderFileName="" |
134 | /> | 134 | /> |
135 | <Tool | 135 | <Tool |
136 | Name="VCCLCompilerTool" | 136 | Name="VCCLCompilerTool" |
137 | Optimization="0" | 137 | Optimization="0" |
138 | AdditionalIncludeDirectories="..\..\include" | 138 | AdditionalIncludeDirectories="..\..\include" |
139 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" | 139 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" |
140 | BasicRuntimeChecks="3" | 140 | BasicRuntimeChecks="3" |
141 | RuntimeLibrary="1" | 141 | RuntimeLibrary="1" |
142 | UsePrecompiledHeader="0" | 142 | UsePrecompiledHeader="0" |
143 | PrecompiledHeaderFile=".\Debug/MaterialViewer.pch" | 143 | PrecompiledHeaderFile=".\Debug/MaterialViewer.pch" |
144 | AssemblerListingLocation=".\Debug/" | 144 | AssemblerListingLocation=".\Debug/" |
145 | ObjectFile=".\Debug/" | 145 | ObjectFile=".\Debug/" |
146 | ProgramDataBaseFileName=".\Debug/" | 146 | ProgramDataBaseFileName=".\Debug/" |
147 | WarningLevel="3" | 147 | WarningLevel="3" |
148 | SuppressStartupBanner="true" | 148 | SuppressStartupBanner="true" |
149 | DebugInformationFormat="4" | 149 | DebugInformationFormat="4" |
150 | CompileAs="0" | 150 | CompileAs="0" |
151 | /> | 151 | /> |
152 | <Tool | 152 | <Tool |
153 | Name="VCManagedResourceCompilerTool" | 153 | Name="VCManagedResourceCompilerTool" |
154 | /> | 154 | /> |
155 | <Tool | 155 | <Tool |
156 | Name="VCResourceCompilerTool" | 156 | Name="VCResourceCompilerTool" |
157 | PreprocessorDefinitions="_DEBUG" | 157 | PreprocessorDefinitions="_DEBUG" |
158 | Culture="3079" | 158 | Culture="3079" |
159 | /> | 159 | /> |
160 | <Tool | 160 | <Tool |
161 | Name="VCPreLinkEventTool" | 161 | Name="VCPreLinkEventTool" |
162 | /> | 162 | /> |
163 | <Tool | 163 | <Tool |
164 | Name="VCLinkerTool" | 164 | Name="VCLinkerTool" |
165 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" | 165 | OutputFile="..\..\bin\Win32-VisualStudio\22.MaterialViewer.exe" |
166 | LinkIncremental="0" | 166 | LinkIncremental="0" |
167 | SuppressStartupBanner="true" | 167 | SuppressStartupBanner="true" |
168 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" | 168 | AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" |
169 | GenerateDebugInformation="true" | 169 | GenerateDebugInformation="true" |
170 | ProgramDatabaseFile=".\Debug/MaterialViewer.pdb" | 170 | ProgramDatabaseFile=".\Debug/MaterialViewer.pdb" |
171 | SubSystem="1" | 171 | SubSystem="1" |
172 | RandomizedBaseAddress="1" | 172 | RandomizedBaseAddress="1" |
173 | DataExecutionPrevention="0" | 173 | DataExecutionPrevention="0" |
174 | TargetMachine="1" | 174 | TargetMachine="1" |
175 | /> | 175 | /> |
176 | <Tool | 176 | <Tool |
177 | Name="VCALinkTool" | 177 | Name="VCALinkTool" |
178 | /> | 178 | /> |
179 | <Tool | 179 | <Tool |
180 | Name="VCManifestTool" | 180 | Name="VCManifestTool" |
181 | /> | 181 | /> |
182 | <Tool | 182 | <Tool |
183 | Name="VCXDCMakeTool" | 183 | Name="VCXDCMakeTool" |
184 | /> | 184 | /> |
185 | <Tool | 185 | <Tool |
186 | Name="VCBscMakeTool" | 186 | Name="VCBscMakeTool" |
187 | /> | 187 | /> |
188 | <Tool | 188 | <Tool |
189 | Name="VCFxCopTool" | 189 | Name="VCFxCopTool" |
190 | /> | 190 | /> |
191 | <Tool | 191 | <Tool |
192 | Name="VCAppVerifierTool" | 192 | Name="VCAppVerifierTool" |
193 | /> | 193 | /> |
194 | <Tool | 194 | <Tool |
195 | Name="VCPostBuildEventTool" | 195 | Name="VCPostBuildEventTool" |
196 | /> | 196 | /> |
197 | </Configuration> | 197 | </Configuration> |
198 | </Configurations> | 198 | </Configurations> |
199 | <References> | 199 | <References> |
200 | </References> | 200 | </References> |
201 | <Files> | 201 | <Files> |
202 | <File | 202 | <File |
203 | RelativePath="main.cpp" | 203 | RelativePath="main.cpp" |
204 | > | 204 | > |
205 | <FileConfiguration | 205 | <FileConfiguration |
206 | Name="Release|Win32" | 206 | Name="Release|Win32" |
207 | > | 207 | > |
208 | <Tool | 208 | <Tool |
209 | Name="VCCLCompilerTool" | 209 | Name="VCCLCompilerTool" |
210 | Optimization="2" | 210 | Optimization="2" |
211 | AdditionalIncludeDirectories="" | 211 | AdditionalIncludeDirectories="" |
212 | PreprocessorDefinitions="" | 212 | PreprocessorDefinitions="" |
213 | /> | 213 | /> |
214 | </FileConfiguration> | 214 | </FileConfiguration> |
215 | <FileConfiguration | 215 | <FileConfiguration |
216 | Name="Debug|Win32" | 216 | Name="Debug|Win32" |
217 | > | 217 | > |
218 | <Tool | 218 | <Tool |
219 | Name="VCCLCompilerTool" | 219 | Name="VCCLCompilerTool" |
220 | Optimization="0" | 220 | Optimization="0" |
221 | AdditionalIncludeDirectories="" | 221 | AdditionalIncludeDirectories="" |
222 | PreprocessorDefinitions="" | 222 | PreprocessorDefinitions="" |
223 | BasicRuntimeChecks="3" | 223 | BasicRuntimeChecks="3" |
224 | /> | 224 | /> |
225 | </FileConfiguration> | 225 | </FileConfiguration> |
226 | </File> | 226 | </File> |
227 | </Files> | 227 | </Files> |
228 | <Globals> | 228 | <Globals> |
229 | </Globals> | 229 | </Globals> |
230 | </VisualStudioProject> | 230 | </VisualStudioProject> |
diff --git a/libraries/irrlicht-1.8/examples/22.MaterialViewer/main.cpp b/libraries/irrlicht-1.8/examples/22.MaterialViewer/main.cpp index 5dcab19..480ed92 100644 --- a/libraries/irrlicht-1.8/examples/22.MaterialViewer/main.cpp +++ b/libraries/irrlicht-1.8/examples/22.MaterialViewer/main.cpp | |||
@@ -1,1057 +1,1057 @@ | |||
1 | /** Example 022 Material Viewer | 1 | /** Example 022 Material Viewer |
2 | 2 | ||
3 | This example can be used to play around with material settings and watch the results. | 3 | This example can be used to play around with material settings and watch the results. |
4 | Only the default non-shader materials are used in here. | 4 | Only the default non-shader materials are used in here. |
5 | 5 | ||
6 | You have two nodes to make it easier to see which difference your settings will make. | 6 | You have two nodes to make it easier to see which difference your settings will make. |
7 | Additionally you have one lightscenenode and you can set the global ambient values. | 7 | Additionally you have one lightscenenode and you can set the global ambient values. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <irrlicht.h> | 10 | #include <irrlicht.h> |
11 | #include "driverChoice.h" | 11 | #include "driverChoice.h" |
12 | 12 | ||
13 | using namespace irr; | 13 | using namespace irr; |
14 | 14 | ||
15 | #ifdef _MSC_VER | 15 | #ifdef _MSC_VER |
16 | #pragma comment(lib, "Irrlicht.lib") | 16 | #pragma comment(lib, "Irrlicht.lib") |
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | /* | 19 | /* |
20 | Variables within the empty namespace are globals which are restricted to this file. | 20 | Variables within the empty namespace are globals which are restricted to this file. |
21 | */ | 21 | */ |
22 | namespace | 22 | namespace |
23 | { | 23 | { |
24 | const wchar_t* const DriverTypeNames[] = | 24 | const wchar_t* const DriverTypeNames[] = |
25 | { | 25 | { |
26 | L"NULL", | 26 | L"NULL", |
27 | L"SOFTWARE", | 27 | L"SOFTWARE", |
28 | L"BURNINGSVIDEO", | 28 | L"BURNINGSVIDEO", |
29 | L"DIRECT3D8", | 29 | L"DIRECT3D8", |
30 | L"DIRECT3D9", | 30 | L"DIRECT3D9", |
31 | L"OPENGL", | 31 | L"OPENGL", |
32 | 0, | 32 | 0, |
33 | }; | 33 | }; |
34 | 34 | ||
35 | // For the gui id's | 35 | // For the gui id's |
36 | enum EGUI_IDS | 36 | enum EGUI_IDS |
37 | { | 37 | { |
38 | GUI_ID_OPEN_TEXTURE = 1, | 38 | GUI_ID_OPEN_TEXTURE = 1, |
39 | GUI_ID_QUIT, | 39 | GUI_ID_QUIT, |
40 | GUI_ID_MAX | 40 | GUI_ID_MAX |
41 | }; | 41 | }; |
42 | 42 | ||
43 | // Name used in texture selection to clear the textures on the node | 43 | // Name used in texture selection to clear the textures on the node |
44 | const core::stringw CLEAR_TEXTURE = L"CLEAR texture"; | 44 | const core::stringw CLEAR_TEXTURE = L"CLEAR texture"; |
45 | 45 | ||
46 | // some useful color constants | 46 | // some useful color constants |
47 | const video::SColor SCOL_BLACK = video::SColor(255, 0, 0, 0); | 47 | const video::SColor SCOL_BLACK = video::SColor(255, 0, 0, 0); |
48 | const video::SColor SCOL_BLUE = video::SColor(255, 0, 0, 255); | 48 | const video::SColor SCOL_BLUE = video::SColor(255, 0, 0, 255); |
49 | const video::SColor SCOL_CYAN = video::SColor(255, 0, 255, 255); | 49 | const video::SColor SCOL_CYAN = video::SColor(255, 0, 255, 255); |
50 | const video::SColor SCOL_GRAY = video::SColor(255, 128,128, 128); | 50 | const video::SColor SCOL_GRAY = video::SColor(255, 128,128, 128); |
51 | const video::SColor SCOL_GREEN = video::SColor(255, 0, 255, 0); | 51 | const video::SColor SCOL_GREEN = video::SColor(255, 0, 255, 0); |
52 | const video::SColor SCOL_MAGENTA = video::SColor(255, 255, 0, 255); | 52 | const video::SColor SCOL_MAGENTA = video::SColor(255, 255, 0, 255); |
53 | const video::SColor SCOL_RED = video::SColor(255, 255, 0, 0); | 53 | const video::SColor SCOL_RED = video::SColor(255, 255, 0, 0); |
54 | const video::SColor SCOL_YELLOW = video::SColor(255, 255, 255, 0); | 54 | const video::SColor SCOL_YELLOW = video::SColor(255, 255, 255, 0); |
55 | const video::SColor SCOL_WHITE = video::SColor(255, 255, 255, 255); | 55 | const video::SColor SCOL_WHITE = video::SColor(255, 255, 255, 255); |
56 | }; // namespace | 56 | }; // namespace |
57 | 57 | ||
58 | /* | 58 | /* |
59 | Returns a new unique number on each call. | 59 | Returns a new unique number on each call. |
60 | */ | 60 | */ |
61 | s32 makeUniqueId() | 61 | s32 makeUniqueId() |
62 | { | 62 | { |
63 | static int unique = GUI_ID_MAX; | 63 | static int unique = GUI_ID_MAX; |
64 | ++unique; | 64 | ++unique; |
65 | return unique; | 65 | return unique; |
66 | } | 66 | } |
67 | 67 | ||
68 | /* | 68 | /* |
69 | Find out which vertex-type is needed for the given material type. | 69 | Find out which vertex-type is needed for the given material type. |
70 | */ | 70 | */ |
71 | video::E_VERTEX_TYPE getVertexTypeForMaterialType(video::E_MATERIAL_TYPE materialType) | 71 | video::E_VERTEX_TYPE getVertexTypeForMaterialType(video::E_MATERIAL_TYPE materialType) |
72 | { | 72 | { |
73 | using namespace video; | 73 | using namespace video; |
74 | 74 | ||
75 | switch ( materialType ) | 75 | switch ( materialType ) |
76 | { | 76 | { |
77 | case EMT_SOLID: | 77 | case EMT_SOLID: |
78 | return EVT_STANDARD; | 78 | return EVT_STANDARD; |
79 | 79 | ||
80 | case EMT_SOLID_2_LAYER: | 80 | case EMT_SOLID_2_LAYER: |
81 | return EVT_STANDARD; | 81 | return EVT_STANDARD; |
82 | 82 | ||
83 | case EMT_LIGHTMAP: | 83 | case EMT_LIGHTMAP: |
84 | case EMT_LIGHTMAP_ADD: | 84 | case EMT_LIGHTMAP_ADD: |
85 | case EMT_LIGHTMAP_M2: | 85 | case EMT_LIGHTMAP_M2: |
86 | case EMT_LIGHTMAP_M4: | 86 | case EMT_LIGHTMAP_M4: |
87 | case EMT_LIGHTMAP_LIGHTING: | 87 | case EMT_LIGHTMAP_LIGHTING: |
88 | case EMT_LIGHTMAP_LIGHTING_M2: | 88 | case EMT_LIGHTMAP_LIGHTING_M2: |
89 | case EMT_LIGHTMAP_LIGHTING_M4: | 89 | case EMT_LIGHTMAP_LIGHTING_M4: |
90 | return EVT_2TCOORDS; | 90 | return EVT_2TCOORDS; |
91 | 91 | ||
92 | case EMT_DETAIL_MAP: | 92 | case EMT_DETAIL_MAP: |
93 | return EVT_2TCOORDS; | 93 | return EVT_2TCOORDS; |
94 | 94 | ||
95 | case EMT_SPHERE_MAP: | 95 | case EMT_SPHERE_MAP: |
96 | return EVT_STANDARD; | 96 | return EVT_STANDARD; |
97 | 97 | ||
98 | case EMT_REFLECTION_2_LAYER: | 98 | case EMT_REFLECTION_2_LAYER: |
99 | return EVT_2TCOORDS; | 99 | return EVT_2TCOORDS; |
100 | 100 | ||
101 | case EMT_TRANSPARENT_ADD_COLOR: | 101 | case EMT_TRANSPARENT_ADD_COLOR: |
102 | return EVT_STANDARD; | 102 | return EVT_STANDARD; |
103 | 103 | ||
104 | case EMT_TRANSPARENT_ALPHA_CHANNEL: | 104 | case EMT_TRANSPARENT_ALPHA_CHANNEL: |
105 | return EVT_STANDARD; | 105 | return EVT_STANDARD; |
106 | 106 | ||
107 | case EMT_TRANSPARENT_ALPHA_CHANNEL_REF: | 107 | case EMT_TRANSPARENT_ALPHA_CHANNEL_REF: |
108 | return EVT_STANDARD; | 108 | return EVT_STANDARD; |
109 | 109 | ||
110 | case EMT_TRANSPARENT_VERTEX_ALPHA: | 110 | case EMT_TRANSPARENT_VERTEX_ALPHA: |
111 | return EVT_STANDARD; | 111 | return EVT_STANDARD; |
112 | 112 | ||
113 | case EMT_TRANSPARENT_REFLECTION_2_LAYER: | 113 | case EMT_TRANSPARENT_REFLECTION_2_LAYER: |
114 | return EVT_2TCOORDS; | 114 | return EVT_2TCOORDS; |
115 | 115 | ||
116 | case EMT_NORMAL_MAP_SOLID: | 116 | case EMT_NORMAL_MAP_SOLID: |
117 | case EMT_NORMAL_MAP_TRANSPARENT_ADD_COLOR: | 117 | case EMT_NORMAL_MAP_TRANSPARENT_ADD_COLOR: |
118 | case EMT_NORMAL_MAP_TRANSPARENT_VERTEX_ALPHA: | 118 | case EMT_NORMAL_MAP_TRANSPARENT_VERTEX_ALPHA: |
119 | case EMT_PARALLAX_MAP_SOLID: | 119 | case EMT_PARALLAX_MAP_SOLID: |
120 | case EMT_PARALLAX_MAP_TRANSPARENT_ADD_COLOR: | 120 | case EMT_PARALLAX_MAP_TRANSPARENT_ADD_COLOR: |
121 | case EMT_PARALLAX_MAP_TRANSPARENT_VERTEX_ALPHA: | 121 | case EMT_PARALLAX_MAP_TRANSPARENT_VERTEX_ALPHA: |
122 | return EVT_TANGENTS; | 122 | return EVT_TANGENTS; |
123 | 123 | ||
124 | case EMT_ONETEXTURE_BLEND: | 124 | case EMT_ONETEXTURE_BLEND: |
125 | return EVT_STANDARD; | 125 | return EVT_STANDARD; |
126 | 126 | ||
127 | case EMT_FORCE_32BIT: | 127 | case EMT_FORCE_32BIT: |
128 | return EVT_STANDARD; | 128 | return EVT_STANDARD; |
129 | } | 129 | } |
130 | return EVT_STANDARD; | 130 | return EVT_STANDARD; |
131 | } | 131 | } |
132 | 132 | ||
133 | /* | 133 | /* |
134 | Custom GUI-control to edit colorvalues. | 134 | Custom GUI-control to edit colorvalues. |
135 | */ | 135 | */ |
136 | class CColorControl : public gui::IGUIElement | 136 | class CColorControl : public gui::IGUIElement |
137 | { | 137 | { |
138 | public: | 138 | public: |
139 | // Constructor | 139 | // Constructor |
140 | CColorControl(gui::IGUIEnvironment* guiEnv, const core::position2d<s32> & pos, const wchar_t *text, IGUIElement* parent, s32 id=-1 ) | 140 | CColorControl(gui::IGUIEnvironment* guiEnv, const core::position2d<s32> & pos, const wchar_t *text, IGUIElement* parent, s32 id=-1 ) |
141 | : gui::IGUIElement(gui::EGUIET_ELEMENT, guiEnv, parent,id, core::rect< s32 >(pos, pos+core::dimension2d<s32>(80, 75))) | 141 | : gui::IGUIElement(gui::EGUIET_ELEMENT, guiEnv, parent,id, core::rect< s32 >(pos, pos+core::dimension2d<s32>(80, 75))) |
142 | , DirtyFlag(true) | 142 | , DirtyFlag(true) |
143 | , ColorStatic(0) | 143 | , ColorStatic(0) |
144 | , EditAlpha(0) | 144 | , EditAlpha(0) |
145 | , EditRed(0) | 145 | , EditRed(0) |
146 | , EditGreen(0) | 146 | , EditGreen(0) |
147 | , EditBlue(0) | 147 | , EditBlue(0) |
148 | { | 148 | { |
149 | using namespace gui; | 149 | using namespace gui; |
150 | ButtonSetId = makeUniqueId(); | 150 | ButtonSetId = makeUniqueId(); |
151 | 151 | ||
152 | const core::rect< s32 > rectControls(0,0,AbsoluteRect.getWidth(),AbsoluteRect.getHeight() ); | 152 | const core::rect< s32 > rectControls(0,0,AbsoluteRect.getWidth(),AbsoluteRect.getHeight() ); |
153 | IGUIStaticText * groupElement = guiEnv->addStaticText (L"", rectControls, true, false, this, -1, false); | 153 | IGUIStaticText * groupElement = guiEnv->addStaticText (L"", rectControls, true, false, this, -1, false); |
154 | groupElement->setNotClipped(true); | 154 | groupElement->setNotClipped(true); |
155 | 155 | ||
156 | guiEnv->addStaticText (text, core::rect<s32>(0,0,80,15), false, false, groupElement, -1, false); | 156 | guiEnv->addStaticText (text, core::rect<s32>(0,0,80,15), false, false, groupElement, -1, false); |
157 | 157 | ||
158 | EditAlpha = addEditForNumbers(guiEnv, core::position2d<s32>(0,15), L"a", -1, groupElement ); | 158 | EditAlpha = addEditForNumbers(guiEnv, core::position2d<s32>(0,15), L"a", -1, groupElement ); |
159 | EditRed = addEditForNumbers(guiEnv, core::position2d<s32>(0,30), L"r", -1, groupElement ); | 159 | EditRed = addEditForNumbers(guiEnv, core::position2d<s32>(0,30), L"r", -1, groupElement ); |
160 | EditGreen = addEditForNumbers(guiEnv, core::position2d<s32>(0,45), L"g", -1, groupElement ); | 160 | EditGreen = addEditForNumbers(guiEnv, core::position2d<s32>(0,45), L"g", -1, groupElement ); |
161 | EditBlue = addEditForNumbers(guiEnv, core::position2d<s32>(0,60), L"b", -1, groupElement ); | 161 | EditBlue = addEditForNumbers(guiEnv, core::position2d<s32>(0,60), L"b", -1, groupElement ); |
162 | 162 | ||
163 | ColorStatic = guiEnv->addStaticText (L"", core::rect<s32>(60,15,80,75), true, false, groupElement, -1, true); | 163 | ColorStatic = guiEnv->addStaticText (L"", core::rect<s32>(60,15,80,75), true, false, groupElement, -1, true); |
164 | 164 | ||
165 | guiEnv->addButton (core::rect<s32>(60,35,80,50), groupElement, ButtonSetId, L"set"); | 165 | guiEnv->addButton (core::rect<s32>(60,35,80,50), groupElement, ButtonSetId, L"set"); |
166 | SetEditsFromColor(Color); | 166 | SetEditsFromColor(Color); |
167 | } | 167 | } |
168 | 168 | ||
169 | // event receiver | 169 | // event receiver |
170 | virtual bool OnEvent(const SEvent &event) | 170 | virtual bool OnEvent(const SEvent &event) |
171 | { | 171 | { |
172 | if ( event.EventType != EET_GUI_EVENT ) | 172 | if ( event.EventType != EET_GUI_EVENT ) |
173 | return false; | 173 | return false; |
174 | 174 | ||
175 | if ( event.GUIEvent.Caller->getID() == ButtonSetId && event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED ) | 175 | if ( event.GUIEvent.Caller->getID() == ButtonSetId && event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED ) |
176 | { | 176 | { |
177 | Color = GetColorFromEdits(); | 177 | Color = GetColorFromEdits(); |
178 | SetEditsFromColor(Color); | 178 | SetEditsFromColor(Color); |
179 | } | 179 | } |
180 | 180 | ||
181 | return false; | 181 | return false; |
182 | } | 182 | } |
183 | 183 | ||
184 | // set the color values | 184 | // set the color values |
185 | void setColor(const video::SColor& col) | 185 | void setColor(const video::SColor& col) |
186 | { | 186 | { |
187 | DirtyFlag = true; | 187 | DirtyFlag = true; |
188 | Color = col; | 188 | Color = col; |
189 | SetEditsFromColor(Color); | 189 | SetEditsFromColor(Color); |
190 | } | 190 | } |
191 | 191 | ||
192 | // get the color values | 192 | // get the color values |
193 | const video::SColor& getColor() const | 193 | const video::SColor& getColor() const |
194 | { | 194 | { |
195 | return Color; | 195 | return Color; |
196 | } | 196 | } |
197 | 197 | ||
198 | // To reset the dirty flag | 198 | // To reset the dirty flag |
199 | void resetDirty() | 199 | void resetDirty() |
200 | { | 200 | { |
201 | DirtyFlag = false; | 201 | DirtyFlag = false; |
202 | } | 202 | } |
203 | 203 | ||
204 | // when the color was changed the dirty flag is set | 204 | // when the color was changed the dirty flag is set |
205 | bool isDirty() const | 205 | bool isDirty() const |
206 | { | 206 | { |
207 | return DirtyFlag; | 207 | return DirtyFlag; |
208 | }; | 208 | }; |
209 | 209 | ||
210 | protected: | 210 | protected: |
211 | 211 | ||
212 | // Add a staticbox for a description + an editbox so users can enter numbers | 212 | // Add a staticbox for a description + an editbox so users can enter numbers |
213 | gui::IGUIEditBox* addEditForNumbers(gui::IGUIEnvironment* guiEnv, const core::position2d<s32> & pos, const wchar_t *text, s32 id, gui::IGUIElement * parent) | 213 | gui::IGUIEditBox* addEditForNumbers(gui::IGUIEnvironment* guiEnv, const core::position2d<s32> & pos, const wchar_t *text, s32 id, gui::IGUIElement * parent) |
214 | { | 214 | { |
215 | using namespace gui; | 215 | using namespace gui; |
216 | 216 | ||
217 | core::rect< s32 > rect(pos, pos+core::dimension2d<s32>(10, 15)); | 217 | core::rect< s32 > rect(pos, pos+core::dimension2d<s32>(10, 15)); |
218 | guiEnv->addStaticText (text, rect, false, false, parent, -1, false); | 218 | guiEnv->addStaticText (text, rect, false, false, parent, -1, false); |
219 | rect += core::position2d<s32>( 20, 0 ); | 219 | rect += core::position2d<s32>( 20, 0 ); |
220 | rect.LowerRightCorner.X += 20; | 220 | rect.LowerRightCorner.X += 20; |
221 | gui::IGUIEditBox* edit = guiEnv->addEditBox(L"0", rect, true, parent, id); | 221 | gui::IGUIEditBox* edit = guiEnv->addEditBox(L"0", rect, true, parent, id); |
222 | return edit; | 222 | return edit; |
223 | } | 223 | } |
224 | 224 | ||
225 | // Get the color value from the editfields | 225 | // Get the color value from the editfields |
226 | video::SColor GetColorFromEdits() | 226 | video::SColor GetColorFromEdits() |
227 | { | 227 | { |
228 | video::SColor col; | 228 | video::SColor col; |
229 | 229 | ||
230 | if (EditAlpha) | 230 | if (EditAlpha) |
231 | { | 231 | { |
232 | u32 alpha = core::strtoul10(core::stringc(EditAlpha->getText()).c_str()); | 232 | u32 alpha = core::strtoul10(core::stringc(EditAlpha->getText()).c_str()); |
233 | if (alpha > 255) | 233 | if (alpha > 255) |
234 | alpha = 255; | 234 | alpha = 255; |
235 | col.setAlpha(alpha); | 235 | col.setAlpha(alpha); |
236 | } | 236 | } |
237 | 237 | ||
238 | if (EditRed) | 238 | if (EditRed) |
239 | { | 239 | { |
240 | u32 red = core::strtoul10(core::stringc(EditRed->getText()).c_str()); | 240 | u32 red = core::strtoul10(core::stringc(EditRed->getText()).c_str()); |
241 | if (red > 255) | 241 | if (red > 255) |
242 | red = 255; | 242 | red = 255; |
243 | col.setRed(red); | 243 | col.setRed(red); |
244 | } | 244 | } |
245 | 245 | ||
246 | if (EditGreen) | 246 | if (EditGreen) |
247 | { | 247 | { |
248 | u32 green = core::strtoul10(core::stringc(EditGreen->getText()).c_str()); | 248 | u32 green = core::strtoul10(core::stringc(EditGreen->getText()).c_str()); |
249 | if (green > 255) | 249 | if (green > 255) |
250 | green = 255; | 250 | green = 255; |
251 | col.setGreen(green); | 251 | col.setGreen(green); |
252 | } | 252 | } |
253 | 253 | ||
254 | if (EditBlue) | 254 | if (EditBlue) |
255 | { | 255 | { |
256 | u32 blue = core::strtoul10(core::stringc(EditBlue->getText()).c_str()); | 256 | u32 blue = core::strtoul10(core::stringc(EditBlue->getText()).c_str()); |
257 | if (blue > 255) | 257 | if (blue > 255) |
258 | blue = 255; | 258 | blue = 255; |
259 | col.setBlue(blue); | 259 | col.setBlue(blue); |
260 | } | 260 | } |
261 | 261 | ||
262 | return col; | 262 | return col; |
263 | } | 263 | } |
264 | 264 | ||
265 | // Fill the editfields with the value for the given color | 265 | // Fill the editfields with the value for the given color |
266 | void SetEditsFromColor(video::SColor col) | 266 | void SetEditsFromColor(video::SColor col) |
267 | { | 267 | { |
268 | DirtyFlag = true; | 268 | DirtyFlag = true; |
269 | if ( EditAlpha ) | 269 | if ( EditAlpha ) |
270 | EditAlpha->setText( core::stringw(col.getAlpha()).c_str() ); | 270 | EditAlpha->setText( core::stringw(col.getAlpha()).c_str() ); |
271 | if ( EditRed ) | 271 | if ( EditRed ) |
272 | EditRed->setText( core::stringw(col.getRed()).c_str() ); | 272 | EditRed->setText( core::stringw(col.getRed()).c_str() ); |
273 | if ( EditGreen ) | 273 | if ( EditGreen ) |
274 | EditGreen->setText( core::stringw(col.getGreen()).c_str() ); | 274 | EditGreen->setText( core::stringw(col.getGreen()).c_str() ); |
275 | if ( EditBlue ) | 275 | if ( EditBlue ) |
276 | EditBlue->setText( core::stringw(col.getBlue()).c_str() ); | 276 | EditBlue->setText( core::stringw(col.getBlue()).c_str() ); |
277 | if ( ColorStatic ) | 277 | if ( ColorStatic ) |
278 | ColorStatic->setBackgroundColor(col); | 278 | ColorStatic->setBackgroundColor(col); |
279 | } | 279 | } |
280 | 280 | ||
281 | private: | 281 | private: |
282 | 282 | ||
283 | bool DirtyFlag; | 283 | bool DirtyFlag; |
284 | video::SColor Color; | 284 | video::SColor Color; |
285 | s32 ButtonSetId; | 285 | s32 ButtonSetId; |
286 | gui::IGUIStaticText * ColorStatic; | 286 | gui::IGUIStaticText * ColorStatic; |
287 | gui::IGUIEditBox * EditAlpha; | 287 | gui::IGUIEditBox * EditAlpha; |
288 | gui::IGUIEditBox * EditRed; | 288 | gui::IGUIEditBox * EditRed; |
289 | gui::IGUIEditBox * EditGreen; | 289 | gui::IGUIEditBox * EditGreen; |
290 | gui::IGUIEditBox * EditBlue; | 290 | gui::IGUIEditBox * EditBlue; |
291 | }; | 291 | }; |
292 | 292 | ||
293 | /* | 293 | /* |
294 | Custom GUI-control for to edit all colors typically used in materials and lights | 294 | Custom GUI-control for to edit all colors typically used in materials and lights |
295 | */ | 295 | */ |
296 | class CAllColorsControl : public gui::IGUIElement | 296 | class CAllColorsControl : public gui::IGUIElement |
297 | { | 297 | { |
298 | public: | 298 | public: |
299 | // Constructor | 299 | // Constructor |
300 | CAllColorsControl(gui::IGUIEnvironment* guiEnv, const core::position2d<s32> & pos, const wchar_t * description, bool hasEmissive, IGUIElement* parent, s32 id=-1) | 300 | CAllColorsControl(gui::IGUIEnvironment* guiEnv, const core::position2d<s32> & pos, const wchar_t * description, bool hasEmissive, IGUIElement* parent, s32 id=-1) |
301 | : gui::IGUIElement(gui::EGUIET_ELEMENT, guiEnv, parent,id, core::rect<s32>(pos,pos+core::dimension2d<s32>(60,250))) | 301 | : gui::IGUIElement(gui::EGUIET_ELEMENT, guiEnv, parent,id, core::rect<s32>(pos,pos+core::dimension2d<s32>(60,250))) |
302 | , ControlAmbientColor(0), ControlDiffuseColor(0), ControlSpecularColor(0), ControlEmissiveColor(0) | 302 | , ControlAmbientColor(0), ControlDiffuseColor(0), ControlSpecularColor(0), ControlEmissiveColor(0) |
303 | { | 303 | { |
304 | core::rect<s32> rect(0, 0, 60, 15); | 304 | core::rect<s32> rect(0, 0, 60, 15); |
305 | guiEnv->addStaticText (description, rect, false, false, this, -1, false); | 305 | guiEnv->addStaticText (description, rect, false, false, this, -1, false); |
306 | createColorControls(guiEnv, core::position2d<s32>(0, 15), hasEmissive); | 306 | createColorControls(guiEnv, core::position2d<s32>(0, 15), hasEmissive); |
307 | } | 307 | } |
308 | 308 | ||
309 | // Destructor | 309 | // Destructor |
310 | virtual ~CAllColorsControl() | 310 | virtual ~CAllColorsControl() |
311 | { | 311 | { |
312 | ControlAmbientColor->drop(); | 312 | ControlAmbientColor->drop(); |
313 | ControlDiffuseColor->drop(); | 313 | ControlDiffuseColor->drop(); |
314 | if ( ControlEmissiveColor ) | 314 | if ( ControlEmissiveColor ) |
315 | ControlEmissiveColor->drop(); | 315 | ControlEmissiveColor->drop(); |
316 | ControlSpecularColor->drop(); | 316 | ControlSpecularColor->drop(); |
317 | } | 317 | } |
318 | 318 | ||
319 | // Set the color values to those within the material | 319 | // Set the color values to those within the material |
320 | void setColorsToMaterialColors(const video::SMaterial & material) | 320 | void setColorsToMaterialColors(const video::SMaterial & material) |
321 | { | 321 | { |
322 | ControlAmbientColor->setColor(material.AmbientColor); | 322 | ControlAmbientColor->setColor(material.AmbientColor); |
323 | ControlDiffuseColor->setColor(material.DiffuseColor); | 323 | ControlDiffuseColor->setColor(material.DiffuseColor); |
324 | ControlEmissiveColor->setColor(material.EmissiveColor); | 324 | ControlEmissiveColor->setColor(material.EmissiveColor); |
325 | ControlSpecularColor->setColor(material.SpecularColor); | 325 | ControlSpecularColor->setColor(material.SpecularColor); |
326 | } | 326 | } |
327 | 327 | ||
328 | // Update all changed colors in the material | 328 | // Update all changed colors in the material |
329 | void updateMaterialColors(video::SMaterial & material) | 329 | void updateMaterialColors(video::SMaterial & material) |
330 | { | 330 | { |
331 | if ( ControlAmbientColor->isDirty() ) | 331 | if ( ControlAmbientColor->isDirty() ) |
332 | material.AmbientColor = ControlAmbientColor->getColor(); | 332 | material.AmbientColor = ControlAmbientColor->getColor(); |
333 | if ( ControlDiffuseColor->isDirty() ) | 333 | if ( ControlDiffuseColor->isDirty() ) |
334 | material.DiffuseColor = ControlDiffuseColor->getColor(); | 334 | material.DiffuseColor = ControlDiffuseColor->getColor(); |
335 | if ( ControlEmissiveColor->isDirty() ) | 335 | if ( ControlEmissiveColor->isDirty() ) |
336 | material.EmissiveColor = ControlEmissiveColor->getColor(); | 336 | material.EmissiveColor = ControlEmissiveColor->getColor(); |
337 | if ( ControlSpecularColor->isDirty() ) | 337 | if ( ControlSpecularColor->isDirty() ) |
338 | material.SpecularColor = ControlSpecularColor->getColor(); | 338 | material.SpecularColor = ControlSpecularColor->getColor(); |
339 | } | 339 | } |
340 | 340 | ||
341 | // Set the color values to those from the light data | 341 | // Set the color values to those from the light data |
342 | void setColorsToLightDataColors(const video::SLight & lightData) | 342 | void setColorsToLightDataColors(const video::SLight & lightData) |
343 | { | 343 | { |
344 | ControlAmbientColor->setColor(lightData.AmbientColor.toSColor()); | 344 | ControlAmbientColor->setColor(lightData.AmbientColor.toSColor()); |
345 | ControlAmbientColor->setColor(lightData.DiffuseColor.toSColor()); | 345 | ControlAmbientColor->setColor(lightData.DiffuseColor.toSColor()); |
346 | ControlAmbientColor->setColor(lightData.SpecularColor.toSColor()); | 346 | ControlAmbientColor->setColor(lightData.SpecularColor.toSColor()); |
347 | } | 347 | } |
348 | 348 | ||
349 | // Update all changed colors in the light data | 349 | // Update all changed colors in the light data |
350 | void updateLightColors(video::SLight & lightData) | 350 | void updateLightColors(video::SLight & lightData) |
351 | { | 351 | { |
352 | if ( ControlAmbientColor->isDirty() ) | 352 | if ( ControlAmbientColor->isDirty() ) |
353 | lightData.AmbientColor = video::SColorf( ControlAmbientColor->getColor() ); | 353 | lightData.AmbientColor = video::SColorf( ControlAmbientColor->getColor() ); |
354 | if ( ControlDiffuseColor->isDirty() ) | 354 | if ( ControlDiffuseColor->isDirty() ) |
355 | lightData.DiffuseColor = video::SColorf( ControlDiffuseColor->getColor() ); | 355 | lightData.DiffuseColor = video::SColorf( ControlDiffuseColor->getColor() ); |
356 | if ( ControlSpecularColor->isDirty() ) | 356 | if ( ControlSpecularColor->isDirty() ) |
357 | lightData.SpecularColor = video::SColorf(ControlSpecularColor->getColor() ); | 357 | lightData.SpecularColor = video::SColorf(ControlSpecularColor->getColor() ); |
358 | } | 358 | } |
359 | 359 | ||
360 | // To reset the dirty flags | 360 | // To reset the dirty flags |
361 | void resetDirty() | 361 | void resetDirty() |
362 | { | 362 | { |
363 | ControlAmbientColor->resetDirty(); | 363 | ControlAmbientColor->resetDirty(); |
364 | ControlDiffuseColor->resetDirty(); | 364 | ControlDiffuseColor->resetDirty(); |
365 | ControlSpecularColor->resetDirty(); | 365 | ControlSpecularColor->resetDirty(); |
366 | if ( ControlEmissiveColor ) | 366 | if ( ControlEmissiveColor ) |
367 | ControlEmissiveColor->resetDirty(); | 367 | ControlEmissiveColor->resetDirty(); |
368 | } | 368 | } |
369 | 369 | ||
370 | protected: | 370 | protected: |
371 | void createColorControls(gui::IGUIEnvironment* guiEnv, const core::position2d<s32> & pos, bool hasEmissive) | 371 | void createColorControls(gui::IGUIEnvironment* guiEnv, const core::position2d<s32> & pos, bool hasEmissive) |
372 | { | 372 | { |
373 | ControlAmbientColor = new CColorControl( guiEnv, pos, L"ambient", this); | 373 | ControlAmbientColor = new CColorControl( guiEnv, pos, L"ambient", this); |
374 | ControlDiffuseColor = new CColorControl( guiEnv, pos + core::position2d<s32>(0, 75), L"diffuse", this ); | 374 | ControlDiffuseColor = new CColorControl( guiEnv, pos + core::position2d<s32>(0, 75), L"diffuse", this ); |
375 | ControlSpecularColor = new CColorControl( guiEnv, pos + core::position2d<s32>(0, 150), L"specular", this ); | 375 | ControlSpecularColor = new CColorControl( guiEnv, pos + core::position2d<s32>(0, 150), L"specular", this ); |
376 | if ( hasEmissive ) | 376 | if ( hasEmissive ) |
377 | { | 377 | { |
378 | ControlEmissiveColor = new CColorControl( guiEnv, pos + core::position2d<s32>(0, 225), L"emissive", this ); | 378 | ControlEmissiveColor = new CColorControl( guiEnv, pos + core::position2d<s32>(0, 225), L"emissive", this ); |
379 | } | 379 | } |
380 | } | 380 | } |
381 | 381 | ||
382 | private: | 382 | private: |
383 | CColorControl* ControlAmbientColor; | 383 | CColorControl* ControlAmbientColor; |
384 | CColorControl* ControlDiffuseColor; | 384 | CColorControl* ControlDiffuseColor; |
385 | CColorControl* ControlSpecularColor; | 385 | CColorControl* ControlSpecularColor; |
386 | CColorControl* ControlEmissiveColor; | 386 | CColorControl* ControlEmissiveColor; |
387 | }; | 387 | }; |
388 | 388 | ||
389 | /* | 389 | /* |
390 | GUI-Control to offer a selection of available textures. | 390 | GUI-Control to offer a selection of available textures. |
391 | */ | 391 | */ |
392 | class CTextureControl : public gui::IGUIElement | 392 | class CTextureControl : public gui::IGUIElement |
393 | { | 393 | { |
394 | public: | 394 | public: |
395 | CTextureControl(gui::IGUIEnvironment* guiEnv, video::IVideoDriver * driver, const core::position2d<s32> & pos, IGUIElement* parent, s32 id=-1) | 395 | CTextureControl(gui::IGUIEnvironment* guiEnv, video::IVideoDriver * driver, const core::position2d<s32> & pos, IGUIElement* parent, s32 id=-1) |
396 | : gui::IGUIElement(gui::EGUIET_ELEMENT, guiEnv, parent,id, core::rect<s32>(pos,pos+core::dimension2d<s32>(100,15))) | 396 | : gui::IGUIElement(gui::EGUIET_ELEMENT, guiEnv, parent,id, core::rect<s32>(pos,pos+core::dimension2d<s32>(100,15))) |
397 | , DirtyFlag(true), ComboTexture(0) | 397 | , DirtyFlag(true), ComboTexture(0) |
398 | { | 398 | { |
399 | core::rect<s32> rectCombo(0, 0, AbsoluteRect.getWidth(),AbsoluteRect.getHeight()); | 399 | core::rect<s32> rectCombo(0, 0, AbsoluteRect.getWidth(),AbsoluteRect.getHeight()); |
400 | ComboTexture = guiEnv->addComboBox (rectCombo, this); | 400 | ComboTexture = guiEnv->addComboBox (rectCombo, this); |
401 | updateTextures(driver); | 401 | updateTextures(driver); |
402 | } | 402 | } |
403 | 403 | ||
404 | virtual bool OnEvent(const SEvent &event) | 404 | virtual bool OnEvent(const SEvent &event) |
405 | { | 405 | { |
406 | if ( event.EventType != EET_GUI_EVENT ) | 406 | if ( event.EventType != EET_GUI_EVENT ) |
407 | return false; | 407 | return false; |
408 | 408 | ||
409 | if ( event.GUIEvent.Caller == ComboTexture && event.GUIEvent.EventType == gui::EGET_COMBO_BOX_CHANGED ) | 409 | if ( event.GUIEvent.Caller == ComboTexture && event.GUIEvent.EventType == gui::EGET_COMBO_BOX_CHANGED ) |
410 | { | 410 | { |
411 | DirtyFlag = true; | 411 | DirtyFlag = true; |
412 | } | 412 | } |
413 | 413 | ||
414 | return false; | 414 | return false; |
415 | } | 415 | } |
416 | 416 | ||
417 | // Workaround for a problem with comboboxes. | 417 | // Workaround for a problem with comboboxes. |
418 | // We have to get in front when the combobox wants to get in front or combobox-list might be drawn below other elements. | 418 | // We have to get in front when the combobox wants to get in front or combobox-list might be drawn below other elements. |
419 | virtual bool bringToFront(IGUIElement* element) | 419 | virtual bool bringToFront(IGUIElement* element) |
420 | { | 420 | { |
421 | bool result = gui::IGUIElement::bringToFront(element); | 421 | bool result = gui::IGUIElement::bringToFront(element); |
422 | if ( Parent && element == ComboTexture ) | 422 | if ( Parent && element == ComboTexture ) |
423 | result &= Parent->bringToFront(this); | 423 | result &= Parent->bringToFront(this); |
424 | return result; | 424 | return result; |
425 | } | 425 | } |
426 | 426 | ||
427 | // return selected texturename (if any, otherwise 0) | 427 | // return selected texturename (if any, otherwise 0) |
428 | const wchar_t * getSelectedTextureName() const | 428 | const wchar_t * getSelectedTextureName() const |
429 | { | 429 | { |
430 | s32 selected = ComboTexture->getSelected(); | 430 | s32 selected = ComboTexture->getSelected(); |
431 | if ( selected < 0 ) | 431 | if ( selected < 0 ) |
432 | return 0; | 432 | return 0; |
433 | return ComboTexture->getItem(selected); | 433 | return ComboTexture->getItem(selected); |
434 | } | 434 | } |
435 | 435 | ||
436 | // reset the dirty flag | 436 | // reset the dirty flag |
437 | void resetDirty() | 437 | void resetDirty() |
438 | { | 438 | { |
439 | DirtyFlag = false; | 439 | DirtyFlag = false; |
440 | } | 440 | } |
441 | 441 | ||
442 | // when the texture was changed the dirty flag is set | 442 | // when the texture was changed the dirty flag is set |
443 | bool isDirty() const | 443 | bool isDirty() const |
444 | { | 444 | { |
445 | return DirtyFlag; | 445 | return DirtyFlag; |
446 | }; | 446 | }; |
447 | 447 | ||
448 | // Put the names of all currently loaded textures in a combobox | 448 | // Put the names of all currently loaded textures in a combobox |
449 | void updateTextures(video::IVideoDriver * driver) | 449 | void updateTextures(video::IVideoDriver * driver) |
450 | { | 450 | { |
451 | s32 oldSelected = ComboTexture->getSelected(); | 451 | s32 oldSelected = ComboTexture->getSelected(); |
452 | s32 selectNew = -1; | 452 | s32 selectNew = -1; |
453 | const wchar_t * oldTextureName = 0; | 453 | const wchar_t * oldTextureName = 0; |
454 | if ( oldSelected >= 0 ) | 454 | if ( oldSelected >= 0 ) |
455 | { | 455 | { |
456 | oldTextureName = ComboTexture->getItem(oldSelected); | 456 | oldTextureName = ComboTexture->getItem(oldSelected); |
457 | } | 457 | } |
458 | ComboTexture->clear(); | 458 | ComboTexture->clear(); |
459 | for ( u32 i=0; i < driver->getTextureCount(); ++i ) | 459 | for ( u32 i=0; i < driver->getTextureCount(); ++i ) |
460 | { | 460 | { |
461 | video::ITexture * texture = driver->getTextureByIndex(i); | 461 | video::ITexture * texture = driver->getTextureByIndex(i); |
462 | core::stringw name( texture->getName() ); | 462 | core::stringw name( texture->getName() ); |
463 | ComboTexture->addItem( name.c_str() ); | 463 | ComboTexture->addItem( name.c_str() ); |
464 | if ( oldTextureName && selectNew < 0 && name == oldTextureName ) | 464 | if ( oldTextureName && selectNew < 0 && name == oldTextureName ) |
465 | selectNew = i; | 465 | selectNew = i; |
466 | } | 466 | } |
467 | 467 | ||
468 | // add another name which can be used to clear the texture | 468 | // add another name which can be used to clear the texture |
469 | ComboTexture->addItem( CLEAR_TEXTURE.c_str() ); | 469 | ComboTexture->addItem( CLEAR_TEXTURE.c_str() ); |
470 | if ( CLEAR_TEXTURE == oldTextureName ) | 470 | if ( CLEAR_TEXTURE == oldTextureName ) |
471 | selectNew = ComboTexture->getItemCount()-1; | 471 | selectNew = ComboTexture->getItemCount()-1; |
472 | 472 | ||
473 | if ( selectNew >= 0 ) | 473 | if ( selectNew >= 0 ) |
474 | ComboTexture->setSelected(selectNew); | 474 | ComboTexture->setSelected(selectNew); |
475 | 475 | ||
476 | DirtyFlag = true; | 476 | DirtyFlag = true; |
477 | } | 477 | } |
478 | 478 | ||
479 | private: | 479 | private: |
480 | bool DirtyFlag; | 480 | bool DirtyFlag; |
481 | gui::IGUIComboBox * ComboTexture; | 481 | gui::IGUIComboBox * ComboTexture; |
482 | }; | 482 | }; |
483 | 483 | ||
484 | /* | 484 | /* |
485 | Control which allows setting some of the material values for a meshscenenode | 485 | Control which allows setting some of the material values for a meshscenenode |
486 | */ | 486 | */ |
487 | struct SMeshNodeControl | 487 | struct SMeshNodeControl |
488 | { | 488 | { |
489 | // constructor | 489 | // constructor |
490 | SMeshNodeControl() | 490 | SMeshNodeControl() |
491 | : Initialized(false), Driver(0), MeshManipulator(0), SceneNode(0), SceneNode2T(0), SceneNodeTangents(0) | 491 | : Initialized(false), Driver(0), MeshManipulator(0), SceneNode(0), SceneNode2T(0), SceneNodeTangents(0) |
492 | , AllColorsControl(0), ButtonLighting(0), InfoLighting(0), ComboMaterial(0), TextureControl1(0), TextureControl2(0), ControlVertexColors(0) | 492 | , AllColorsControl(0), ButtonLighting(0), InfoLighting(0), ComboMaterial(0), TextureControl1(0), TextureControl2(0), ControlVertexColors(0) |
493 | { | 493 | { |
494 | } | 494 | } |
495 | 495 | ||
496 | // Destructor | 496 | // Destructor |
497 | virtual ~SMeshNodeControl() | 497 | virtual ~SMeshNodeControl() |
498 | { | 498 | { |
499 | if ( TextureControl1 ) | 499 | if ( TextureControl1 ) |
500 | TextureControl1->drop(); | 500 | TextureControl1->drop(); |
501 | if ( TextureControl2 ) | 501 | if ( TextureControl2 ) |
502 | TextureControl2->drop(); | 502 | TextureControl2->drop(); |
503 | if ( ControlVertexColors ) | 503 | if ( ControlVertexColors ) |
504 | ControlVertexColors->drop(); | 504 | ControlVertexColors->drop(); |
505 | if ( AllColorsControl ) | 505 | if ( AllColorsControl ) |
506 | AllColorsControl->drop(); | 506 | AllColorsControl->drop(); |
507 | } | 507 | } |
508 | 508 | ||
509 | void init(scene::IMeshSceneNode* node, IrrlichtDevice * device, const core::position2d<s32> & pos, const wchar_t * description) | 509 | void init(scene::IMeshSceneNode* node, IrrlichtDevice * device, const core::position2d<s32> & pos, const wchar_t * description) |
510 | { | 510 | { |
511 | if ( Initialized || !node || !device) // initializing twice or with invalid data not allowed | 511 | if ( Initialized || !node || !device) // initializing twice or with invalid data not allowed |
512 | return; | 512 | return; |
513 | 513 | ||
514 | Driver = device->getVideoDriver (); | 514 | Driver = device->getVideoDriver (); |
515 | gui::IGUIEnvironment* guiEnv = device->getGUIEnvironment(); | 515 | gui::IGUIEnvironment* guiEnv = device->getGUIEnvironment(); |
516 | scene::ISceneManager* smgr = device->getSceneManager(); | 516 | scene::ISceneManager* smgr = device->getSceneManager(); |
517 | MeshManipulator = smgr->getMeshManipulator(); | 517 | MeshManipulator = smgr->getMeshManipulator(); |
518 | 518 | ||
519 | SceneNode = node; | 519 | SceneNode = node; |
520 | scene::IMeshManipulator * meshManip = smgr->getMeshManipulator(); | 520 | scene::IMeshManipulator * meshManip = smgr->getMeshManipulator(); |
521 | 521 | ||
522 | scene::IMesh * mesh2T = meshManip->createMeshWith2TCoords(node->getMesh()); | 522 | scene::IMesh * mesh2T = meshManip->createMeshWith2TCoords(node->getMesh()); |
523 | SceneNode2T = smgr->addMeshSceneNode(mesh2T, 0, -1, SceneNode->getPosition(), SceneNode->getRotation(), SceneNode->getScale() ); | 523 | SceneNode2T = smgr->addMeshSceneNode(mesh2T, 0, -1, SceneNode->getPosition(), SceneNode->getRotation(), SceneNode->getScale() ); |
524 | mesh2T->drop(); | 524 | mesh2T->drop(); |
525 | 525 | ||
526 | scene::IMesh * meshTangents = meshManip->createMeshWithTangents(node->getMesh(), false, false, false); | 526 | scene::IMesh * meshTangents = meshManip->createMeshWithTangents(node->getMesh(), false, false, false); |
527 | SceneNodeTangents = smgr->addMeshSceneNode(meshTangents, 0, -1 | 527 | SceneNodeTangents = smgr->addMeshSceneNode(meshTangents, 0, -1 |
528 | , SceneNode->getPosition(), SceneNode->getRotation(), SceneNode->getScale() ); | 528 | , SceneNode->getPosition(), SceneNode->getRotation(), SceneNode->getScale() ); |
529 | meshTangents->drop(); | 529 | meshTangents->drop(); |
530 | 530 | ||
531 | video::SMaterial & material = SceneNode->getMaterial(0); | 531 | video::SMaterial & material = SceneNode->getMaterial(0); |
532 | material.Lighting = true; | 532 | material.Lighting = true; |
533 | AllColorsControl = new CAllColorsControl(guiEnv, pos, description, true, guiEnv->getRootGUIElement()); | 533 | AllColorsControl = new CAllColorsControl(guiEnv, pos, description, true, guiEnv->getRootGUIElement()); |
534 | AllColorsControl->setColorsToMaterialColors(material); | 534 | AllColorsControl->setColorsToMaterialColors(material); |
535 | 535 | ||
536 | core::rect<s32> rectBtn(pos + core::position2d<s32>(0, 320), core::dimension2d<s32>(60, 15)); | 536 | core::rect<s32> rectBtn(pos + core::position2d<s32>(0, 320), core::dimension2d<s32>(60, 15)); |
537 | ButtonLighting = guiEnv->addButton (rectBtn, 0, -1, L"Lighting"); | 537 | ButtonLighting = guiEnv->addButton (rectBtn, 0, -1, L"Lighting"); |
538 | ButtonLighting->setIsPushButton(true); | 538 | ButtonLighting->setIsPushButton(true); |
539 | ButtonLighting->setPressed(material.Lighting); | 539 | ButtonLighting->setPressed(material.Lighting); |
540 | core::rect<s32> rectInfo( rectBtn.LowerRightCorner.X, rectBtn.UpperLeftCorner.Y, rectBtn.LowerRightCorner.X+40, rectBtn.UpperLeftCorner.Y+15 ); | 540 | core::rect<s32> rectInfo( rectBtn.LowerRightCorner.X, rectBtn.UpperLeftCorner.Y, rectBtn.LowerRightCorner.X+40, rectBtn.UpperLeftCorner.Y+15 ); |
541 | InfoLighting = guiEnv->addStaticText(L"", rectInfo, true, false ); | 541 | InfoLighting = guiEnv->addStaticText(L"", rectInfo, true, false ); |
542 | InfoLighting->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER ); | 542 | InfoLighting->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER ); |
543 | 543 | ||
544 | core::rect<s32> rectCombo(pos.X, rectBtn.LowerRightCorner.Y, pos.X+100, rectBtn.LowerRightCorner.Y+15); | 544 | core::rect<s32> rectCombo(pos.X, rectBtn.LowerRightCorner.Y, pos.X+100, rectBtn.LowerRightCorner.Y+15); |
545 | ComboMaterial = guiEnv->addComboBox (rectCombo); | 545 | ComboMaterial = guiEnv->addComboBox (rectCombo); |
546 | for ( int i=0; i <= (int)video::EMT_ONETEXTURE_BLEND; ++i ) | 546 | for ( int i=0; i <= (int)video::EMT_ONETEXTURE_BLEND; ++i ) |
547 | { | 547 | { |
548 | ComboMaterial->addItem( core::stringw(video::sBuiltInMaterialTypeNames[i]).c_str() ); | 548 | ComboMaterial->addItem( core::stringw(video::sBuiltInMaterialTypeNames[i]).c_str() ); |
549 | } | 549 | } |
550 | ComboMaterial->setSelected( (s32)material.MaterialType ); | 550 | ComboMaterial->setSelected( (s32)material.MaterialType ); |
551 | 551 | ||
552 | core::position2d<s32> posTex(rectCombo.UpperLeftCorner.X,rectCombo.LowerRightCorner.Y); | 552 | core::position2d<s32> posTex(rectCombo.UpperLeftCorner.X,rectCombo.LowerRightCorner.Y); |
553 | TextureControl1 = new CTextureControl(guiEnv, Driver, posTex, guiEnv->getRootGUIElement()); | 553 | TextureControl1 = new CTextureControl(guiEnv, Driver, posTex, guiEnv->getRootGUIElement()); |
554 | posTex.Y += 15; | 554 | posTex.Y += 15; |
555 | TextureControl2 = new CTextureControl(guiEnv, Driver, posTex, guiEnv->getRootGUIElement()); | 555 | TextureControl2 = new CTextureControl(guiEnv, Driver, posTex, guiEnv->getRootGUIElement()); |
556 | 556 | ||
557 | core::position2d<s32> posVertexColors( posTex.X, posTex.Y + 15); | 557 | core::position2d<s32> posVertexColors( posTex.X, posTex.Y + 15); |
558 | ControlVertexColors = new CColorControl( guiEnv, posVertexColors, L"Vertex colors", guiEnv->getRootGUIElement()); | 558 | ControlVertexColors = new CColorControl( guiEnv, posVertexColors, L"Vertex colors", guiEnv->getRootGUIElement()); |
559 | 559 | ||
560 | video::S3DVertex * vertices = (video::S3DVertex *)node->getMesh()->getMeshBuffer(0)->getVertices(); | 560 | video::S3DVertex * vertices = (video::S3DVertex *)node->getMesh()->getMeshBuffer(0)->getVertices(); |
561 | if ( vertices ) | 561 | if ( vertices ) |
562 | { | 562 | { |
563 | ControlVertexColors->setColor(vertices[0].Color); | 563 | ControlVertexColors->setColor(vertices[0].Color); |
564 | } | 564 | } |
565 | 565 | ||
566 | Initialized = true; | 566 | Initialized = true; |
567 | } | 567 | } |
568 | 568 | ||
569 | void update() | 569 | void update() |
570 | { | 570 | { |
571 | if ( !Initialized ) | 571 | if ( !Initialized ) |
572 | return; | 572 | return; |
573 | 573 | ||
574 | video::SMaterial & material = SceneNode->getMaterial(0); | 574 | video::SMaterial & material = SceneNode->getMaterial(0); |
575 | video::SMaterial & material2T = SceneNode2T->getMaterial(0); | 575 | video::SMaterial & material2T = SceneNode2T->getMaterial(0); |
576 | video::SMaterial & materialTangents = SceneNodeTangents->getMaterial(0); | 576 | video::SMaterial & materialTangents = SceneNodeTangents->getMaterial(0); |
577 | 577 | ||
578 | s32 selectedMaterial = ComboMaterial->getSelected(); | 578 | s32 selectedMaterial = ComboMaterial->getSelected(); |
579 | if ( selectedMaterial >= (s32)video::EMT_SOLID && selectedMaterial <= (s32)video::EMT_ONETEXTURE_BLEND) | 579 | if ( selectedMaterial >= (s32)video::EMT_SOLID && selectedMaterial <= (s32)video::EMT_ONETEXTURE_BLEND) |
580 | { | 580 | { |
581 | video::E_VERTEX_TYPE vertexType = getVertexTypeForMaterialType((video::E_MATERIAL_TYPE)selectedMaterial); | 581 | video::E_VERTEX_TYPE vertexType = getVertexTypeForMaterialType((video::E_MATERIAL_TYPE)selectedMaterial); |
582 | switch ( vertexType ) | 582 | switch ( vertexType ) |
583 | { | 583 | { |
584 | case video::EVT_STANDARD: | 584 | case video::EVT_STANDARD: |
585 | material.MaterialType = (video::E_MATERIAL_TYPE)selectedMaterial; | 585 | material.MaterialType = (video::E_MATERIAL_TYPE)selectedMaterial; |
586 | SceneNode->setVisible(true); | 586 | SceneNode->setVisible(true); |
587 | SceneNode2T->setVisible(false); | 587 | SceneNode2T->setVisible(false); |
588 | SceneNodeTangents->setVisible(false); | 588 | SceneNodeTangents->setVisible(false); |
589 | break; | 589 | break; |
590 | case video::EVT_2TCOORDS: | 590 | case video::EVT_2TCOORDS: |
591 | material2T.MaterialType = (video::E_MATERIAL_TYPE)selectedMaterial; | 591 | material2T.MaterialType = (video::E_MATERIAL_TYPE)selectedMaterial; |
592 | SceneNode->setVisible(false); | 592 | SceneNode->setVisible(false); |
593 | SceneNode2T->setVisible(true); | 593 | SceneNode2T->setVisible(true); |
594 | SceneNodeTangents->setVisible(false); | 594 | SceneNodeTangents->setVisible(false); |
595 | break; | 595 | break; |
596 | case video::EVT_TANGENTS: | 596 | case video::EVT_TANGENTS: |
597 | materialTangents.MaterialType = (video::E_MATERIAL_TYPE)selectedMaterial; | 597 | materialTangents.MaterialType = (video::E_MATERIAL_TYPE)selectedMaterial; |
598 | SceneNode->setVisible(false); | 598 | SceneNode->setVisible(false); |
599 | SceneNode2T->setVisible(false); | 599 | SceneNode2T->setVisible(false); |
600 | SceneNodeTangents->setVisible(true); | 600 | SceneNodeTangents->setVisible(true); |
601 | break; | 601 | break; |
602 | } | 602 | } |
603 | } | 603 | } |
604 | 604 | ||
605 | updateMaterial(material); | 605 | updateMaterial(material); |
606 | updateMaterial(material2T); | 606 | updateMaterial(material2T); |
607 | updateMaterial(materialTangents); | 607 | updateMaterial(materialTangents); |
608 | 608 | ||
609 | if ( ButtonLighting->isPressed() ) | 609 | if ( ButtonLighting->isPressed() ) |
610 | InfoLighting->setText(L"on"); | 610 | InfoLighting->setText(L"on"); |
611 | else | 611 | else |
612 | InfoLighting->setText(L"off"); | 612 | InfoLighting->setText(L"off"); |
613 | 613 | ||
614 | AllColorsControl->resetDirty(); | 614 | AllColorsControl->resetDirty(); |
615 | TextureControl1->resetDirty(); | 615 | TextureControl1->resetDirty(); |
616 | TextureControl2->resetDirty(); | 616 | TextureControl2->resetDirty(); |
617 | ControlVertexColors->resetDirty(); | 617 | ControlVertexColors->resetDirty(); |
618 | } | 618 | } |
619 | 619 | ||
620 | void updateTextures() | 620 | void updateTextures() |
621 | { | 621 | { |
622 | TextureControl1->updateTextures(Driver); | 622 | TextureControl1->updateTextures(Driver); |
623 | TextureControl2->updateTextures(Driver); | 623 | TextureControl2->updateTextures(Driver); |
624 | } | 624 | } |
625 | 625 | ||
626 | protected: | 626 | protected: |
627 | 627 | ||
628 | void updateMaterial(video::SMaterial & material) | 628 | void updateMaterial(video::SMaterial & material) |
629 | { | 629 | { |
630 | AllColorsControl->updateMaterialColors(material); | 630 | AllColorsControl->updateMaterialColors(material); |
631 | material.Lighting = ButtonLighting->isPressed(); | 631 | material.Lighting = ButtonLighting->isPressed(); |
632 | if ( TextureControl1->isDirty() ) | 632 | if ( TextureControl1->isDirty() ) |
633 | { | 633 | { |
634 | material.TextureLayer[0].Texture = Driver->getTexture( io::path(TextureControl1->getSelectedTextureName()) ); | 634 | material.TextureLayer[0].Texture = Driver->getTexture( io::path(TextureControl1->getSelectedTextureName()) ); |
635 | } | 635 | } |
636 | if ( TextureControl2->isDirty() ) | 636 | if ( TextureControl2->isDirty() ) |
637 | { | 637 | { |
638 | material.TextureLayer[1].Texture = Driver->getTexture( io::path(TextureControl2->getSelectedTextureName()) ); | 638 | material.TextureLayer[1].Texture = Driver->getTexture( io::path(TextureControl2->getSelectedTextureName()) ); |
639 | } | 639 | } |
640 | if ( ControlVertexColors->isDirty() ) | 640 | if ( ControlVertexColors->isDirty() ) |
641 | { | 641 | { |
642 | MeshManipulator->setVertexColors (SceneNode->getMesh(), ControlVertexColors->getColor()); | 642 | MeshManipulator->setVertexColors (SceneNode->getMesh(), ControlVertexColors->getColor()); |
643 | MeshManipulator->setVertexColors (SceneNode2T->getMesh(), ControlVertexColors->getColor()); | 643 | MeshManipulator->setVertexColors (SceneNode2T->getMesh(), ControlVertexColors->getColor()); |
644 | MeshManipulator->setVertexColors (SceneNodeTangents->getMesh(), ControlVertexColors->getColor()); | 644 | MeshManipulator->setVertexColors (SceneNodeTangents->getMesh(), ControlVertexColors->getColor()); |
645 | } | 645 | } |
646 | } | 646 | } |
647 | 647 | ||
648 | bool Initialized; | 648 | bool Initialized; |
649 | video::IVideoDriver * Driver; | 649 | video::IVideoDriver * Driver; |
650 | scene::IMeshManipulator* MeshManipulator; | 650 | scene::IMeshManipulator* MeshManipulator; |
651 | scene::IMeshSceneNode* SceneNode; | 651 | scene::IMeshSceneNode* SceneNode; |
652 | scene::IMeshSceneNode* SceneNode2T; | 652 | scene::IMeshSceneNode* SceneNode2T; |
653 | scene::IMeshSceneNode* SceneNodeTangents; | 653 | scene::IMeshSceneNode* SceneNodeTangents; |
654 | CAllColorsControl* AllColorsControl; | 654 | CAllColorsControl* AllColorsControl; |
655 | gui::IGUIButton * ButtonLighting; | 655 | gui::IGUIButton * ButtonLighting; |
656 | gui::IGUIStaticText* InfoLighting; | 656 | gui::IGUIStaticText* InfoLighting; |
657 | gui::IGUIComboBox * ComboMaterial; | 657 | gui::IGUIComboBox * ComboMaterial; |
658 | CTextureControl* TextureControl1; | 658 | CTextureControl* TextureControl1; |
659 | CTextureControl* TextureControl2; | 659 | CTextureControl* TextureControl2; |
660 | CColorControl* ControlVertexColors; | 660 | CColorControl* ControlVertexColors; |
661 | }; | 661 | }; |
662 | 662 | ||
663 | /* | 663 | /* |
664 | Control to allow setting the color values of a lightscenenode. | 664 | Control to allow setting the color values of a lightscenenode. |
665 | */ | 665 | */ |
666 | struct SLightNodeControl | 666 | struct SLightNodeControl |
667 | { | 667 | { |
668 | // constructor | 668 | // constructor |
669 | SLightNodeControl() : Initialized(false), SceneNode(0), AllColorsControl(0) | 669 | SLightNodeControl() : Initialized(false), SceneNode(0), AllColorsControl(0) |
670 | { | 670 | { |
671 | } | 671 | } |
672 | 672 | ||
673 | virtual ~SLightNodeControl() | 673 | virtual ~SLightNodeControl() |
674 | { | 674 | { |
675 | if ( AllColorsControl ) | 675 | if ( AllColorsControl ) |
676 | AllColorsControl->drop(); | 676 | AllColorsControl->drop(); |
677 | } | 677 | } |
678 | 678 | ||
679 | void init(scene::ILightSceneNode* node, gui::IGUIEnvironment* guiEnv, const core::position2d<s32> & pos, const wchar_t * description) | 679 | void init(scene::ILightSceneNode* node, gui::IGUIEnvironment* guiEnv, const core::position2d<s32> & pos, const wchar_t * description) |
680 | { | 680 | { |
681 | if ( Initialized || !node || !guiEnv) // initializing twice or with invalid data not allowed | 681 | if ( Initialized || !node || !guiEnv) // initializing twice or with invalid data not allowed |
682 | return; | 682 | return; |
683 | SceneNode = node; | 683 | SceneNode = node; |
684 | AllColorsControl = new CAllColorsControl(guiEnv, pos, description, false, guiEnv->getRootGUIElement()); | 684 | AllColorsControl = new CAllColorsControl(guiEnv, pos, description, false, guiEnv->getRootGUIElement()); |
685 | const video::SLight & lightData = SceneNode->getLightData(); | 685 | const video::SLight & lightData = SceneNode->getLightData(); |
686 | AllColorsControl->setColorsToLightDataColors(lightData); | 686 | AllColorsControl->setColorsToLightDataColors(lightData); |
687 | Initialized = true; | 687 | Initialized = true; |
688 | } | 688 | } |
689 | 689 | ||
690 | void update() | 690 | void update() |
691 | { | 691 | { |
692 | if ( !Initialized ) | 692 | if ( !Initialized ) |
693 | return; | 693 | return; |
694 | 694 | ||
695 | video::SLight & lightData = SceneNode->getLightData(); | 695 | video::SLight & lightData = SceneNode->getLightData(); |
696 | AllColorsControl->updateLightColors(lightData); | 696 | AllColorsControl->updateLightColors(lightData); |
697 | } | 697 | } |
698 | 698 | ||
699 | protected: | 699 | protected: |
700 | bool Initialized; | 700 | bool Initialized; |
701 | scene::ILightSceneNode* SceneNode; | 701 | scene::ILightSceneNode* SceneNode; |
702 | CAllColorsControl* AllColorsControl; | 702 | CAllColorsControl* AllColorsControl; |
703 | }; | 703 | }; |
704 | 704 | ||
705 | /* | 705 | /* |
706 | Application configuration | 706 | Application configuration |
707 | */ | 707 | */ |
708 | struct SConfig | 708 | struct SConfig |
709 | { | 709 | { |
710 | SConfig() | 710 | SConfig() |
711 | : RenderInBackground(true) | 711 | : RenderInBackground(true) |
712 | , DriverType(video::EDT_BURNINGSVIDEO) | 712 | , DriverType(video::EDT_BURNINGSVIDEO) |
713 | , ScreenSize(640, 480) | 713 | , ScreenSize(640, 480) |
714 | { | 714 | { |
715 | } | 715 | } |
716 | 716 | ||
717 | bool RenderInBackground; | 717 | bool RenderInBackground; |
718 | video::E_DRIVER_TYPE DriverType; | 718 | video::E_DRIVER_TYPE DriverType; |
719 | core::dimension2d<u32> ScreenSize; | 719 | core::dimension2d<u32> ScreenSize; |
720 | }; | 720 | }; |
721 | 721 | ||
722 | /* | 722 | /* |
723 | Main application class | 723 | Main application class |
724 | */ | 724 | */ |
725 | class CApp : public IEventReceiver | 725 | class CApp : public IEventReceiver |
726 | { | 726 | { |
727 | friend int main(int argc, char *argv[]); | 727 | friend int main(int argc, char *argv[]); |
728 | 728 | ||
729 | public: | 729 | public: |
730 | // constructor | 730 | // constructor |
731 | CApp() | 731 | CApp() |
732 | : IsRunning(false) | 732 | : IsRunning(false) |
733 | , Device(0) | 733 | , Device(0) |
734 | , Camera(0) | 734 | , Camera(0) |
735 | , GlobalAmbient(0) | 735 | , GlobalAmbient(0) |
736 | { | 736 | { |
737 | } | 737 | } |
738 | 738 | ||
739 | // destructor | 739 | // destructor |
740 | ~CApp() | 740 | ~CApp() |
741 | { | 741 | { |
742 | } | 742 | } |
743 | 743 | ||
744 | // stop running - will quit at end of mainloop | 744 | // stop running - will quit at end of mainloop |
745 | void stopApp() | 745 | void stopApp() |
746 | { | 746 | { |
747 | IsRunning = false; | 747 | IsRunning = false; |
748 | } | 748 | } |
749 | 749 | ||
750 | // Event handler | 750 | // Event handler |
751 | virtual bool OnEvent(const SEvent &event) | 751 | virtual bool OnEvent(const SEvent &event) |
752 | { | 752 | { |
753 | if (event.EventType == EET_GUI_EVENT) | 753 | if (event.EventType == EET_GUI_EVENT) |
754 | { | 754 | { |
755 | gui::IGUIEnvironment* env = Device->getGUIEnvironment(); | 755 | gui::IGUIEnvironment* env = Device->getGUIEnvironment(); |
756 | 756 | ||
757 | switch(event.GUIEvent.EventType) | 757 | switch(event.GUIEvent.EventType) |
758 | { | 758 | { |
759 | case gui::EGET_MENU_ITEM_SELECTED: | 759 | case gui::EGET_MENU_ITEM_SELECTED: |
760 | { | 760 | { |
761 | gui::IGUIContextMenu* menu = (gui::IGUIContextMenu*)event.GUIEvent.Caller; | 761 | gui::IGUIContextMenu* menu = (gui::IGUIContextMenu*)event.GUIEvent.Caller; |
762 | s32 id = menu->getItemCommandId(menu->getSelectedItem()); | 762 | s32 id = menu->getItemCommandId(menu->getSelectedItem()); |
763 | 763 | ||
764 | switch(id) | 764 | switch(id) |
765 | { | 765 | { |
766 | case GUI_ID_OPEN_TEXTURE: // File -> Open Texture | 766 | case GUI_ID_OPEN_TEXTURE: // File -> Open Texture |
767 | env->addFileOpenDialog(L"Please select a texture file to open"); | 767 | env->addFileOpenDialog(L"Please select a texture file to open"); |
768 | break; | 768 | break; |
769 | case GUI_ID_QUIT: // File -> Quit | 769 | case GUI_ID_QUIT: // File -> Quit |
770 | stopApp(); | 770 | stopApp(); |
771 | break; | 771 | break; |
772 | } | 772 | } |
773 | } | 773 | } |
774 | break; | 774 | break; |
775 | 775 | ||
776 | case gui::EGET_FILE_SELECTED: | 776 | case gui::EGET_FILE_SELECTED: |
777 | { | 777 | { |
778 | // load the model file, selected in the file open dialog | 778 | // load the model file, selected in the file open dialog |
779 | gui::IGUIFileOpenDialog* dialog = | 779 | gui::IGUIFileOpenDialog* dialog = |
780 | (gui::IGUIFileOpenDialog*)event.GUIEvent.Caller; | 780 | (gui::IGUIFileOpenDialog*)event.GUIEvent.Caller; |
781 | loadTexture(io::path(dialog->getFileName()).c_str()); | 781 | loadTexture(io::path(dialog->getFileName()).c_str()); |
782 | } | 782 | } |
783 | break; | 783 | break; |
784 | 784 | ||
785 | default: | 785 | default: |
786 | break; | 786 | break; |
787 | } | 787 | } |
788 | } | 788 | } |
789 | 789 | ||
790 | return false; | 790 | return false; |
791 | } | 791 | } |
792 | 792 | ||
793 | protected: | 793 | protected: |
794 | 794 | ||
795 | // Application initialization | 795 | // Application initialization |
796 | // returns true when it was successful initialized, otherwise false. | 796 | // returns true when it was successful initialized, otherwise false. |
797 | bool init(int argc, char *argv[]) | 797 | bool init(int argc, char *argv[]) |
798 | { | 798 | { |
799 | // ask user for driver | 799 | // ask user for driver |
800 | Config.DriverType=driverChoiceConsole(); | 800 | Config.DriverType=driverChoiceConsole(); |
801 | if (Config.DriverType==video::EDT_COUNT) | 801 | if (Config.DriverType==video::EDT_COUNT) |
802 | return false; | 802 | return false; |
803 | 803 | ||
804 | // create the device with the settings from our config | 804 | // create the device with the settings from our config |
805 | Device = createDevice(Config.DriverType, Config.ScreenSize); | 805 | Device = createDevice(Config.DriverType, Config.ScreenSize); |
806 | if (!Device) | 806 | if (!Device) |
807 | return false; | 807 | return false; |
808 | Device->setWindowCaption( DriverTypeNames[Config.DriverType] ); | 808 | Device->setWindowCaption( DriverTypeNames[Config.DriverType] ); |
809 | Device->setEventReceiver(this); | 809 | Device->setEventReceiver(this); |
810 | 810 | ||
811 | scene::ISceneManager* smgr = Device->getSceneManager(); | 811 | scene::ISceneManager* smgr = Device->getSceneManager(); |
812 | video::IVideoDriver * driver = Device->getVideoDriver (); | 812 | video::IVideoDriver * driver = Device->getVideoDriver (); |
813 | gui::IGUIEnvironment* guiEnv = Device->getGUIEnvironment(); | 813 | gui::IGUIEnvironment* guiEnv = Device->getGUIEnvironment(); |
814 | 814 | ||
815 | // set a nicer font | 815 | // set a nicer font |
816 | gui::IGUISkin* skin = guiEnv->getSkin(); | 816 | gui::IGUISkin* skin = guiEnv->getSkin(); |
817 | gui::IGUIFont* font = guiEnv->getFont("../../media/fonthaettenschweiler.bmp"); | 817 | gui::IGUIFont* font = guiEnv->getFont("../../media/fonthaettenschweiler.bmp"); |
818 | if (font) | 818 | if (font) |
819 | skin->setFont(font); | 819 | skin->setFont(font); |
820 | 820 | ||
821 | // remove some alpha value because it makes those menus harder to read otherwise | 821 | // remove some alpha value because it makes those menus harder to read otherwise |
822 | video::SColor col3dHighLight( skin->getColor(gui::EGDC_APP_WORKSPACE) ); | 822 | video::SColor col3dHighLight( skin->getColor(gui::EGDC_APP_WORKSPACE) ); |
823 | col3dHighLight.setAlpha(255); | 823 | col3dHighLight.setAlpha(255); |
824 | video::SColor colHighLight( col3dHighLight ); | 824 | video::SColor colHighLight( col3dHighLight ); |
825 | skin->setColor(gui::EGDC_HIGH_LIGHT, colHighLight ); | 825 | skin->setColor(gui::EGDC_HIGH_LIGHT, colHighLight ); |
826 | skin->setColor(gui::EGDC_3D_HIGH_LIGHT, col3dHighLight ); | 826 | skin->setColor(gui::EGDC_3D_HIGH_LIGHT, col3dHighLight ); |
827 | 827 | ||
828 | // Add some textures which are useful to test material settings | 828 | // Add some textures which are useful to test material settings |
829 | createDefaultTextures(driver); | 829 | createDefaultTextures(driver); |
830 | 830 | ||
831 | // create a menu | 831 | // create a menu |
832 | gui::IGUIContextMenu * menuBar = guiEnv->addMenu(); | 832 | gui::IGUIContextMenu * menuBar = guiEnv->addMenu(); |
833 | menuBar->addItem(L"File", -1, true, true); | 833 | menuBar->addItem(L"File", -1, true, true); |
834 | 834 | ||
835 | gui::IGUIContextMenu* subMenuFile = menuBar->getSubMenu(0); | 835 | gui::IGUIContextMenu* subMenuFile = menuBar->getSubMenu(0); |
836 | subMenuFile->addItem(L"Open texture ...", GUI_ID_OPEN_TEXTURE); | 836 | subMenuFile->addItem(L"Open texture ...", GUI_ID_OPEN_TEXTURE); |
837 | subMenuFile->addSeparator(); | 837 | subMenuFile->addSeparator(); |
838 | subMenuFile->addItem(L"Quit", GUI_ID_QUIT); | 838 | subMenuFile->addItem(L"Quit", GUI_ID_QUIT); |
839 | 839 | ||
840 | // a static camera | 840 | // a static camera |
841 | Camera = smgr->addCameraSceneNode (0, core::vector3df(0, 0, 0), | 841 | Camera = smgr->addCameraSceneNode (0, core::vector3df(0, 0, 0), |
842 | core::vector3df(0, 0, 100), | 842 | core::vector3df(0, 0, 100), |
843 | -1); | 843 | -1); |
844 | 844 | ||
845 | // add the nodes which are used to show the materials | 845 | // add the nodes which are used to show the materials |
846 | scene::IMeshSceneNode* nodeL = smgr->addCubeSceneNode (30.0f, 0, -1, | 846 | scene::IMeshSceneNode* nodeL = smgr->addCubeSceneNode (30.0f, 0, -1, |
847 | core::vector3df(-35, 0, 100), | 847 | core::vector3df(-35, 0, 100), |
848 | core::vector3df(0, 0, 0), | 848 | core::vector3df(0, 0, 0), |
849 | core::vector3df(1.0f, 1.0f, 1.0f)); | 849 | core::vector3df(1.0f, 1.0f, 1.0f)); |
850 | NodeLeft.init( nodeL, Device, core::position2d<s32>(10,20), L"left node" ); | 850 | NodeLeft.init( nodeL, Device, core::position2d<s32>(10,20), L"left node" ); |
851 | 851 | ||
852 | scene::IMeshSceneNode* nodeR = smgr->addCubeSceneNode (30.0f, 0, -1, | 852 | scene::IMeshSceneNode* nodeR = smgr->addCubeSceneNode (30.0f, 0, -1, |
853 | core::vector3df(35, 0, 100), | 853 | core::vector3df(35, 0, 100), |
854 | core::vector3df(0, 0, 0), | 854 | core::vector3df(0, 0, 0), |
855 | core::vector3df(1.0f, 1.0f, 1.0f)); | 855 | core::vector3df(1.0f, 1.0f, 1.0f)); |
856 | NodeRight.init( nodeR, Device, core::position2d<s32>(530,20), L"right node" ); | 856 | NodeRight.init( nodeR, Device, core::position2d<s32>(530,20), L"right node" ); |
857 | 857 | ||
858 | // add one light | 858 | // add one light |
859 | scene::ILightSceneNode* nodeLight = smgr->addLightSceneNode(0, core::vector3df(0, 0, 0), | 859 | scene::ILightSceneNode* nodeLight = smgr->addLightSceneNode(0, core::vector3df(0, 0, 0), |
860 | video::SColorf(1.0f, 1.0f, 1.0f), | 860 | video::SColorf(1.0f, 1.0f, 1.0f), |
861 | 100.0f); | 861 | 100.0f); |
862 | LightControl.init(nodeLight, guiEnv, core::position2d<s32>(270,20), L"light" ); | 862 | LightControl.init(nodeLight, guiEnv, core::position2d<s32>(270,20), L"light" ); |
863 | 863 | ||
864 | // one large cube around everything. That's mainly to make the light more obvious. | 864 | // one large cube around everything. That's mainly to make the light more obvious. |
865 | scene::IMeshSceneNode* backgroundCube = smgr->addCubeSceneNode (200.0f, 0, -1, core::vector3df(0, 0, 0), | 865 | scene::IMeshSceneNode* backgroundCube = smgr->addCubeSceneNode (200.0f, 0, -1, core::vector3df(0, 0, 0), |
866 | core::vector3df(45, 0, 0), | 866 | core::vector3df(45, 0, 0), |
867 | core::vector3df(1.0f, 1.0f, 1.0f)); | 867 | core::vector3df(1.0f, 1.0f, 1.0f)); |
868 | backgroundCube->getMaterial(0).BackfaceCulling = false; // we are within the cube, so we have to disable backface culling to see it | 868 | backgroundCube->getMaterial(0).BackfaceCulling = false; // we are within the cube, so we have to disable backface culling to see it |
869 | backgroundCube->getMaterial(0).EmissiveColor.set(255,50,50,50); // we keep some self lighting to keep texts visible | 869 | backgroundCube->getMaterial(0).EmissiveColor.set(255,50,50,50); // we keep some self lighting to keep texts visible |
870 | 870 | ||
871 | // set the ambient light value | 871 | // set the ambient light value |
872 | GlobalAmbient = new CColorControl( guiEnv, core::position2d<s32>(270, 300), L"global ambient", guiEnv->getRootGUIElement()); | 872 | GlobalAmbient = new CColorControl( guiEnv, core::position2d<s32>(270, 300), L"global ambient", guiEnv->getRootGUIElement()); |
873 | GlobalAmbient->setColor( smgr->getAmbientLight().toSColor() ); | 873 | GlobalAmbient->setColor( smgr->getAmbientLight().toSColor() ); |
874 | 874 | ||
875 | return true; | 875 | return true; |
876 | } | 876 | } |
877 | 877 | ||
878 | // Update one frame | 878 | // Update one frame |
879 | bool update() | 879 | bool update() |
880 | { | 880 | { |
881 | using namespace irr; | 881 | using namespace irr; |
882 | 882 | ||
883 | video::IVideoDriver* videoDriver = Device->getVideoDriver(); | 883 | video::IVideoDriver* videoDriver = Device->getVideoDriver(); |
884 | if ( !Device->run() ) | 884 | if ( !Device->run() ) |
885 | return false; | 885 | return false; |
886 | 886 | ||
887 | if ( Device->isWindowActive() || Config.RenderInBackground ) | 887 | if ( Device->isWindowActive() || Config.RenderInBackground ) |
888 | { | 888 | { |
889 | gui::IGUIEnvironment* guiEnv = Device->getGUIEnvironment(); | 889 | gui::IGUIEnvironment* guiEnv = Device->getGUIEnvironment(); |
890 | scene::ISceneManager* smgr = Device->getSceneManager(); | 890 | scene::ISceneManager* smgr = Device->getSceneManager(); |
891 | gui::IGUISkin * skin = guiEnv->getSkin(); | 891 | gui::IGUISkin * skin = guiEnv->getSkin(); |
892 | 892 | ||
893 | // update our controls | 893 | // update our controls |
894 | NodeLeft.update(); | 894 | NodeLeft.update(); |
895 | NodeRight.update(); | 895 | NodeRight.update(); |
896 | LightControl.update(); | 896 | LightControl.update(); |
897 | 897 | ||
898 | // update ambient light settings | 898 | // update ambient light settings |
899 | if ( GlobalAmbient->isDirty() ) | 899 | if ( GlobalAmbient->isDirty() ) |
900 | { | 900 | { |
901 | smgr->setAmbientLight( GlobalAmbient->getColor() ); | 901 | smgr->setAmbientLight( GlobalAmbient->getColor() ); |
902 | GlobalAmbient->resetDirty(); | 902 | GlobalAmbient->resetDirty(); |
903 | } | 903 | } |
904 | 904 | ||
905 | // draw everything | 905 | // draw everything |
906 | video::SColor bkColor( skin->getColor(gui::EGDC_APP_WORKSPACE) ); | 906 | video::SColor bkColor( skin->getColor(gui::EGDC_APP_WORKSPACE) ); |
907 | videoDriver->beginScene(true, true, bkColor); | 907 | videoDriver->beginScene(true, true, bkColor); |
908 | 908 | ||
909 | smgr->drawAll(); | 909 | smgr->drawAll(); |
910 | guiEnv->drawAll(); | 910 | guiEnv->drawAll(); |
911 | 911 | ||
912 | videoDriver->endScene(); | 912 | videoDriver->endScene(); |
913 | } | 913 | } |
914 | 914 | ||
915 | return true; | 915 | return true; |
916 | } | 916 | } |
917 | 917 | ||
918 | // Run the application. Our main loop. | 918 | // Run the application. Our main loop. |
919 | void run() | 919 | void run() |
920 | { | 920 | { |
921 | IsRunning = true; | 921 | IsRunning = true; |
922 | 922 | ||
923 | if ( !Device ) | 923 | if ( !Device ) |
924 | return; | 924 | return; |
925 | 925 | ||
926 | // main application loop | 926 | // main application loop |
927 | while(IsRunning) | 927 | while(IsRunning) |
928 | { | 928 | { |
929 | if ( !update() ) | 929 | if ( !update() ) |
930 | break; | 930 | break; |
931 | 931 | ||
932 | Device->sleep( 5 ); | 932 | Device->sleep( 5 ); |
933 | } | 933 | } |
934 | } | 934 | } |
935 | 935 | ||
936 | // Close down the application | 936 | // Close down the application |
937 | void quit() | 937 | void quit() |
938 | { | 938 | { |
939 | IsRunning = false; | 939 | IsRunning = false; |
940 | GlobalAmbient->drop(); | 940 | GlobalAmbient->drop(); |
941 | GlobalAmbient = NULL; | 941 | GlobalAmbient = NULL; |
942 | if ( Device ) | 942 | if ( Device ) |
943 | { | 943 | { |
944 | Device->closeDevice(); | 944 | Device->closeDevice(); |
945 | Device->drop(); | 945 | Device->drop(); |
946 | Device = NULL; | 946 | Device = NULL; |
947 | } | 947 | } |
948 | } | 948 | } |
949 | 949 | ||
950 | // Create some useful textures. | 950 | // Create some useful textures. |
951 | // Note that the function put readability over speed, you shouldn't use setPixel at runtime but for initialization it's nice. | 951 | // Note that the function put readability over speed, you shouldn't use setPixel at runtime but for initialization it's nice. |
952 | void createDefaultTextures(video::IVideoDriver * driver) | 952 | void createDefaultTextures(video::IVideoDriver * driver) |
953 | { | 953 | { |
954 | const u32 width = 256; | 954 | const u32 width = 256; |
955 | const u32 height = 256; | 955 | const u32 height = 256; |
956 | video::IImage * imageA8R8G8B8 = driver->createImage (video::ECF_A8R8G8B8, core::dimension2d<u32>(width, height)); | 956 | video::IImage * imageA8R8G8B8 = driver->createImage (video::ECF_A8R8G8B8, core::dimension2d<u32>(width, height)); |
957 | if ( !imageA8R8G8B8 ) | 957 | if ( !imageA8R8G8B8 ) |
958 | return; | 958 | return; |
959 | const u32 pitch = imageA8R8G8B8->getPitch(); | 959 | const u32 pitch = imageA8R8G8B8->getPitch(); |
960 | 960 | ||
961 | // some nice square-pattern with 9 typical colors | 961 | // some nice square-pattern with 9 typical colors |
962 | for ( u32 y = 0; y < height; ++ y ) | 962 | for ( u32 y = 0; y < height; ++ y ) |
963 | { | 963 | { |
964 | for ( u32 x = 0; x < pitch; ++x ) | 964 | for ( u32 x = 0; x < pitch; ++x ) |
965 | { | 965 | { |
966 | if ( y < height/3 ) | 966 | if ( y < height/3 ) |
967 | { | 967 | { |
968 | if ( x < width/3 ) | 968 | if ( x < width/3 ) |
969 | imageA8R8G8B8->setPixel (x, y, SCOL_BLACK); | 969 | imageA8R8G8B8->setPixel (x, y, SCOL_BLACK); |
970 | else if ( x < 2*width/3 ) | 970 | else if ( x < 2*width/3 ) |
971 | imageA8R8G8B8->setPixel (x, y, SCOL_BLUE); | 971 | imageA8R8G8B8->setPixel (x, y, SCOL_BLUE); |
972 | else | 972 | else |
973 | imageA8R8G8B8->setPixel (x, y, SCOL_CYAN); | 973 | imageA8R8G8B8->setPixel (x, y, SCOL_CYAN); |
974 | } | 974 | } |
975 | else if ( y < 2*height/3 ) | 975 | else if ( y < 2*height/3 ) |
976 | { | 976 | { |
977 | if ( x < width/3 ) | 977 | if ( x < width/3 ) |
978 | imageA8R8G8B8->setPixel (x, y, SCOL_GRAY); | 978 | imageA8R8G8B8->setPixel (x, y, SCOL_GRAY); |
979 | else if ( x < 2*width/3 ) | 979 | else if ( x < 2*width/3 ) |
980 | imageA8R8G8B8->setPixel (x, y, SCOL_GREEN); | 980 | imageA8R8G8B8->setPixel (x, y, SCOL_GREEN); |
981 | else | 981 | else |
982 | imageA8R8G8B8->setPixel (x, y, SCOL_MAGENTA); | 982 | imageA8R8G8B8->setPixel (x, y, SCOL_MAGENTA); |
983 | } | 983 | } |
984 | else | 984 | else |
985 | { | 985 | { |
986 | if ( x < width/3 ) | 986 | if ( x < width/3 ) |
987 | imageA8R8G8B8->setPixel (x, y, SCOL_RED); | 987 | imageA8R8G8B8->setPixel (x, y, SCOL_RED); |
988 | else if ( x < 2*width/3 ) | 988 | else if ( x < 2*width/3 ) |
989 | imageA8R8G8B8->setPixel (x, y, SCOL_YELLOW); | 989 | imageA8R8G8B8->setPixel (x, y, SCOL_YELLOW); |
990 | else | 990 | else |
991 | imageA8R8G8B8->setPixel (x, y, SCOL_WHITE); | 991 | imageA8R8G8B8->setPixel (x, y, SCOL_WHITE); |
992 | } | 992 | } |
993 | } | 993 | } |
994 | } | 994 | } |
995 | driver->addTexture (io::path("CARO_A8R8G8B8"), imageA8R8G8B8); | 995 | driver->addTexture (io::path("CARO_A8R8G8B8"), imageA8R8G8B8); |
996 | 996 | ||
997 | // all white | 997 | // all white |
998 | imageA8R8G8B8->fill(SCOL_WHITE); | 998 | imageA8R8G8B8->fill(SCOL_WHITE); |
999 | driver->addTexture (io::path("WHITE_A8R8G8B8"), imageA8R8G8B8); | 999 | driver->addTexture (io::path("WHITE_A8R8G8B8"), imageA8R8G8B8); |
1000 | 1000 | ||
1001 | // all black | 1001 | // all black |
1002 | imageA8R8G8B8->fill(SCOL_BLACK); | 1002 | imageA8R8G8B8->fill(SCOL_BLACK); |
1003 | driver->addTexture (io::path("BLACK_A8R8G8B8"), imageA8R8G8B8); | 1003 | driver->addTexture (io::path("BLACK_A8R8G8B8"), imageA8R8G8B8); |
1004 | 1004 | ||
1005 | // gray-scale | 1005 | // gray-scale |
1006 | for ( u32 y = 0; y < height; ++ y ) | 1006 | for ( u32 y = 0; y < height; ++ y ) |
1007 | { | 1007 | { |
1008 | for ( u32 x = 0; x < pitch; ++x ) | 1008 | for ( u32 x = 0; x < pitch; ++x ) |
1009 | { | 1009 | { |
1010 | imageA8R8G8B8->setPixel (x, y, video::SColor(y, x,x,x) ); | 1010 | imageA8R8G8B8->setPixel (x, y, video::SColor(y, x,x,x) ); |
1011 | } | 1011 | } |
1012 | } | 1012 | } |
1013 | driver->addTexture (io::path("GRAYSCALE_A8R8G8B8"), imageA8R8G8B8); | 1013 | driver->addTexture (io::path("GRAYSCALE_A8R8G8B8"), imageA8R8G8B8); |
1014 | 1014 | ||
1015 | imageA8R8G8B8->drop(); | 1015 | imageA8R8G8B8->drop(); |
1016 | } | 1016 | } |
1017 | 1017 | ||
1018 | // Load a texture and make sure nodes know it when more textures are available. | 1018 | // Load a texture and make sure nodes know it when more textures are available. |
1019 | void loadTexture(const io::path &name) | 1019 | void loadTexture(const io::path &name) |
1020 | { | 1020 | { |
1021 | Device->getVideoDriver()->getTexture(name); | 1021 | Device->getVideoDriver()->getTexture(name); |
1022 | NodeLeft.updateTextures(); | 1022 | NodeLeft.updateTextures(); |
1023 | NodeRight.updateTextures(); | 1023 | NodeRight.updateTextures(); |
1024 | } | 1024 | } |
1025 | 1025 | ||
1026 | private: | 1026 | private: |
1027 | SConfig Config; | 1027 | SConfig Config; |
1028 | volatile bool IsRunning; | 1028 | volatile bool IsRunning; |
1029 | IrrlichtDevice * Device; | 1029 | IrrlichtDevice * Device; |
1030 | scene::ICameraSceneNode * Camera; | 1030 | scene::ICameraSceneNode * Camera; |
1031 | SMeshNodeControl NodeLeft; | 1031 | SMeshNodeControl NodeLeft; |
1032 | SMeshNodeControl NodeRight; | 1032 | SMeshNodeControl NodeRight; |
1033 | SLightNodeControl LightControl; | 1033 | SLightNodeControl LightControl; |
1034 | CColorControl * GlobalAmbient; | 1034 | CColorControl * GlobalAmbient; |
1035 | }; | 1035 | }; |
1036 | 1036 | ||
1037 | /* | 1037 | /* |
1038 | A very short main as we do everything else in classes. | 1038 | A very short main as we do everything else in classes. |
1039 | */ | 1039 | */ |
1040 | int main(int argc, char *argv[]) | 1040 | int main(int argc, char *argv[]) |
1041 | { | 1041 | { |
1042 | CApp APP; | 1042 | CApp APP; |
1043 | 1043 | ||
1044 | if ( !APP.init(argc, argv) ) | 1044 | if ( !APP.init(argc, argv) ) |
1045 | { | 1045 | { |
1046 | printf("init failed\n"); | 1046 | printf("init failed\n"); |
1047 | return 1; | 1047 | return 1; |
1048 | } | 1048 | } |
1049 | 1049 | ||
1050 | APP.run(); | 1050 | APP.run(); |
1051 | APP.quit(); | 1051 | APP.quit(); |
1052 | 1052 | ||
1053 | return 0; | 1053 | return 0; |
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | /* | 1056 | /* |
1057 | **/ | 1057 | **/ |