1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
|
diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
index dece16d..19f5ccd 100644
--- a/CMake/InstallResources.cmake
+++ b/CMake/InstallResources.cmake
@@ -118,9 +118,6 @@ configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/inst/bi
# create plugins.cfg
configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg)
configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg)
-# create quakemap.cfg
-configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg)
-configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg)
# create samples.cfg
configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg)
configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg)
@@ -135,7 +132,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg
${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg
${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg
- ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg
DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug
)
install(FILES
@@ -143,7 +139,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None ""
)
install(FILES
@@ -151,7 +146,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
)
install(FILES
@@ -159,7 +153,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
)
@@ -170,7 +163,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}"
)
endif()
@@ -224,11 +216,6 @@ elseif (MSVC AND NOT NMAKE)
configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg)
configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg)
configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg)
- # create quakemap.cfg
- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/debug/quakemap_d.cfg)
- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/release/quakemap.cfg)
- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/quakemap.cfg)
- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/quakemap.cfg)
# create samples.cfg
configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg)
configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg)
@@ -248,8 +235,6 @@ else() # other OS only need one cfg file
configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/bin/resources${OGRE_CFG_SUFFIX}.cfg)
# create plugins.cfg
configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg)
- # create quakemap.cfg
- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/quakemap${OGRE_CFG_SUFFIX}.cfg)
# create samples.cfg
configure_file(${OGRE_TEMPLATES_DIR}/samples${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/samples${OGRE_CFG_SUFFIX}.cfg)
# create tests.cfg
diff --git a/CMake/Templates/Android_resources.cfg.in b/CMake/Templates/Android_resources.cfg.in
index 6e0e428..b87453d 100644
--- a/CMake/Templates/Android_resources.cfg.in
+++ b/CMake/Templates/Android_resources.cfg.in
@@ -13,7 +13,6 @@ APKFileSystem=/fonts
APKFileSystem=/materials/programs
APKFileSystem=/materials/scripts
APKFileSystem=/materials/textures
-APKFileSystem=/materials/textures/nvidia
APKFileSystem=/models
APKFileSystem=/particle
APKFileSystem=/materials/scripts/SSAO
diff --git a/CMake/Templates/SDK_CMakeLists.txt.in b/CMake/Templates/SDK_CMakeLists.txt.in
index 700ecc4..8db2327 100644
--- a/CMake/Templates/SDK_CMakeLists.txt.in
+++ b/CMake/Templates/SDK_CMakeLists.txt.in
@@ -244,7 +244,6 @@ if (UNIX AND NOT APPLE)
configure_file(${OGRE_SOURCE_DIR}/plugins.cfg ${OGRE_BINARY_DIR}/bin/plugins.cfg COPYONLY)
configure_file(${OGRE_SOURCE_DIR}/resources.cfg ${OGRE_BINARY_DIR}/bin/resources.cfg COPYONLY)
configure_file(${OGRE_SOURCE_DIR}/samples.cfg ${OGRE_BINARY_DIR}/bin/samples.cfg COPYONLY)
- configure_file(${OGRE_SOURCE_DIR}/quakemap.cfg ${OGRE_BINARY_DIR}/bin/quakemap.cfg COPYONLY)
endif ()
if (MINGW)
diff --git a/CMake/Templates/demomedia.wxi.in b/CMake/Templates/demomedia.wxi.in
index 8535c75..ee09b0c 100644
--- a/CMake/Templates/demomedia.wxi.in
+++ b/CMake/Templates/demomedia.wxi.in
@@ -295,13 +295,6 @@
<ComponentRef Id="cmpA1FEB51B0386689568AAFC22E0D71B6B" />
<ComponentRef Id="cmpA3F7363F0553143ABF1CA52A2FD433D6" />
<ComponentRef Id="cmp0344A18C23958D312C044A6E8443CD9D" />
- <ComponentRef Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" />
- <ComponentRef Id="cmp376B3837DF007338AC14AB58C726A8B1" />
- <ComponentRef Id="cmp02B151F3B587EAF5AF116E6A3B09E247" />
- <ComponentRef Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" />
- <ComponentRef Id="cmpB11E2174087D0D3FC791806231C1DBF5" />
- <ComponentRef Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" />
- <ComponentRef Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" />
<ComponentRef Id="cmpEA39DA48CA01586DF3412795541AD2FC" />
<ComponentRef Id="cmp50C3E068724D3C32847EEB132308B147" />
<ComponentRef Id="cmp78D10E140133F6977C74A8F912B2B217" />
@@ -328,8 +321,6 @@
<ComponentRef Id="cmpDFD58144C55506C82E22CF1AC14714B8" />
<ComponentRef Id="cmp9BF13256D468C8147B7050A93B09C032" />
<ComponentRef Id="cmp86F908FD9E8E5FFAD0C2D9A37A098E4C" />
- <ComponentRef Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" />
- <ComponentRef Id="cmp98499D3076FA7324AFE1F9F8D10FB421" />
<ComponentRef Id="cmp532E67011B733ACE674692F6ED52775D" />
<ComponentRef Id="cmp572AE70CCC0D85E8DA35F87B45768634" />
<ComponentRef Id="cmp013036935784DEC9BAE62831C93EFA18" />
@@ -1338,29 +1329,6 @@
<Component Id="cmp0344A18C23958D312C044A6E8443CD9D" Guid="{E47FE6B7-B6BD-4FCA-A903-87281A6B8CEB}">
<File Id="fil39C72570EB0CBAC9AF4FF900C2D5D525" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\WoodPallet.png" />
</Component>
- <Directory Id="dir11696C93BEAB38C45931BCBDDB2A6789" Name="nvidia">
- <Component Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" Guid="{68CA4BF9-5A51-400F-B5C2-701A4DA8D331}">
- <File Id="fil40BA6B2C4D12AD2C5710179390B9D2DB" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds" />
- </Component>
- <Component Id="cmp376B3837DF007338AC14AB58C726A8B1" Guid="{CF5BBEF1-4E44-46E9-8373-4FF589D19F6F}">
- <File Id="fil6A9EC7DE38E4F700741187344AAB9A4C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_normalheight.dds" />
- </Component>
- <Component Id="cmp02B151F3B587EAF5AF116E6A3B09E247" Guid="{EB6D162E-A67A-4CD1-948D-66B84457AFBD}">
- <File Id="fil30FFE3069E40D44C734E168BEB336DA0" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_diffusespecular.dds" />
- </Component>
- <Component Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" Guid="{C6E468AC-67EE-44C6-9F01-69D369D966FC}">
- <File Id="fil4C7A93A8C53E76F5F5ED65D1F52659DD" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_normalheight.dds" />
- </Component>
- <Component Id="cmpB11E2174087D0D3FC791806231C1DBF5" Guid="{3A30B7B3-6D8D-4475-B31E-5626B54DD65B}">
- <File Id="fil909FAC7A36B3EA5B9F4660701BEC09F5" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds" />
- </Component>
- <Component Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" Guid="{EE4979FF-6320-432A-98B2-F183BCAC197A}">
- <File Id="fil23D0DB8C9CA160970B9C29DD8F77B5CF" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds" />
- </Component>
- <Component Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" Guid="{E8AD7243-C2F2-4C00-AE8E-DC38E20927FA}">
- <File Id="fil6A4613F0DA3B5B562C5C68C05DFF0171" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\TextureUsageAgreement.txt" />
- </Component>
- </Directory>
</Directory>
</Directory>
<Directory Id="dir01544E63CCE21518F3D56A0A93D1DC4A" Name="models">
@@ -1444,12 +1412,6 @@
</Component>
</Directory>
<Directory Id="dir4ABFE5E33570C5CDD587CDA5FEC53CBC" Name="packs">
- <Component Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" Guid="{5B8E1BED-1BC5-4A20-BA09-9699D0AF7BFC}">
- <File Id="fil43F38AE712D50BF0076D8C8E08E3264C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.pk3" />
- </Component>
- <Component Id="cmp98499D3076FA7324AFE1F9F8D10FB421" Guid="{38CA3EF3-96E4-47D1-8B4C-682BCCF91E99}">
- <File Id="fil98BCB56BE20EF36A4F72F07CDADC63DE" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.txt" />
- </Component>
<Component Id="cmp532E67011B733ACE674692F6ED52775D" Guid="{9AC3FA7E-FBDC-4448-A61B-615EF43EB923}">
<File Id="filC6E116063CEC1DFBE1D6B452FD089931" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\cubemap.zip" />
</Component>
@@ -1794,4 +1756,4 @@
</Directory>
</DirectoryRef>
</Fragment>
-</Include>
\ No newline at end of file
+</Include>
diff --git a/CMake/Templates/demos.wxs.in b/CMake/Templates/demos.wxs.in
index a9eb6e3..30b9c19 100644
--- a/CMake/Templates/demos.wxs.in
+++ b/CMake/Templates/demos.wxs.in
@@ -39,7 +39,6 @@
<File Source='..\bin\release\samples.cfg' Vital='yes' />
<!-- Following config files are tweaked locally -->
<File Source='.\resources.cfg' Vital='yes' />
- <File Source='.\quakemap.cfg' Vital='yes' />
<File Source="..\bin\release\SampleBrowser.exe" />
<File Source='..\bin\release\Sample_BezierPatch.dll' Vital='yes' />
diff --git a/CMake/Templates/resources.cfg.in b/CMake/Templates/resources.cfg.in
index 900ae05..242873c 100644
--- a/CMake/Templates/resources.cfg.in
+++ b/CMake/Templates/resources.cfg.in
@@ -14,7 +14,6 @@ FileSystem=@OGRE_MEDIA_DIR_REL@/fonts
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures
-FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/nvidia
FileSystem=@OGRE_MEDIA_DIR_REL@/models
FileSystem=@OGRE_MEDIA_DIR_REL@/particle
FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia
diff --git a/Docs/License.md b/Docs/License.md
index 4bfddde..d62cf4d 100644
--- a/Docs/License.md
+++ b/Docs/License.md
@@ -298,36 +298,6 @@ included in the Docs/licenses folder.<br />
</table>
<br />
-
-<span style="font-weight: bold;">NVidia Cg<br />
-
-</span>
-<table style="text-align: left; width: 100%;" border="0" cellpadding="0" cellspacing="0">
- <tbody>
-
- <tr>
- <td style="width: 20%;">Original Authors:</td>
- <td>NVidia</td>
- </tr>
-
- <tr>
- <td>Website:</td>
- <td>http://developer.nvidia.com</td>
- </tr>
-
- <tr>
- <td>Licensed Under:</td>
- <td>Custom free license (binary only)</td>
- </tr>
-
- <tr>
- <td>Needed By:</td>
- <td>Plugin_CgProgramManager</td>
- </tr>
-
- </tbody>
-</table>
-<br />
<span style="font-weight: bold;">OpenEXR<br />
</span>
@@ -408,57 +378,4 @@ thus you do not need to use them to use OGRE, if you don't want to.<br />
</ul>
-<p class="mainheader" align="left">Art credits for demos</p>
-
-<ul>
- <li>
- <p style="margin-bottom: 0cm;">Matt Anderson at
- <a href="http://www.The3dStudio.com/">www.The3dStudio.com</a> who
- kindly gave permission for the use of some textures. These textures are used with permission of
- <a href="http://www.the3dstudio.com/">www.The3dStudio.com</a> and may
- not be re-distributed, sold, or given away except in the form of
- rendered images, animations, or real time 3D applications when credit
- is given to <a href="http://www.the3dstudio.com/">www.The3dStudio.com</a>.</p>
- </li>
- <li>
- <p style="margin-bottom: 0cm;">Jonathan Clark at
- <a href="http://www.jonathanclark.com/">http://www.jonathanclark.com</a>
- for some Golgotha textures thet were released to the public domain.</p>
- </li>
- <li>
- <p style="margin-bottom: 0cm;">The 'Raptor Assault Gunboat' mesh
- & texture are © 2002 by Adrian 'cearny' Cearnau.</p>
- </li>
- <li>
- <p style="margin-bottom: 0cm;">The robot andn ninja mesh and
- animation are by <a href="http://www.psionic3d.co.uk/">Psionic</a>,
- kindly made available from the <a href="http://www.insanesoftware.de/">CharacterFX</a>
- site</p>
- </li>
- <li>
- <p style="margin-bottom: 0cm;">The 'Razor 2' mesh is by Dennis
- Verbeek</p>
- </li>
- <li>
- <p style="margin-bottom: 0cm;">Skyboxes in cubemapJS.zip are
- ©<a href="http://www.schlorb.com/">Johannes Schlorb</a>, used
- with permission.
- </p>
- </li>
- <li>
- <p>Grass texture is courtesy of Mathias 'freezer' Walc</p>
- </li>
- <li>
- <p>The 'Cuckoo' TrueType font is provided by <a href="http://www.grsites.com">http://www.grsites.com</a>.</p>
- </li>
- <li>SoftImage|XSI sample media files (facial.mesh, jaiqua.mesh and associated files) are provided courtesy of Avid Technology, Inc.<br />
- © 2004 Avid Technology, Inc. All rights
- reserved. Avid is either a registered trademark or trademark of Avid
- Technology, Inc. in the United States and/or other countries.
- </li>
- <li>
- <p>The Sibenik Cathedral model by Marko Dabrovic - <a href="marko@3lhd.com">marko@3lhd.com</a>.</p>
- </li>
-</ul>
-
<p>Copyright © 2013 by The OGRE Team</p>
diff --git a/Samples/BSP/include/BSP.h b/Samples/BSP/include/BSP.h
index 856dee0..5f47011 100644
--- a/Samples/BSP/include/BSP.h
+++ b/Samples/BSP/include/BSP.h
@@ -19,7 +19,6 @@ class _OgreSampleClassExport Sample_BSP : public SdkSample
{
mInfo["Title"] = "BSP";
mInfo["Description"] = "A demo of the indoor, or BSP (Binary Space Partition) scene manager. "
- "Also demonstrates how to load BSP maps from Quake 3.";
mInfo["Thumbnail"] = "thumb_bsp.png";
mInfo["Category"] = "Geometry";
}
@@ -42,38 +41,6 @@ class _OgreSampleClassExport Sample_BSP : public SdkSample
protected:
- void locateResources()
- {
- // load the Quake archive location and map name from a config file
- ConfigFile cf;
- cf.load(mFSLayer->getConfigFilePath("quakemap.cfg"));
- mArchive = cf.getSetting("Archive");
- mMap = cf.getSetting("Map");
-
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
- Ogre::String bundle = Ogre::macBundlePath();
-#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX
- char* env_SNAP = getenv("SNAP");
- Ogre::String bundle(env_SNAP ? env_SNAP : "");
-#endif
-
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
- // OS X does not set the working directory relative to the app,
- // In order to make things portable on OS X we need to provide
- // the loading with it's own bundle path location
- if (!Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust relative dirs
- mArchive = bundle + "/" + mArchive;
-#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX
- // With Ubuntu Snappy changes absolute paths are relative to the snap package.
- if (Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust absolute dirs
- mArchive = bundle + mArchive;
-#endif
-
- // add the Quake archive to the world resource group
- ResourceGroupManager::getSingleton().addResourceLocation(mArchive, "Zip",
- ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true);
- }
-
void createSceneManager()
{
mSceneMgr = mRoot->createSceneManager("BspSceneManager"); // the BSP scene manager is required for this sample
@@ -118,10 +85,6 @@ class _OgreSampleClassExport Sample_BSP : public SdkSample
// set a random player starting point
ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true);
- // Quake uses the Z axis as the up axis, so make necessary adjustments
- mCameraNode->setFixedYawAxis(true, Vector3::UNIT_Z);
- mCameraNode->pitch(Degree(90));
-
mCameraNode->setPosition(vp.position);
mCameraNode->rotate(vp.orientation);
diff --git a/Samples/Browser/CMakeLists.txt b/Samples/Browser/CMakeLists.txt
index 007de53..bb75c19 100644
--- a/Samples/Browser/CMakeLists.txt
+++ b/Samples/Browser/CMakeLists.txt
@@ -118,13 +118,11 @@ if (WINDOWS_STORE OR WINDOWS_PHONE)
${OGRE_BINARY_DIR}/inst/bin/debug/resources_d.cfg
${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg
- ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg
${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg
${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg
${OGRE_BINARY_DIR}/inst/bin/release/resources.cfg
${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
- ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
@@ -149,14 +147,12 @@ if (WINDOWS_STORE OR WINDOWS_PHONE)
set(DEBUG_CONTENT_FILES ${DEBUG_CONTENT_FILES}
${CMAKE_CURRENT_BINARY_DIR}/resources_d.cfg
${CMAKE_CURRENT_BINARY_DIR}/plugins_d.cfg
- ${CMAKE_CURRENT_BINARY_DIR}/quakemap_d.cfg
${CMAKE_CURRENT_BINARY_DIR}/samples_d.cfg
${CMAKE_CURRENT_BINARY_DIR}/tests_d.cfg
)
set(RELEASE_CONTENT_FILES ${RELEASE_CONTENT_FILES}
${CMAKE_CURRENT_BINARY_DIR}/resources.cfg
${CMAKE_CURRENT_BINARY_DIR}/plugins.cfg
- ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg
${CMAKE_CURRENT_BINARY_DIR}/samples.cfg
${CMAKE_CURRENT_BINARY_DIR}/tests.cfg
)
@@ -330,7 +326,6 @@ if (APPLE)
COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/plugins.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/resources.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/samples.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/quakemap.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Media ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
COMMAND ditto ${OGRE_SOURCE_DIR}/Samples/Common/misc/SampleBrowser_OSX.icns ${OGRE_SAMPLE_CONTENTS_PATH}/Resources
)
@@ -340,7 +335,6 @@ if (APPLE)
COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/plugins.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
COMMAND ditto ${OGRE_SOURCE_DIR}/Samples/Common/misc/SampleBrowser_OSX.icns ${OGRE_SAMPLE_CONTENTS_PATH}/Resources
)
diff --git a/Samples/CMakeLists.txt b/Samples/CMakeLists.txt
index 65d6b5c..d742335 100644
--- a/Samples/CMakeLists.txt
+++ b/Samples/CMakeLists.txt
@@ -250,7 +250,6 @@ if (MSVC)
set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL})
set(OGRE_MEDIA_DIR_REL "Media")
configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY)
- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg @ONLY)
# restore
set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP})
add_custom_target(demo_installer
diff --git a/Samples/EndlessWorld/include/EndlessWorld.h b/Samples/EndlessWorld/include/EndlessWorld.h
index 8f766ae..e7fc126 100644
--- a/Samples/EndlessWorld/include/EndlessWorld.h
+++ b/Samples/EndlessWorld/include/EndlessWorld.h
@@ -312,17 +312,6 @@ protected:
defaultimp.inputScale = 600;
defaultimp.minBatchSize = 33;
defaultimp.maxBatchSize = 65;
- // textures
- defaultimp.layerList.resize(3);
- defaultimp.layerList[0].worldSize = 100;
- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
- defaultimp.layerList[1].worldSize = 30;
- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
- defaultimp.layerList[2].worldSize = 200;
- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
}
/*-----------------------------------------------------------------------------
diff --git a/Samples/Media/volumeTerrain/triplanarReference.material b/Samples/Media/volumeTerrain/triplanarReference.material
index 6b7c852..b5a42b6 100644
--- a/Samples/Media/volumeTerrain/triplanarReference.material
+++ b/Samples/Media/volumeTerrain/triplanarReference.material
@@ -9,9 +9,6 @@ material triplanarReference
rtshader_system
{
lighting_stage ffp
- // Texturescale, Plateau-size (0 to 0.57, not bigger to avoid division by zero!), transition-speed
- // Texture from x, from y, from z
- triplanarTexturing 0.1 0.2 2.0 dirt_grayrocky_diffusespecular.dds grass_green-01_diffusespecular.dds growth_weirdfungus-03_diffusespecular.dds
}
}
}
diff --git a/Samples/Terrain/include/Terrain.h b/Samples/Terrain/include/Terrain.h
index 2db87cc..af97218 100644
--- a/Samples/Terrain/include/Terrain.h
+++ b/Samples/Terrain/include/Terrain.h
@@ -527,17 +527,6 @@ class _OgreSampleClassExport Sample_Terrain : public SdkSample
defaultimp.inputScale = 600;
defaultimp.minBatchSize = 33;
defaultimp.maxBatchSize = 65;
- // textures
- defaultimp.layerList.resize(3);
- defaultimp.layerList[0].worldSize = 100;
- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
- defaultimp.layerList[1].worldSize = 30;
- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
- defaultimp.layerList[2].worldSize = 200;
- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
}
void addTextureDebugOverlay(TrayLocation loc, TexturePtr tex, size_t i)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index e85ec02..7c4adb5 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -198,8 +198,6 @@ if (OGRE_BUILD_TESTS)
${OGRE_TEST_CONTENTS_PATH}/Resources/
COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg
${OGRE_TEST_CONTENTS_PATH}/Resources/
- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg
- ${OGRE_TEST_CONTENTS_PATH}/Resources/
COMMAND ditto
${OGRE_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/
COMMAND ditto
diff --git a/Tests/VisualTests/Context/CMakeLists.txt b/Tests/VisualTests/Context/CMakeLists.txt
index b5e518a..476158e 100644
--- a/Tests/VisualTests/Context/CMakeLists.txt
+++ b/Tests/VisualTests/Context/CMakeLists.txt
@@ -140,8 +140,6 @@ if (APPLE)
${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg
${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
- COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg
- ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/tests.cfg
${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media
diff --git a/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp b/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp
index b730721..4e485bd 100644
--- a/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp
+++ b/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp
@@ -2031,47 +2031,6 @@ PlayPen_Bsp::PlayPen_Bsp()
addScreenshotFrame(10);
}
//----------------------------------------------------------------------------
-
-void PlayPen_Bsp::setupContent()
-{
- // Load Quake3 locations from a file
- ConfigFile cf;
-
- cf.load(mFSLayer->getConfigFilePath("quakemap.cfg"));
-
- String quakePk3 = cf.getSetting("Archive");
- String quakeLevel = cf.getSetting("Map");
-
- //ResourceGroupManager::getSingleton().addResourceLocation(quakePk3, "Zip");
-
- ResourceGroupManager::getSingleton().addResourceLocation(
- quakePk3, "Zip",
- ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true);
-
- // Load world geometry
- //mSceneMgr->setWorldGeometry(quakeLevel);
-
- ResourceGroupManager& rgm = ResourceGroupManager::getSingleton();
- rgm.linkWorldGeometryToResourceGroup(rgm.getWorldResourceGroupName(), quakeLevel, mSceneMgr);
- rgm.initialiseResourceGroup(rgm.getWorldResourceGroupName());
- rgm.loadResourceGroup(rgm.getWorldResourceGroupName(), false);
-
- // modify camera for close work
- mCamera->setNearClipDistance(4);
- mCamera->setFarClipDistance(4000);
-
- // Also change position, and set Quake-type orientation
- // Get random player start point
- ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true);
- mCameraNode->setPosition(vp.position);
- mCameraNode->pitch(Degree(90)); // Quake uses X/Y horizon, Z up
- mCameraNode->rotate(vp.orientation);
- // Don't yaw along variable axis, causes leaning
- mCameraNode->setFixedYawAxis(true, Vector3::UNIT_Z);
-
- mCameraNode->yaw(Ogre::Degree(-90.f));
-}
-//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
PlayPen_BuildTangentOnAnimatedMesh::PlayPen_BuildTangentOnAnimatedMesh()
|
