aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/irrlicht-1.8/examples/Demo
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/irrlicht-1.8/examples/Demo')
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/CDemo.cpp1630
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/CDemo.h220
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/CMainMenu.cpp756
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/CMainMenu.h96
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/Demo.vcproj446
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/Demo_vc10.vcxproj556
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/Demo_vc11.vcxproj564
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/Demo_vc8.vcproj600
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/Demo_vc9.vcproj600
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/Makefile86
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/demo.dev198
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/main.cpp98
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/resource.h32
-rw-r--r--libraries/irrlicht-1.8/examples/Demo/resscript.rc144
14 files changed, 3013 insertions, 3013 deletions
diff --git a/libraries/irrlicht-1.8/examples/Demo/CDemo.cpp b/libraries/irrlicht-1.8/examples/Demo/CDemo.cpp
index 1ce72a9..b22d1f3 100644
--- a/libraries/irrlicht-1.8/examples/Demo/CDemo.cpp
+++ b/libraries/irrlicht-1.8/examples/Demo/CDemo.cpp
@@ -1,815 +1,815 @@
1// This is a Demo of the Irrlicht Engine (c) 2005-2009 by N.Gebhardt. 1// This is a Demo of the Irrlicht Engine (c) 2005-2009 by N.Gebhardt.
2// This file is not documented. 2// This file is not documented.
3 3
4#include "CDemo.h" 4#include "CDemo.h"
5 5
6CDemo::CDemo(bool f, bool m, bool s, bool a, bool v, bool fsaa, video::E_DRIVER_TYPE d) 6CDemo::CDemo(bool f, bool m, bool s, bool a, bool v, bool fsaa, video::E_DRIVER_TYPE d)
7: fullscreen(f), music(m), shadows(s), additive(a), vsync(v), aa(fsaa), 7: fullscreen(f), music(m), shadows(s), additive(a), vsync(v), aa(fsaa),
8 driverType(d), device(0), 8 driverType(d), device(0),
9#ifdef USE_IRRKLANG 9#ifdef USE_IRRKLANG
10 irrKlang(0), ballSound(0), impactSound(0), 10 irrKlang(0), ballSound(0), impactSound(0),
11#endif 11#endif
12#ifdef USE_SDL_MIXER 12#ifdef USE_SDL_MIXER
13 stream(0), ballSound(0), impactSound(0), 13 stream(0), ballSound(0), impactSound(0),
14#endif 14#endif
15 currentScene(-2), backColor(0), statusText(0), inOutFader(0), 15 currentScene(-2), backColor(0), statusText(0), inOutFader(0),
16 quakeLevelMesh(0), quakeLevelNode(0), skyboxNode(0), model1(0), model2(0), 16 quakeLevelMesh(0), quakeLevelNode(0), skyboxNode(0), model1(0), model2(0),
17 campFire(0), metaSelector(0), mapSelector(0), sceneStartTime(0), 17 campFire(0), metaSelector(0), mapSelector(0), sceneStartTime(0),
18 timeForThisScene(0) 18 timeForThisScene(0)
19{ 19{
20} 20}
21 21
22 22
23CDemo::~CDemo() 23CDemo::~CDemo()
24{ 24{
25 if (mapSelector) 25 if (mapSelector)
26 mapSelector->drop(); 26 mapSelector->drop();
27 27
28 if (metaSelector) 28 if (metaSelector)
29 metaSelector->drop(); 29 metaSelector->drop();
30 30
31#ifdef USE_IRRKLANG 31#ifdef USE_IRRKLANG
32 if (irrKlang) 32 if (irrKlang)
33 irrKlang->drop(); 33 irrKlang->drop();
34#endif 34#endif
35} 35}
36 36
37 37
38void CDemo::run() 38void CDemo::run()
39{ 39{
40 core::dimension2d<u32> resolution ( 800, 600 ); 40 core::dimension2d<u32> resolution ( 800, 600 );
41 41
42 if ( driverType == video::EDT_BURNINGSVIDEO || driverType == video::EDT_SOFTWARE ) 42 if ( driverType == video::EDT_BURNINGSVIDEO || driverType == video::EDT_SOFTWARE )
43 { 43 {
44 resolution.Width = 640; 44 resolution.Width = 640;
45 resolution.Height = 480; 45 resolution.Height = 480;
46 } 46 }
47 47
48 irr::SIrrlichtCreationParameters params; 48 irr::SIrrlichtCreationParameters params;
49 params.DriverType=driverType; 49 params.DriverType=driverType;
50 params.WindowSize=resolution; 50 params.WindowSize=resolution;
51 params.Bits=32; 51 params.Bits=32;
52 params.Fullscreen=fullscreen; 52 params.Fullscreen=fullscreen;
53 params.Stencilbuffer=shadows; 53 params.Stencilbuffer=shadows;
54 params.Vsync=vsync; 54 params.Vsync=vsync;
55 params.AntiAlias=aa; 55 params.AntiAlias=aa;
56 params.EventReceiver=this; 56 params.EventReceiver=this;
57 57
58 device = createDeviceEx(params); 58 device = createDeviceEx(params);
59 if (!device) 59 if (!device)
60 return; 60 return;
61 61
62 if (device->getFileSystem()->existFile("irrlicht.dat")) 62 if (device->getFileSystem()->existFile("irrlicht.dat"))
63 device->getFileSystem()->addFileArchive("irrlicht.dat"); 63 device->getFileSystem()->addFileArchive("irrlicht.dat");
64 else 64 else
65 device->getFileSystem()->addFileArchive("../../media/irrlicht.dat"); 65 device->getFileSystem()->addFileArchive("../../media/irrlicht.dat");
66 if (device->getFileSystem()->existFile("map-20kdm2.pk3")) 66 if (device->getFileSystem()->existFile("map-20kdm2.pk3"))
67 device->getFileSystem()->addFileArchive("map-20kdm2.pk3"); 67 device->getFileSystem()->addFileArchive("map-20kdm2.pk3");
68 else 68 else
69 device->getFileSystem()->addFileArchive("../../media/map-20kdm2.pk3"); 69 device->getFileSystem()->addFileArchive("../../media/map-20kdm2.pk3");
70 70
71 video::IVideoDriver* driver = device->getVideoDriver(); 71 video::IVideoDriver* driver = device->getVideoDriver();
72 scene::ISceneManager* smgr = device->getSceneManager(); 72 scene::ISceneManager* smgr = device->getSceneManager();
73 gui::IGUIEnvironment* guienv = device->getGUIEnvironment(); 73 gui::IGUIEnvironment* guienv = device->getGUIEnvironment();
74 74
75 device->setWindowCaption(L"Irrlicht Engine Demo"); 75 device->setWindowCaption(L"Irrlicht Engine Demo");
76 76
77 // set ambient light 77 // set ambient light
78 smgr->setAmbientLight ( video::SColorf ( 0x00c0c0c0 ) ); 78 smgr->setAmbientLight ( video::SColorf ( 0x00c0c0c0 ) );
79 79
80 wchar_t tmp[255]; 80 wchar_t tmp[255];
81 81
82 // draw everything 82 // draw everything
83 83
84 s32 now = 0; 84 s32 now = 0;
85 s32 lastfps = 0; 85 s32 lastfps = 0;
86 sceneStartTime = device->getTimer()->getTime(); 86 sceneStartTime = device->getTimer()->getTime();
87 while(device->run() && driver) 87 while(device->run() && driver)
88 { 88 {
89 if (device->isWindowActive()) 89 if (device->isWindowActive())
90 { 90 {
91 #ifdef USE_IRRKLANG 91 #ifdef USE_IRRKLANG
92 // update 3D position for sound engine 92 // update 3D position for sound engine
93 scene::ICameraSceneNode* cam = smgr->getActiveCamera(); 93 scene::ICameraSceneNode* cam = smgr->getActiveCamera();
94 if (cam && irrKlang) 94 if (cam && irrKlang)
95 irrKlang->setListenerPosition(cam->getAbsolutePosition(), cam->getTarget()); 95 irrKlang->setListenerPosition(cam->getAbsolutePosition(), cam->getTarget());
96 #endif 96 #endif
97 97
98 // load next scene if necessary 98 // load next scene if necessary
99 now = device->getTimer()->getTime(); 99 now = device->getTimer()->getTime();
100 if (now - sceneStartTime > timeForThisScene && timeForThisScene!=-1) 100 if (now - sceneStartTime > timeForThisScene && timeForThisScene!=-1)
101 switchToNextScene(); 101 switchToNextScene();
102 102
103 createParticleImpacts(); 103 createParticleImpacts();
104 104
105 driver->beginScene(timeForThisScene != -1, true, backColor); 105 driver->beginScene(timeForThisScene != -1, true, backColor);
106 106
107 smgr->drawAll(); 107 smgr->drawAll();
108 guienv->drawAll(); 108 guienv->drawAll();
109 driver->endScene(); 109 driver->endScene();
110 110
111 // write statistics 111 // write statistics
112 const s32 nowfps = driver->getFPS(); 112 const s32 nowfps = driver->getFPS();
113 113
114 swprintf(tmp, 255, L"%ls fps:%3d triangles:%0.3f mio/s", 114 swprintf(tmp, 255, L"%ls fps:%3d triangles:%0.3f mio/s",
115 driver->getName(), driver->getFPS(), 115 driver->getName(), driver->getFPS(),
116 driver->getPrimitiveCountDrawn(1) * (1.f / 1000000.f)); 116 driver->getPrimitiveCountDrawn(1) * (1.f / 1000000.f));
117 117
118 statusText->setText(tmp); 118 statusText->setText(tmp);
119 if ( nowfps != lastfps ) 119 if ( nowfps != lastfps )
120 { 120 {
121 device->setWindowCaption(tmp); 121 device->setWindowCaption(tmp);
122 lastfps = nowfps; 122 lastfps = nowfps;
123 } 123 }
124 } 124 }
125 } 125 }
126 126
127 device->drop(); 127 device->drop();
128} 128}
129 129
130 130
131bool CDemo::OnEvent(const SEvent& event) 131bool CDemo::OnEvent(const SEvent& event)
132{ 132{
133 if (!device) 133 if (!device)
134 return false; 134 return false;
135 135
136 if (event.EventType == EET_KEY_INPUT_EVENT && 136 if (event.EventType == EET_KEY_INPUT_EVENT &&
137 event.KeyInput.Key == KEY_ESCAPE && 137 event.KeyInput.Key == KEY_ESCAPE &&
138 event.KeyInput.PressedDown == false) 138 event.KeyInput.PressedDown == false)
139 { 139 {
140 // user wants to quit. 140 // user wants to quit.
141 if (currentScene < 3) 141 if (currentScene < 3)
142 timeForThisScene = 0; 142 timeForThisScene = 0;
143 else 143 else
144 device->closeDevice(); 144 device->closeDevice();
145 } 145 }
146 else 146 else
147 if (((event.EventType == EET_KEY_INPUT_EVENT && 147 if (((event.EventType == EET_KEY_INPUT_EVENT &&
148 event.KeyInput.Key == KEY_SPACE && 148 event.KeyInput.Key == KEY_SPACE &&
149 event.KeyInput.PressedDown == false) || 149 event.KeyInput.PressedDown == false) ||
150 (event.EventType == EET_MOUSE_INPUT_EVENT && 150 (event.EventType == EET_MOUSE_INPUT_EVENT &&
151 event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)) && 151 event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)) &&
152 currentScene == 3) 152 currentScene == 3)
153 { 153 {
154 // shoot 154 // shoot
155 shoot(); 155 shoot();
156 } 156 }
157 else 157 else
158 if (event.EventType == EET_KEY_INPUT_EVENT && 158 if (event.EventType == EET_KEY_INPUT_EVENT &&
159 event.KeyInput.Key == KEY_F9 && 159 event.KeyInput.Key == KEY_F9 &&
160 event.KeyInput.PressedDown == false) 160 event.KeyInput.PressedDown == false)
161 { 161 {
162 video::IImage* image = device->getVideoDriver()->createScreenShot(); 162 video::IImage* image = device->getVideoDriver()->createScreenShot();
163 if (image) 163 if (image)
164 { 164 {
165 device->getVideoDriver()->writeImageToFile(image, "screenshot.bmp"); 165 device->getVideoDriver()->writeImageToFile(image, "screenshot.bmp");
166 device->getVideoDriver()->writeImageToFile(image, "screenshot.png"); 166 device->getVideoDriver()->writeImageToFile(image, "screenshot.png");
167 device->getVideoDriver()->writeImageToFile(image, "screenshot.tga"); 167 device->getVideoDriver()->writeImageToFile(image, "screenshot.tga");
168 device->getVideoDriver()->writeImageToFile(image, "screenshot.ppm"); 168 device->getVideoDriver()->writeImageToFile(image, "screenshot.ppm");
169 device->getVideoDriver()->writeImageToFile(image, "screenshot.jpg"); 169 device->getVideoDriver()->writeImageToFile(image, "screenshot.jpg");
170 device->getVideoDriver()->writeImageToFile(image, "screenshot.pcx"); 170 device->getVideoDriver()->writeImageToFile(image, "screenshot.pcx");
171 image->drop(); 171 image->drop();
172 } 172 }
173 } 173 }
174 else 174 else
175 if (device->getSceneManager()->getActiveCamera()) 175 if (device->getSceneManager()->getActiveCamera())
176 { 176 {
177 device->getSceneManager()->getActiveCamera()->OnEvent(event); 177 device->getSceneManager()->getActiveCamera()->OnEvent(event);
178 return true; 178 return true;
179 } 179 }
180 180
181 return false; 181 return false;
182} 182}
183 183
184 184
185void CDemo::switchToNextScene() 185void CDemo::switchToNextScene()
186{ 186{
187 currentScene++; 187 currentScene++;
188 if (currentScene > 3) 188 if (currentScene > 3)
189 currentScene = 1; 189 currentScene = 1;
190 190
191 scene::ISceneManager* sm = device->getSceneManager(); 191 scene::ISceneManager* sm = device->getSceneManager();
192 scene::ISceneNodeAnimator* sa = 0; 192 scene::ISceneNodeAnimator* sa = 0;
193 scene::ICameraSceneNode* camera = 0; 193 scene::ICameraSceneNode* camera = 0;
194 194
195 camera = sm->getActiveCamera(); 195 camera = sm->getActiveCamera();
196 if (camera) 196 if (camera)
197 { 197 {
198 sm->setActiveCamera(0); 198 sm->setActiveCamera(0);
199 camera->remove(); 199 camera->remove();
200 camera = 0; 200 camera = 0;
201 } 201 }
202 202
203 switch(currentScene) 203 switch(currentScene)
204 { 204 {
205 case -1: // loading screen 205 case -1: // loading screen
206 timeForThisScene = 0; 206 timeForThisScene = 0;
207 createLoadingScreen(); 207 createLoadingScreen();
208 break; 208 break;
209 209
210 case 0: // load scene 210 case 0: // load scene
211 timeForThisScene = 0; 211 timeForThisScene = 0;
212 loadSceneData(); 212 loadSceneData();
213 break; 213 break;
214 214
215 case 1: // panorama camera 215 case 1: // panorama camera
216 { 216 {
217 currentScene += 1; 217 currentScene += 1;
218 //camera = sm->addCameraSceneNode(0, core::vector3df(0,0,0), core::vector3df(-586,708,52)); 218 //camera = sm->addCameraSceneNode(0, core::vector3df(0,0,0), core::vector3df(-586,708,52));
219 //camera->setTarget(core::vector3df(0,400,0)); 219 //camera->setTarget(core::vector3df(0,400,0));
220 220
221 core::array<core::vector3df> points; 221 core::array<core::vector3df> points;
222 222
223 points.push_back(core::vector3df(-931.473755f, 138.300003f, 987.279114f)); // -49873 223 points.push_back(core::vector3df(-931.473755f, 138.300003f, 987.279114f)); // -49873
224 points.push_back(core::vector3df(-847.902222f, 136.757553f, 915.792725f)); // -50559 224 points.push_back(core::vector3df(-847.902222f, 136.757553f, 915.792725f)); // -50559
225 points.push_back(core::vector3df(-748.680420f, 152.254501f, 826.418945f)); // -51964 225 points.push_back(core::vector3df(-748.680420f, 152.254501f, 826.418945f)); // -51964
226 points.push_back(core::vector3df(-708.428406f, 213.569580f, 784.466675f)); // -53251 226 points.push_back(core::vector3df(-708.428406f, 213.569580f, 784.466675f)); // -53251
227 points.push_back(core::vector3df(-686.217651f, 288.141174f, 762.965576f)); // -54015 227 points.push_back(core::vector3df(-686.217651f, 288.141174f, 762.965576f)); // -54015
228 points.push_back(core::vector3df(-679.685059f, 365.095612f, 756.551453f)); // -54733 228 points.push_back(core::vector3df(-679.685059f, 365.095612f, 756.551453f)); // -54733
229 points.push_back(core::vector3df(-671.317871f, 447.360107f, 749.394592f)); // -55588 229 points.push_back(core::vector3df(-671.317871f, 447.360107f, 749.394592f)); // -55588
230 points.push_back(core::vector3df(-669.468445f, 583.335632f, 747.711853f)); // -56178 230 points.push_back(core::vector3df(-669.468445f, 583.335632f, 747.711853f)); // -56178
231 points.push_back(core::vector3df(-667.611267f, 727.313232f, 746.018250f)); // -56757 231 points.push_back(core::vector3df(-667.611267f, 727.313232f, 746.018250f)); // -56757
232 points.push_back(core::vector3df(-665.853210f, 862.791931f, 744.436096f)); // -57859 232 points.push_back(core::vector3df(-665.853210f, 862.791931f, 744.436096f)); // -57859
233 points.push_back(core::vector3df(-642.649597f, 1026.047607f, 724.259827f)); // -59705 233 points.push_back(core::vector3df(-642.649597f, 1026.047607f, 724.259827f)); // -59705
234 points.push_back(core::vector3df(-517.793884f, 838.396790f, 490.326050f)); // -60983 234 points.push_back(core::vector3df(-517.793884f, 838.396790f, 490.326050f)); // -60983
235 points.push_back(core::vector3df(-474.387299f, 715.691467f, 344.639984f)); // -61629 235 points.push_back(core::vector3df(-474.387299f, 715.691467f, 344.639984f)); // -61629
236 points.push_back(core::vector3df(-444.600250f, 601.155701f, 180.938095f)); // -62319 236 points.push_back(core::vector3df(-444.600250f, 601.155701f, 180.938095f)); // -62319
237 points.push_back(core::vector3df(-414.808899f, 479.691406f, 4.866660f)); // -63048 237 points.push_back(core::vector3df(-414.808899f, 479.691406f, 4.866660f)); // -63048
238 points.push_back(core::vector3df(-410.418945f, 429.642242f, -134.332687f)); // -63757 238 points.push_back(core::vector3df(-410.418945f, 429.642242f, -134.332687f)); // -63757
239 points.push_back(core::vector3df(-399.837585f, 411.498383f, -349.350983f)); // -64418 239 points.push_back(core::vector3df(-399.837585f, 411.498383f, -349.350983f)); // -64418
240 points.push_back(core::vector3df(-390.756653f, 403.970093f, -524.454407f)); // -65005 240 points.push_back(core::vector3df(-390.756653f, 403.970093f, -524.454407f)); // -65005
241 points.push_back(core::vector3df(-334.864227f, 350.065491f, -732.397400f)); // -65701 241 points.push_back(core::vector3df(-334.864227f, 350.065491f, -732.397400f)); // -65701
242 points.push_back(core::vector3df(-195.253387f, 349.577209f, -812.475891f)); // -66335 242 points.push_back(core::vector3df(-195.253387f, 349.577209f, -812.475891f)); // -66335
243 points.push_back(core::vector3df(16.255573f, 363.743134f, -833.800415f)); // -67170 243 points.push_back(core::vector3df(16.255573f, 363.743134f, -833.800415f)); // -67170
244 points.push_back(core::vector3df(234.940964f, 352.957825f, -820.150696f)); // -67939 244 points.push_back(core::vector3df(234.940964f, 352.957825f, -820.150696f)); // -67939
245 points.push_back(core::vector3df(436.797668f, 349.236450f, -816.914185f)); // -68596 245 points.push_back(core::vector3df(436.797668f, 349.236450f, -816.914185f)); // -68596
246 points.push_back(core::vector3df(575.236206f, 356.244812f, -719.788513f)); // -69166 246 points.push_back(core::vector3df(575.236206f, 356.244812f, -719.788513f)); // -69166
247 points.push_back(core::vector3df(594.131042f, 387.173828f, -609.675598f)); // -69744 247 points.push_back(core::vector3df(594.131042f, 387.173828f, -609.675598f)); // -69744
248 points.push_back(core::vector3df(617.615234f, 412.002899f, -326.174072f)); // -70640 248 points.push_back(core::vector3df(617.615234f, 412.002899f, -326.174072f)); // -70640
249 points.push_back(core::vector3df(606.456848f, 403.221954f, -104.179291f)); // -71390 249 points.push_back(core::vector3df(606.456848f, 403.221954f, -104.179291f)); // -71390
250 points.push_back(core::vector3df(610.958252f, 407.037750f, 117.209778f)); // -72085 250 points.push_back(core::vector3df(610.958252f, 407.037750f, 117.209778f)); // -72085
251 points.push_back(core::vector3df(597.956909f, 395.167877f, 345.942200f)); // -72817 251 points.push_back(core::vector3df(597.956909f, 395.167877f, 345.942200f)); // -72817
252 points.push_back(core::vector3df(587.383118f, 391.444519f, 566.098633f)); // -73477 252 points.push_back(core::vector3df(587.383118f, 391.444519f, 566.098633f)); // -73477
253 points.push_back(core::vector3df(559.572449f, 371.991333f, 777.689453f)); // -74124 253 points.push_back(core::vector3df(559.572449f, 371.991333f, 777.689453f)); // -74124
254 points.push_back(core::vector3df(423.753204f, 329.990051f, 925.859741f)); // -74941 254 points.push_back(core::vector3df(423.753204f, 329.990051f, 925.859741f)); // -74941
255 points.push_back(core::vector3df(247.520050f, 252.818954f, 935.311829f)); // -75651 255 points.push_back(core::vector3df(247.520050f, 252.818954f, 935.311829f)); // -75651
256 points.push_back(core::vector3df(114.756012f, 199.799759f, 805.014160f)); 256 points.push_back(core::vector3df(114.756012f, 199.799759f, 805.014160f));
257 points.push_back(core::vector3df(96.783348f, 181.639481f, 648.188110f)); 257 points.push_back(core::vector3df(96.783348f, 181.639481f, 648.188110f));
258 points.push_back(core::vector3df(97.865623f, 138.905975f, 484.812561f)); 258 points.push_back(core::vector3df(97.865623f, 138.905975f, 484.812561f));
259 points.push_back(core::vector3df(99.612457f, 102.463669f, 347.603210f)); 259 points.push_back(core::vector3df(99.612457f, 102.463669f, 347.603210f));
260 points.push_back(core::vector3df(99.612457f, 102.463669f, 347.603210f)); 260 points.push_back(core::vector3df(99.612457f, 102.463669f, 347.603210f));
261 points.push_back(core::vector3df(99.612457f, 102.463669f, 347.603210f)); 261 points.push_back(core::vector3df(99.612457f, 102.463669f, 347.603210f));
262 262
263 timeForThisScene = (points.size()-3)* 1000; 263 timeForThisScene = (points.size()-3)* 1000;
264 264
265 camera = sm->addCameraSceneNode(0, points[0], core::vector3df(0 ,400,0)); 265 camera = sm->addCameraSceneNode(0, points[0], core::vector3df(0 ,400,0));
266 //camera->setTarget(core::vector3df(0,400,0)); 266 //camera->setTarget(core::vector3df(0,400,0));
267 267
268 sa = sm->createFollowSplineAnimator(device->getTimer()->getTime(), 268 sa = sm->createFollowSplineAnimator(device->getTimer()->getTime(),
269 points); 269 points);
270 camera->addAnimator(sa); 270 camera->addAnimator(sa);
271 sa->drop(); 271 sa->drop();
272 272
273 model1->setVisible(false); 273 model1->setVisible(false);
274 model2->setVisible(false); 274 model2->setVisible(false);
275 campFire->setVisible(false); 275 campFire->setVisible(false);
276 inOutFader->fadeIn(7000); 276 inOutFader->fadeIn(7000);
277 } 277 }
278 break; 278 break;
279 279
280 case 2: // down fly anim camera 280 case 2: // down fly anim camera
281 camera = sm->addCameraSceneNode(0, core::vector3df(100,40,-80), core::vector3df(844,670,-885)); 281 camera = sm->addCameraSceneNode(0, core::vector3df(100,40,-80), core::vector3df(844,670,-885));
282 sa = sm->createFlyStraightAnimator(core::vector3df(94, 1002, 127), 282 sa = sm->createFlyStraightAnimator(core::vector3df(94, 1002, 127),
283 core::vector3df(108, 15, -60), 10000, true); 283 core::vector3df(108, 15, -60), 10000, true);
284 camera->addAnimator(sa); 284 camera->addAnimator(sa);
285 timeForThisScene = 9900; 285 timeForThisScene = 9900;
286 model1->setVisible(true); 286 model1->setVisible(true);
287 model2->setVisible(false); 287 model2->setVisible(false);
288 campFire->setVisible(false); 288 campFire->setVisible(false);
289 sa->drop(); 289 sa->drop();
290 break; 290 break;
291 291
292 case 3: // interactive, go around 292 case 3: // interactive, go around
293 { 293 {
294 model1->setVisible(true); 294 model1->setVisible(true);
295 model2->setVisible(true); 295 model2->setVisible(true);
296 campFire->setVisible(true); 296 campFire->setVisible(true);
297 timeForThisScene = -1; 297 timeForThisScene = -1;
298 298
299 SKeyMap keyMap[9]; 299 SKeyMap keyMap[9];
300 keyMap[0].Action = EKA_MOVE_FORWARD; 300 keyMap[0].Action = EKA_MOVE_FORWARD;
301 keyMap[0].KeyCode = KEY_UP; 301 keyMap[0].KeyCode = KEY_UP;
302 keyMap[1].Action = EKA_MOVE_FORWARD; 302 keyMap[1].Action = EKA_MOVE_FORWARD;
303 keyMap[1].KeyCode = KEY_KEY_W; 303 keyMap[1].KeyCode = KEY_KEY_W;
304 304
305 keyMap[2].Action = EKA_MOVE_BACKWARD; 305 keyMap[2].Action = EKA_MOVE_BACKWARD;
306 keyMap[2].KeyCode = KEY_DOWN; 306 keyMap[2].KeyCode = KEY_DOWN;
307 keyMap[3].Action = EKA_MOVE_BACKWARD; 307 keyMap[3].Action = EKA_MOVE_BACKWARD;
308 keyMap[3].KeyCode = KEY_KEY_S; 308 keyMap[3].KeyCode = KEY_KEY_S;
309 309
310 keyMap[4].Action = EKA_STRAFE_LEFT; 310 keyMap[4].Action = EKA_STRAFE_LEFT;
311 keyMap[4].KeyCode = KEY_LEFT; 311 keyMap[4].KeyCode = KEY_LEFT;
312 keyMap[5].Action = EKA_STRAFE_LEFT; 312 keyMap[5].Action = EKA_STRAFE_LEFT;
313 keyMap[5].KeyCode = KEY_KEY_A; 313 keyMap[5].KeyCode = KEY_KEY_A;
314 314
315 keyMap[6].Action = EKA_STRAFE_RIGHT; 315 keyMap[6].Action = EKA_STRAFE_RIGHT;
316 keyMap[6].KeyCode = KEY_RIGHT; 316 keyMap[6].KeyCode = KEY_RIGHT;
317 keyMap[7].Action = EKA_STRAFE_RIGHT; 317 keyMap[7].Action = EKA_STRAFE_RIGHT;
318 keyMap[7].KeyCode = KEY_KEY_D; 318 keyMap[7].KeyCode = KEY_KEY_D;
319 319
320 keyMap[8].Action = EKA_JUMP_UP; 320 keyMap[8].Action = EKA_JUMP_UP;
321 keyMap[8].KeyCode = KEY_KEY_J; 321 keyMap[8].KeyCode = KEY_KEY_J;
322 322
323 camera = sm->addCameraSceneNodeFPS(0, 100.0f, .4f, -1, keyMap, 9, false, 3.f); 323 camera = sm->addCameraSceneNodeFPS(0, 100.0f, .4f, -1, keyMap, 9, false, 3.f);
324 camera->setPosition(core::vector3df(108,140,-140)); 324 camera->setPosition(core::vector3df(108,140,-140));
325 camera->setFarValue(5000.0f); 325 camera->setFarValue(5000.0f);
326 326
327 scene::ISceneNodeAnimatorCollisionResponse* collider = 327 scene::ISceneNodeAnimatorCollisionResponse* collider =
328 sm->createCollisionResponseAnimator( 328 sm->createCollisionResponseAnimator(
329 metaSelector, camera, core::vector3df(25,50,25), 329 metaSelector, camera, core::vector3df(25,50,25),
330 core::vector3df(0, quakeLevelMesh ? -10.f : 0.0f,0), 330 core::vector3df(0, quakeLevelMesh ? -10.f : 0.0f,0),
331 core::vector3df(0,45,0), 0.005f); 331 core::vector3df(0,45,0), 0.005f);
332 332
333 camera->addAnimator(collider); 333 camera->addAnimator(collider);
334 collider->drop(); 334 collider->drop();
335 } 335 }
336 break; 336 break;
337 } 337 }
338 338
339 sceneStartTime = device->getTimer()->getTime(); 339 sceneStartTime = device->getTimer()->getTime();
340} 340}
341 341
342 342
343void CDemo::loadSceneData() 343void CDemo::loadSceneData()
344{ 344{
345 // load quake level 345 // load quake level
346 346
347 video::IVideoDriver* driver = device->getVideoDriver(); 347 video::IVideoDriver* driver = device->getVideoDriver();
348 scene::ISceneManager* sm = device->getSceneManager(); 348 scene::ISceneManager* sm = device->getSceneManager();
349 349
350 // Quake3 Shader controls Z-Writing 350 // Quake3 Shader controls Z-Writing
351 sm->getParameters()->setAttribute(scene::ALLOW_ZWRITE_ON_TRANSPARENT, true); 351 sm->getParameters()->setAttribute(scene::ALLOW_ZWRITE_ON_TRANSPARENT, true);
352 352
353 quakeLevelMesh = (scene::IQ3LevelMesh*) sm->getMesh("maps/20kdm2.bsp"); 353 quakeLevelMesh = (scene::IQ3LevelMesh*) sm->getMesh("maps/20kdm2.bsp");
354 354
355 if (quakeLevelMesh) 355 if (quakeLevelMesh)
356 { 356 {
357 u32 i; 357 u32 i;
358 358
359 //move all quake level meshes (non-realtime) 359 //move all quake level meshes (non-realtime)
360 core::matrix4 m; 360 core::matrix4 m;
361 m.setTranslation(core::vector3df(-1300,-70,-1249)); 361 m.setTranslation(core::vector3df(-1300,-70,-1249));
362 362
363 for ( i = 0; i != scene::quake3::E_Q3_MESH_SIZE; ++i ) 363 for ( i = 0; i != scene::quake3::E_Q3_MESH_SIZE; ++i )
364 sm->getMeshManipulator()->transform(quakeLevelMesh->getMesh(i), m); 364 sm->getMeshManipulator()->transform(quakeLevelMesh->getMesh(i), m);
365 365
366 quakeLevelNode = sm->addOctreeSceneNode( 366 quakeLevelNode = sm->addOctreeSceneNode(
367 quakeLevelMesh->getMesh( scene::quake3::E_Q3_MESH_GEOMETRY)); 367 quakeLevelMesh->getMesh( scene::quake3::E_Q3_MESH_GEOMETRY));
368 if (quakeLevelNode) 368 if (quakeLevelNode)
369 { 369 {
370 //quakeLevelNode->setPosition(core::vector3df(-1300,-70,-1249)); 370 //quakeLevelNode->setPosition(core::vector3df(-1300,-70,-1249));
371 quakeLevelNode->setVisible(true); 371 quakeLevelNode->setVisible(true);
372 372
373 // create map triangle selector 373 // create map triangle selector
374 mapSelector = sm->createOctreeTriangleSelector(quakeLevelMesh->getMesh(0), 374 mapSelector = sm->createOctreeTriangleSelector(quakeLevelMesh->getMesh(0),
375 quakeLevelNode, 128); 375 quakeLevelNode, 128);
376 376
377 // if not using shader and no gamma it's better to use more lighting, because 377 // if not using shader and no gamma it's better to use more lighting, because
378 // quake3 level are usually dark 378 // quake3 level are usually dark
379 quakeLevelNode->setMaterialType ( video::EMT_LIGHTMAP_M4 ); 379 quakeLevelNode->setMaterialType ( video::EMT_LIGHTMAP_M4 );
380 380
381 // set additive blending if wanted 381 // set additive blending if wanted
382 if (additive) 382 if (additive)
383 quakeLevelNode->setMaterialType(video::EMT_LIGHTMAP_ADD); 383 quakeLevelNode->setMaterialType(video::EMT_LIGHTMAP_ADD);
384 } 384 }
385 385
386 // the additional mesh can be quite huge and is unoptimized 386 // the additional mesh can be quite huge and is unoptimized
387 scene::IMesh * additional_mesh = quakeLevelMesh->getMesh ( scene::quake3::E_Q3_MESH_ITEMS ); 387 scene::IMesh * additional_mesh = quakeLevelMesh->getMesh ( scene::quake3::E_Q3_MESH_ITEMS );
388 388
389 for ( i = 0; i!= additional_mesh->getMeshBufferCount (); ++i ) 389 for ( i = 0; i!= additional_mesh->getMeshBufferCount (); ++i )
390 { 390 {
391 scene::IMeshBuffer *meshBuffer = additional_mesh->getMeshBuffer ( i ); 391 scene::IMeshBuffer *meshBuffer = additional_mesh->getMeshBuffer ( i );
392 const video::SMaterial &material = meshBuffer->getMaterial(); 392 const video::SMaterial &material = meshBuffer->getMaterial();
393 393
394 //! The ShaderIndex is stored in the material parameter 394 //! The ShaderIndex is stored in the material parameter
395 s32 shaderIndex = (s32) material.MaterialTypeParam2; 395 s32 shaderIndex = (s32) material.MaterialTypeParam2;
396 396
397 // the meshbuffer can be rendered without additional support, or it has no shader 397 // the meshbuffer can be rendered without additional support, or it has no shader
398 const scene::quake3::IShader *shader = quakeLevelMesh->getShader ( shaderIndex ); 398 const scene::quake3::IShader *shader = quakeLevelMesh->getShader ( shaderIndex );
399 if ( 0 == shader ) 399 if ( 0 == shader )
400 { 400 {
401 continue; 401 continue;
402 } 402 }
403 // Now add the MeshBuffer(s) with the current Shader to the Manager 403 // Now add the MeshBuffer(s) with the current Shader to the Manager
404 sm->addQuake3SceneNode ( meshBuffer, shader ); 404 sm->addQuake3SceneNode ( meshBuffer, shader );
405 } 405 }
406 } 406 }
407 407
408 // load sydney model and create 2 instances 408 // load sydney model and create 2 instances
409 409
410 scene::IAnimatedMesh* mesh = 0; 410 scene::IAnimatedMesh* mesh = 0;
411 mesh = sm->getMesh("../../media/sydney.md2"); 411 mesh = sm->getMesh("../../media/sydney.md2");
412 if (mesh) 412 if (mesh)
413 { 413 {
414 model1 = sm->addAnimatedMeshSceneNode(mesh); 414 model1 = sm->addAnimatedMeshSceneNode(mesh);
415 if (model1) 415 if (model1)
416 { 416 {
417 model1->setMaterialTexture(0, driver->getTexture("../../media/spheremap.jpg")); 417 model1->setMaterialTexture(0, driver->getTexture("../../media/spheremap.jpg"));
418 model1->setPosition(core::vector3df(100,40,-80)); 418 model1->setPosition(core::vector3df(100,40,-80));
419 model1->setScale(core::vector3df(2,2,2)); 419 model1->setScale(core::vector3df(2,2,2));
420 model1->setMD2Animation(scene::EMAT_STAND); 420 model1->setMD2Animation(scene::EMAT_STAND);
421 model1->setMaterialFlag(video::EMF_LIGHTING, false); 421 model1->setMaterialFlag(video::EMF_LIGHTING, false);
422 model1->setMaterialFlag(video::EMF_NORMALIZE_NORMALS, true); 422 model1->setMaterialFlag(video::EMF_NORMALIZE_NORMALS, true);
423 model1->setMaterialType(video::EMT_SPHERE_MAP); 423 model1->setMaterialType(video::EMT_SPHERE_MAP);
424 model1->addShadowVolumeSceneNode(); 424 model1->addShadowVolumeSceneNode();
425 } 425 }
426 426
427 model2 = sm->addAnimatedMeshSceneNode(mesh); 427 model2 = sm->addAnimatedMeshSceneNode(mesh);
428 if (model2) 428 if (model2)
429 { 429 {
430 model2->setPosition(core::vector3df(180,15,-60)); 430 model2->setPosition(core::vector3df(180,15,-60));
431 model2->setScale(core::vector3df(2,2,2)); 431 model2->setScale(core::vector3df(2,2,2));
432 model2->setMD2Animation(scene::EMAT_RUN); 432 model2->setMD2Animation(scene::EMAT_RUN);
433 model2->setMaterialTexture(0, device->getVideoDriver()->getTexture("../../media/sydney.bmp")); 433 model2->setMaterialTexture(0, device->getVideoDriver()->getTexture("../../media/sydney.bmp"));
434 model2->setMaterialFlag(video::EMF_LIGHTING, true); 434 model2->setMaterialFlag(video::EMF_LIGHTING, true);
435 model2->setMaterialFlag(video::EMF_NORMALIZE_NORMALS, true); 435 model2->setMaterialFlag(video::EMF_NORMALIZE_NORMALS, true);
436 model2->addShadowVolumeSceneNode(); 436 model2->addShadowVolumeSceneNode();
437 } 437 }
438 } 438 }
439 439
440 scene::ISceneNodeAnimator* anim = 0; 440 scene::ISceneNodeAnimator* anim = 0;
441 441
442 // create sky box 442 // create sky box
443 driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false); 443 driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
444 skyboxNode = sm->addSkyBoxSceneNode( 444 skyboxNode = sm->addSkyBoxSceneNode(
445 driver->getTexture("../../media/irrlicht2_up.jpg"), 445 driver->getTexture("../../media/irrlicht2_up.jpg"),
446 driver->getTexture("../../media/irrlicht2_dn.jpg"), 446 driver->getTexture("../../media/irrlicht2_dn.jpg"),
447 driver->getTexture("../../media/irrlicht2_lf.jpg"), 447 driver->getTexture("../../media/irrlicht2_lf.jpg"),
448 driver->getTexture("../../media/irrlicht2_rt.jpg"), 448 driver->getTexture("../../media/irrlicht2_rt.jpg"),
449 driver->getTexture("../../media/irrlicht2_ft.jpg"), 449 driver->getTexture("../../media/irrlicht2_ft.jpg"),
450 driver->getTexture("../../media/irrlicht2_bk.jpg")); 450 driver->getTexture("../../media/irrlicht2_bk.jpg"));
451 driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, true); 451 driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, true);
452 452
453 // create walk-between-portals animation 453 // create walk-between-portals animation
454 454
455 core::vector3df waypoint[2]; 455 core::vector3df waypoint[2];
456 waypoint[0].set(-150,40,100); 456 waypoint[0].set(-150,40,100);
457 waypoint[1].set(350,40,100); 457 waypoint[1].set(350,40,100);
458 458
459 if (model2) 459 if (model2)
460 { 460 {
461 anim = device->getSceneManager()->createFlyStraightAnimator( 461 anim = device->getSceneManager()->createFlyStraightAnimator(
462 waypoint[0], waypoint[1], 2000, true); 462 waypoint[0], waypoint[1], 2000, true);
463 model2->addAnimator(anim); 463 model2->addAnimator(anim);
464 anim->drop(); 464 anim->drop();
465 } 465 }
466 466
467 // create animation for portals; 467 // create animation for portals;
468 468
469 core::array<video::ITexture*> textures; 469 core::array<video::ITexture*> textures;
470 for (s32 g=1; g<8; ++g) 470 for (s32 g=1; g<8; ++g)
471 { 471 {
472 core::stringc tmp("../../media/portal"); 472 core::stringc tmp("../../media/portal");
473 tmp += g; 473 tmp += g;
474 tmp += ".bmp"; 474 tmp += ".bmp";
475 video::ITexture* t = driver->getTexture( tmp ); 475 video::ITexture* t = driver->getTexture( tmp );
476 textures.push_back(t); 476 textures.push_back(t);
477 } 477 }
478 478
479 anim = sm->createTextureAnimator(textures, 100); 479 anim = sm->createTextureAnimator(textures, 100);
480 480
481 // create portals 481 // create portals
482 482
483 scene::IBillboardSceneNode* bill = 0; 483 scene::IBillboardSceneNode* bill = 0;
484 484
485 for (int r=0; r<2; ++r) 485 for (int r=0; r<2; ++r)
486 { 486 {
487 bill = sm->addBillboardSceneNode(0, core::dimension2d<f32>(100,100), 487 bill = sm->addBillboardSceneNode(0, core::dimension2d<f32>(100,100),
488 waypoint[r]+ core::vector3df(0,20,0)); 488 waypoint[r]+ core::vector3df(0,20,0));
489 bill->setMaterialFlag(video::EMF_LIGHTING, false); 489 bill->setMaterialFlag(video::EMF_LIGHTING, false);
490 bill->setMaterialTexture(0, driver->getTexture("../../media/portal1.bmp")); 490 bill->setMaterialTexture(0, driver->getTexture("../../media/portal1.bmp"));
491 bill->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR); 491 bill->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR);
492 bill->addAnimator(anim); 492 bill->addAnimator(anim);
493 } 493 }
494 494
495 anim->drop(); 495 anim->drop();
496 496
497 // create cirlce flying dynamic light with transparent billboard attached 497 // create cirlce flying dynamic light with transparent billboard attached
498 498
499 scene::ILightSceneNode* light = 0; 499 scene::ILightSceneNode* light = 0;
500 500
501 light = sm->addLightSceneNode(0, 501 light = sm->addLightSceneNode(0,
502 core::vector3df(0,0,0), video::SColorf(1.0f, 1.0f, 1.f, 1.0f), 500.f); 502 core::vector3df(0,0,0), video::SColorf(1.0f, 1.0f, 1.f, 1.0f), 500.f);
503 503
504 anim = sm->createFlyCircleAnimator( 504 anim = sm->createFlyCircleAnimator(
505 core::vector3df(100,150,80), 80.0f, 0.0005f); 505 core::vector3df(100,150,80), 80.0f, 0.0005f);
506 506
507 light->addAnimator(anim); 507 light->addAnimator(anim);
508 anim->drop(); 508 anim->drop();
509 509
510 bill = device->getSceneManager()->addBillboardSceneNode( 510 bill = device->getSceneManager()->addBillboardSceneNode(
511 light, core::dimension2d<f32>(40,40)); 511 light, core::dimension2d<f32>(40,40));
512 bill->setMaterialFlag(video::EMF_LIGHTING, false); 512 bill->setMaterialFlag(video::EMF_LIGHTING, false);
513 bill->setMaterialTexture(0, driver->getTexture("../../media/particlewhite.bmp")); 513 bill->setMaterialTexture(0, driver->getTexture("../../media/particlewhite.bmp"));
514 bill->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR); 514 bill->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR);
515 515
516 // create meta triangle selector with all triangles selectors in it. 516 // create meta triangle selector with all triangles selectors in it.
517 metaSelector = sm->createMetaTriangleSelector(); 517 metaSelector = sm->createMetaTriangleSelector();
518 metaSelector->addTriangleSelector(mapSelector); 518 metaSelector->addTriangleSelector(mapSelector);
519 519
520 // create camp fire 520 // create camp fire
521 521
522 campFire = sm->addParticleSystemSceneNode(false); 522 campFire = sm->addParticleSystemSceneNode(false);
523 campFire->setPosition(core::vector3df(100,120,600)); 523 campFire->setPosition(core::vector3df(100,120,600));
524 campFire->setScale(core::vector3df(2,2,2)); 524 campFire->setScale(core::vector3df(2,2,2));
525 525
526 scene::IParticleEmitter* em = campFire->createBoxEmitter( 526 scene::IParticleEmitter* em = campFire->createBoxEmitter(
527 core::aabbox3d<f32>(-7,0,-7,7,1,7), 527 core::aabbox3d<f32>(-7,0,-7,7,1,7),
528 core::vector3df(0.0f,0.06f,0.0f), 528 core::vector3df(0.0f,0.06f,0.0f),
529 80,100, video::SColor(1,255,255,255),video::SColor(1,255,255,255), 800,2000); 529 80,100, video::SColor(1,255,255,255),video::SColor(1,255,255,255), 800,2000);
530 530
531 em->setMinStartSize(core::dimension2d<f32>(20.0f, 10.0f)); 531 em->setMinStartSize(core::dimension2d<f32>(20.0f, 10.0f));
532 em->setMaxStartSize(core::dimension2d<f32>(20.0f, 10.0f)); 532 em->setMaxStartSize(core::dimension2d<f32>(20.0f, 10.0f));
533 campFire->setEmitter(em); 533 campFire->setEmitter(em);
534 em->drop(); 534 em->drop();
535 535
536 scene::IParticleAffector* paf = campFire->createFadeOutParticleAffector(); 536 scene::IParticleAffector* paf = campFire->createFadeOutParticleAffector();
537 campFire->addAffector(paf); 537 campFire->addAffector(paf);
538 paf->drop(); 538 paf->drop();
539 539
540 campFire->setMaterialFlag(video::EMF_LIGHTING, false); 540 campFire->setMaterialFlag(video::EMF_LIGHTING, false);
541 campFire->setMaterialFlag(video::EMF_ZWRITE_ENABLE, false); 541 campFire->setMaterialFlag(video::EMF_ZWRITE_ENABLE, false);
542 campFire->setMaterialTexture(0, driver->getTexture("../../media/fireball.bmp")); 542 campFire->setMaterialTexture(0, driver->getTexture("../../media/fireball.bmp"));
543 campFire->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR); 543 campFire->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR);
544 544
545 // load music 545 // load music
546 546
547 #ifdef USE_IRRKLANG 547 #ifdef USE_IRRKLANG
548 if (music) 548 if (music)
549 startIrrKlang(); 549 startIrrKlang();
550 #endif 550 #endif
551 #ifdef USE_SDL_MIXER 551 #ifdef USE_SDL_MIXER
552 if (music) 552 if (music)
553 startSound(); 553 startSound();
554 #endif 554 #endif
555} 555}
556 556
557 557
558void CDemo::createLoadingScreen() 558void CDemo::createLoadingScreen()
559{ 559{
560 core::dimension2d<u32> size = device->getVideoDriver()->getScreenSize(); 560 core::dimension2d<u32> size = device->getVideoDriver()->getScreenSize();
561 561
562 device->getCursorControl()->setVisible(false); 562 device->getCursorControl()->setVisible(false);
563 563
564 // setup loading screen 564 // setup loading screen
565 565
566 backColor.set(255,90,90,156); 566 backColor.set(255,90,90,156);
567 567
568 // create in fader 568 // create in fader
569 569
570 inOutFader = device->getGUIEnvironment()->addInOutFader(); 570 inOutFader = device->getGUIEnvironment()->addInOutFader();
571 inOutFader->setColor(backColor, video::SColor ( 0, 230, 230, 230 )); 571 inOutFader->setColor(backColor, video::SColor ( 0, 230, 230, 230 ));
572 572
573 // irrlicht logo 573 // irrlicht logo
574 device->getGUIEnvironment()->addImage(device->getVideoDriver()->getTexture("../../media/irrlichtlogo2.png"), 574 device->getGUIEnvironment()->addImage(device->getVideoDriver()->getTexture("../../media/irrlichtlogo2.png"),
575 core::position2d<s32>(5,5)); 575 core::position2d<s32>(5,5));
576 576
577 // loading text 577 // loading text
578 578
579 const int lwidth = size.Width - 20; 579 const int lwidth = size.Width - 20;
580 const int lheight = 16; 580 const int lheight = 16;
581 581
582 core::rect<int> pos(10, size.Height-lheight-10, 10+lwidth, size.Height-10); 582 core::rect<int> pos(10, size.Height-lheight-10, 10+lwidth, size.Height-10);
583 583
584 device->getGUIEnvironment()->addImage(pos); 584 device->getGUIEnvironment()->addImage(pos);
585 statusText = device->getGUIEnvironment()->addStaticText(L"Loading...", pos, true); 585 statusText = device->getGUIEnvironment()->addStaticText(L"Loading...", pos, true);
586 statusText->setOverrideColor(video::SColor(255,205,200,200)); 586 statusText->setOverrideColor(video::SColor(255,205,200,200));
587 587
588 // load bigger font 588 // load bigger font
589 589
590 device->getGUIEnvironment()->getSkin()->setFont( 590 device->getGUIEnvironment()->getSkin()->setFont(
591 device->getGUIEnvironment()->getFont("../../media/fonthaettenschweiler.bmp")); 591 device->getGUIEnvironment()->getFont("../../media/fonthaettenschweiler.bmp"));
592 592
593 // set new font color 593 // set new font color
594 594
595 device->getGUIEnvironment()->getSkin()->setColor(gui::EGDC_BUTTON_TEXT, 595 device->getGUIEnvironment()->getSkin()->setColor(gui::EGDC_BUTTON_TEXT,
596 video::SColor(255,100,100,100)); 596 video::SColor(255,100,100,100));
597} 597}
598 598
599 599
600void CDemo::shoot() 600void CDemo::shoot()
601{ 601{
602 scene::ISceneManager* sm = device->getSceneManager(); 602 scene::ISceneManager* sm = device->getSceneManager();
603 scene::ICameraSceneNode* camera = sm->getActiveCamera(); 603 scene::ICameraSceneNode* camera = sm->getActiveCamera();
604 604
605 if (!camera || !mapSelector) 605 if (!camera || !mapSelector)
606 return; 606 return;
607 607
608 SParticleImpact imp; 608 SParticleImpact imp;
609 imp.when = 0; 609 imp.when = 0;
610 610
611 // get line of camera 611 // get line of camera
612 612
613 core::vector3df start = camera->getPosition(); 613 core::vector3df start = camera->getPosition();
614 core::vector3df end = (camera->getTarget() - start); 614 core::vector3df end = (camera->getTarget() - start);
615 end.normalize(); 615 end.normalize();
616 start += end*8.0f; 616 start += end*8.0f;
617 end = start + (end * camera->getFarValue()); 617 end = start + (end * camera->getFarValue());
618 618
619 core::triangle3df triangle; 619 core::triangle3df triangle;
620 620
621 core::line3d<f32> line(start, end); 621 core::line3d<f32> line(start, end);
622 622
623 // get intersection point with map 623 // get intersection point with map
624 scene::ISceneNode* hitNode; 624 scene::ISceneNode* hitNode;
625 if (sm->getSceneCollisionManager()->getCollisionPoint( 625 if (sm->getSceneCollisionManager()->getCollisionPoint(
626 line, mapSelector, end, triangle, hitNode)) 626 line, mapSelector, end, triangle, hitNode))
627 { 627 {
628 // collides with wall 628 // collides with wall
629 core::vector3df out = triangle.getNormal(); 629 core::vector3df out = triangle.getNormal();
630 out.setLength(0.03f); 630 out.setLength(0.03f);
631 631
632 imp.when = 1; 632 imp.when = 1;
633 imp.outVector = out; 633 imp.outVector = out;
634 imp.pos = end; 634 imp.pos = end;
635 } 635 }
636 else 636 else
637 { 637 {
638 // doesnt collide with wall 638 // doesnt collide with wall
639 core::vector3df start = camera->getPosition(); 639 core::vector3df start = camera->getPosition();
640 core::vector3df end = (camera->getTarget() - start); 640 core::vector3df end = (camera->getTarget() - start);
641 end.normalize(); 641 end.normalize();
642 start += end*8.0f; 642 start += end*8.0f;
643 end = start + (end * camera->getFarValue()); 643 end = start + (end * camera->getFarValue());
644 } 644 }
645 645
646 // create fire ball 646 // create fire ball
647 scene::ISceneNode* node = 0; 647 scene::ISceneNode* node = 0;
648 node = sm->addBillboardSceneNode(0, 648 node = sm->addBillboardSceneNode(0,
649 core::dimension2d<f32>(25,25), start); 649 core::dimension2d<f32>(25,25), start);
650 650
651 node->setMaterialFlag(video::EMF_LIGHTING, false); 651 node->setMaterialFlag(video::EMF_LIGHTING, false);
652 node->setMaterialTexture(0, device->getVideoDriver()->getTexture("../../media/fireball.bmp")); 652 node->setMaterialTexture(0, device->getVideoDriver()->getTexture("../../media/fireball.bmp"));
653 node->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR); 653 node->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR);
654 654
655 f32 length = (f32)(end - start).getLength(); 655 f32 length = (f32)(end - start).getLength();
656 const f32 speed = 0.6f; 656 const f32 speed = 0.6f;
657 u32 time = (u32)(length / speed); 657 u32 time = (u32)(length / speed);
658 658
659 scene::ISceneNodeAnimator* anim = 0; 659 scene::ISceneNodeAnimator* anim = 0;
660 660
661 // set flight line 661 // set flight line
662 662
663 anim = sm->createFlyStraightAnimator(start, end, time); 663 anim = sm->createFlyStraightAnimator(start, end, time);
664 node->addAnimator(anim); 664 node->addAnimator(anim);
665 anim->drop(); 665 anim->drop();
666 666
667 anim = sm->createDeleteAnimator(time); 667 anim = sm->createDeleteAnimator(time);
668 node->addAnimator(anim); 668 node->addAnimator(anim);
669 anim->drop(); 669 anim->drop();
670 670
671 if (imp.when) 671 if (imp.when)
672 { 672 {
673 // create impact note 673 // create impact note
674 imp.when = device->getTimer()->getTime() + (time - 100); 674 imp.when = device->getTimer()->getTime() + (time - 100);
675 Impacts.push_back(imp); 675 Impacts.push_back(imp);
676 } 676 }
677 677
678 // play sound 678 // play sound
679 #ifdef USE_IRRKLANG 679 #ifdef USE_IRRKLANG
680 if (ballSound) 680 if (ballSound)
681 irrKlang->play2D(ballSound); 681 irrKlang->play2D(ballSound);
682 #endif 682 #endif
683 #ifdef USE_SDL_MIXER 683 #ifdef USE_SDL_MIXER
684 if (ballSound) 684 if (ballSound)
685 playSound(ballSound); 685 playSound(ballSound);
686 #endif 686 #endif
687} 687}
688 688
689 689
690void CDemo::createParticleImpacts() 690void CDemo::createParticleImpacts()
691{ 691{
692 u32 now = device->getTimer()->getTime(); 692 u32 now = device->getTimer()->getTime();
693 scene::ISceneManager* sm = device->getSceneManager(); 693 scene::ISceneManager* sm = device->getSceneManager();
694 694
695 for (s32 i=0; i<(s32)Impacts.size(); ++i) 695 for (s32 i=0; i<(s32)Impacts.size(); ++i)
696 if (now > Impacts[i].when) 696 if (now > Impacts[i].when)
697 { 697 {
698 // create smoke particle system 698 // create smoke particle system
699 scene::IParticleSystemSceneNode* pas = 0; 699 scene::IParticleSystemSceneNode* pas = 0;
700 700
701 pas = sm->addParticleSystemSceneNode(false, 0, -1, Impacts[i].pos); 701 pas = sm->addParticleSystemSceneNode(false, 0, -1, Impacts[i].pos);
702 702
703 pas->setParticleSize(core::dimension2d<f32>(10.0f, 10.0f)); 703 pas->setParticleSize(core::dimension2d<f32>(10.0f, 10.0f));
704 704
705 scene::IParticleEmitter* em = pas->createBoxEmitter( 705 scene::IParticleEmitter* em = pas->createBoxEmitter(
706 core::aabbox3d<f32>(-5,-5,-5,5,5,5), 706 core::aabbox3d<f32>(-5,-5,-5,5,5,5),
707 Impacts[i].outVector, 20,40, video::SColor(50,255,255,255),video::SColor(50,255,255,255), 707 Impacts[i].outVector, 20,40, video::SColor(50,255,255,255),video::SColor(50,255,255,255),
708 1200,1600, 20); 708 1200,1600, 20);
709 709
710 pas->setEmitter(em); 710 pas->setEmitter(em);
711 em->drop(); 711 em->drop();
712 712
713 scene::IParticleAffector* paf = campFire->createFadeOutParticleAffector(); 713 scene::IParticleAffector* paf = campFire->createFadeOutParticleAffector();
714 pas->addAffector(paf); 714 pas->addAffector(paf);
715 paf->drop(); 715 paf->drop();
716 716
717 pas->setMaterialFlag(video::EMF_LIGHTING, false); 717 pas->setMaterialFlag(video::EMF_LIGHTING, false);
718 pas->setMaterialFlag(video::EMF_ZWRITE_ENABLE, false); 718 pas->setMaterialFlag(video::EMF_ZWRITE_ENABLE, false);
719 pas->setMaterialTexture(0, device->getVideoDriver()->getTexture("../../media/smoke.bmp")); 719 pas->setMaterialTexture(0, device->getVideoDriver()->getTexture("../../media/smoke.bmp"));
720 pas->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR); 720 pas->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR);
721 721
722 scene::ISceneNodeAnimator* anim = sm->createDeleteAnimator(2000); 722 scene::ISceneNodeAnimator* anim = sm->createDeleteAnimator(2000);
723 pas->addAnimator(anim); 723 pas->addAnimator(anim);
724 anim->drop(); 724 anim->drop();
725 725
726 // play impact sound 726 // play impact sound
727 #ifdef USE_IRRKLANG 727 #ifdef USE_IRRKLANG
728 if (irrKlang) 728 if (irrKlang)
729 { 729 {
730 irrklang::ISound* sound = 730 irrklang::ISound* sound =
731 irrKlang->play3D(impactSound, Impacts[i].pos, false, false, true); 731 irrKlang->play3D(impactSound, Impacts[i].pos, false, false, true);
732 732
733 if (sound) 733 if (sound)
734 { 734 {
735 // adjust max value a bit to make to sound of an impact louder 735 // adjust max value a bit to make to sound of an impact louder
736 sound->setMinDistance(400); 736 sound->setMinDistance(400);
737 sound->drop(); 737 sound->drop();
738 } 738 }
739 } 739 }
740 #endif 740 #endif
741 741
742 #ifdef USE_SDL_MIXER 742 #ifdef USE_SDL_MIXER
743 if (impactSound) 743 if (impactSound)
744 playSound(impactSound); 744 playSound(impactSound);
745 #endif 745 #endif
746 746
747 // delete entry 747 // delete entry
748 Impacts.erase(i); 748 Impacts.erase(i);
749 i--; 749 i--;
750 } 750 }
751} 751}
752 752
753 753
754#ifdef USE_IRRKLANG 754#ifdef USE_IRRKLANG
755void CDemo::startIrrKlang() 755void CDemo::startIrrKlang()
756{ 756{
757 irrKlang = irrklang::createIrrKlangDevice(); 757 irrKlang = irrklang::createIrrKlangDevice();
758 758
759 if (!irrKlang) 759 if (!irrKlang)
760 return; 760 return;
761 761
762 // play music 762 // play music
763 763
764 irrklang::ISound* snd = irrKlang->play2D("../../media/IrrlichtTheme.ogg", true, false, true); 764 irrklang::ISound* snd = irrKlang->play2D("../../media/IrrlichtTheme.ogg", true, false, true);
765 if ( !snd ) 765 if ( !snd )
766 snd = irrKlang->play2D("IrrlichtTheme.ogg", true, false, true); 766 snd = irrKlang->play2D("IrrlichtTheme.ogg", true, false, true);
767 767
768 if (snd) 768 if (snd)
769 { 769 {
770 snd->setVolume(0.5f); // 50% volume 770 snd->setVolume(0.5f); // 50% volume
771 snd->drop(); 771 snd->drop();
772 } 772 }
773 773
774 // preload both sound effects 774 // preload both sound effects
775 775
776 ballSound = irrKlang->getSoundSource("../../media/ball.wav"); 776 ballSound = irrKlang->getSoundSource("../../media/ball.wav");
777 impactSound = irrKlang->getSoundSource("../../media/impact.wav"); 777 impactSound = irrKlang->getSoundSource("../../media/impact.wav");
778} 778}
779#endif 779#endif
780 780
781 781
782#ifdef USE_SDL_MIXER 782#ifdef USE_SDL_MIXER
783void CDemo::startSound() 783void CDemo::startSound()
784{ 784{
785 stream = NULL; 785 stream = NULL;
786 ballSound = NULL; 786 ballSound = NULL;
787 impactSound = NULL; 787 impactSound = NULL;
788 788
789 SDL_Init(SDL_INIT_AUDIO); 789 SDL_Init(SDL_INIT_AUDIO);
790 790
791 if (Mix_OpenAudio(22050, AUDIO_S16, 2, 128)) 791 if (Mix_OpenAudio(22050, AUDIO_S16, 2, 128))
792 return; 792 return;
793 793
794 stream = Mix_LoadMUS("../../media/IrrlichtTheme.ogg"); 794 stream = Mix_LoadMUS("../../media/IrrlichtTheme.ogg");
795 if (stream) 795 if (stream)
796 Mix_PlayMusic(stream, -1); 796 Mix_PlayMusic(stream, -1);
797 797
798 ballSound = Mix_LoadWAV("../../media/ball.wav"); 798 ballSound = Mix_LoadWAV("../../media/ball.wav");
799 impactSound = Mix_LoadWAV("../../media/impact.wav"); 799 impactSound = Mix_LoadWAV("../../media/impact.wav");
800} 800}
801 801
802void CDemo::playSound(Mix_Chunk *sample) 802void CDemo::playSound(Mix_Chunk *sample)
803{ 803{
804 if (sample) 804 if (sample)
805 Mix_PlayChannel(-1, sample, 0); 805 Mix_PlayChannel(-1, sample, 0);
806} 806}
807 807
808void CDemo::pollSound(void) 808void CDemo::pollSound(void)
809{ 809{
810 SDL_Event event; 810 SDL_Event event;
811 811
812 while (SDL_PollEvent(&event)) 812 while (SDL_PollEvent(&event))
813 ; 813 ;
814} 814}
815#endif 815#endif
diff --git a/libraries/irrlicht-1.8/examples/Demo/CDemo.h b/libraries/irrlicht-1.8/examples/Demo/CDemo.h
index e2c564d..77d548c 100644
--- a/libraries/irrlicht-1.8/examples/Demo/CDemo.h
+++ b/libraries/irrlicht-1.8/examples/Demo/CDemo.h
@@ -1,110 +1,110 @@
1// This is a Demo of the Irrlicht Engine (c) 2006 by N.Gebhardt. 1// This is a Demo of the Irrlicht Engine (c) 2006 by N.Gebhardt.
2// This file is not documented. 2// This file is not documented.
3 3
4#ifndef __C_DEMO_H_INCLUDED__ 4#ifndef __C_DEMO_H_INCLUDED__
5#define __C_DEMO_H_INCLUDED__ 5#define __C_DEMO_H_INCLUDED__
6 6
7//#define USE_IRRKLANG 7//#define USE_IRRKLANG
8//#define USE_SDL_MIXER 8//#define USE_SDL_MIXER
9 9
10#include <irrlicht.h> 10#include <irrlicht.h>
11 11
12#ifdef _IRR_WINDOWS_ 12#ifdef _IRR_WINDOWS_
13#include <windows.h> 13#include <windows.h>
14#endif 14#endif
15 15
16using namespace irr; 16using namespace irr;
17 17
18// audio support 18// audio support
19 19
20#ifdef USE_IRRKLANG 20#ifdef USE_IRRKLANG
21 #include <irrKlang.h> // problem here? go to http://www.ambiera.com/irrklang and download 21 #include <irrKlang.h> // problem here? go to http://www.ambiera.com/irrklang and download
22 // the irrKlang library or undefine USE_IRRKLANG at the beginning 22 // the irrKlang library or undefine USE_IRRKLANG at the beginning
23 // of this file. 23 // of this file.
24 #ifdef _IRR_WINDOWS_ 24 #ifdef _IRR_WINDOWS_
25 #pragma comment (lib, "irrKlang.lib") 25 #pragma comment (lib, "irrKlang.lib")
26 #endif 26 #endif
27#endif 27#endif
28#ifdef USE_SDL_MIXER 28#ifdef USE_SDL_MIXER
29 # include <SDL/SDL.h> 29 # include <SDL/SDL.h>
30 # include <SDL/SDL_mixer.h> 30 # include <SDL/SDL_mixer.h>
31#endif 31#endif
32 32
33const int CAMERA_COUNT = 7; 33const int CAMERA_COUNT = 7;
34 34
35class CDemo : public IEventReceiver 35class CDemo : public IEventReceiver
36{ 36{
37public: 37public:
38 38
39 CDemo(bool fullscreen, bool music, bool shadows, bool additive, bool vsync, bool aa, video::E_DRIVER_TYPE driver); 39 CDemo(bool fullscreen, bool music, bool shadows, bool additive, bool vsync, bool aa, video::E_DRIVER_TYPE driver);
40 40
41 ~CDemo(); 41 ~CDemo();
42 42
43 void run(); 43 void run();
44 44
45 virtual bool OnEvent(const SEvent& event); 45 virtual bool OnEvent(const SEvent& event);
46 46
47private: 47private:
48 48
49 void createLoadingScreen(); 49 void createLoadingScreen();
50 void loadSceneData(); 50 void loadSceneData();
51 void switchToNextScene(); 51 void switchToNextScene();
52 void shoot(); 52 void shoot();
53 void createParticleImpacts(); 53 void createParticleImpacts();
54 54
55 bool fullscreen; 55 bool fullscreen;
56 bool music; 56 bool music;
57 bool shadows; 57 bool shadows;
58 bool additive; 58 bool additive;
59 bool vsync; 59 bool vsync;
60 bool aa; 60 bool aa;
61 video::E_DRIVER_TYPE driverType; 61 video::E_DRIVER_TYPE driverType;
62 IrrlichtDevice *device; 62 IrrlichtDevice *device;
63 63
64#ifdef USE_IRRKLANG 64#ifdef USE_IRRKLANG
65 void startIrrKlang(); 65 void startIrrKlang();
66 irrklang::ISoundEngine* irrKlang; 66 irrklang::ISoundEngine* irrKlang;
67 irrklang::ISoundSource* ballSound; 67 irrklang::ISoundSource* ballSound;
68 irrklang::ISoundSource* impactSound; 68 irrklang::ISoundSource* impactSound;
69#endif 69#endif
70 70
71#ifdef USE_SDL_MIXER 71#ifdef USE_SDL_MIXER
72 void startSound(); 72 void startSound();
73 void playSound(Mix_Chunk *); 73 void playSound(Mix_Chunk *);
74 void pollSound(); 74 void pollSound();
75 Mix_Music *stream; 75 Mix_Music *stream;
76 Mix_Chunk *ballSound; 76 Mix_Chunk *ballSound;
77 Mix_Chunk *impactSound; 77 Mix_Chunk *impactSound;
78#endif 78#endif
79 79
80 struct SParticleImpact 80 struct SParticleImpact
81 { 81 {
82 u32 when; 82 u32 when;
83 core::vector3df pos; 83 core::vector3df pos;
84 core::vector3df outVector; 84 core::vector3df outVector;
85 }; 85 };
86 86
87 int currentScene; 87 int currentScene;
88 video::SColor backColor; 88 video::SColor backColor;
89 89
90 gui::IGUIStaticText* statusText; 90 gui::IGUIStaticText* statusText;
91 gui::IGUIInOutFader* inOutFader; 91 gui::IGUIInOutFader* inOutFader;
92 92
93 scene::IQ3LevelMesh* quakeLevelMesh; 93 scene::IQ3LevelMesh* quakeLevelMesh;
94 scene::ISceneNode* quakeLevelNode; 94 scene::ISceneNode* quakeLevelNode;
95 scene::ISceneNode* skyboxNode; 95 scene::ISceneNode* skyboxNode;
96 scene::IAnimatedMeshSceneNode* model1; 96 scene::IAnimatedMeshSceneNode* model1;
97 scene::IAnimatedMeshSceneNode* model2; 97 scene::IAnimatedMeshSceneNode* model2;
98 scene::IParticleSystemSceneNode* campFire; 98 scene::IParticleSystemSceneNode* campFire;
99 99
100 scene::IMetaTriangleSelector* metaSelector; 100 scene::IMetaTriangleSelector* metaSelector;
101 scene::ITriangleSelector* mapSelector; 101 scene::ITriangleSelector* mapSelector;
102 102
103 s32 sceneStartTime; 103 s32 sceneStartTime;
104 s32 timeForThisScene; 104 s32 timeForThisScene;
105 105
106 core::array<SParticleImpact> Impacts; 106 core::array<SParticleImpact> Impacts;
107}; 107};
108 108
109#endif 109#endif
110 110
diff --git a/libraries/irrlicht-1.8/examples/Demo/CMainMenu.cpp b/libraries/irrlicht-1.8/examples/Demo/CMainMenu.cpp
index aa963e5..8e68f7b 100644
--- a/libraries/irrlicht-1.8/examples/Demo/CMainMenu.cpp
+++ b/libraries/irrlicht-1.8/examples/Demo/CMainMenu.cpp
@@ -1,378 +1,378 @@
1// This is a Demo of the Irrlicht Engine (c) 2005-2009 by N.Gebhardt. 1// This is a Demo of the Irrlicht Engine (c) 2005-2009 by N.Gebhardt.
2// This file is not documented. 2// This file is not documented.
3 3
4#include "CMainMenu.h" 4#include "CMainMenu.h"
5 5
6 6
7 7
8CMainMenu::CMainMenu() 8CMainMenu::CMainMenu()
9: startButton(0), MenuDevice(0), selected(2), start(false), fullscreen(true), 9: startButton(0), MenuDevice(0), selected(2), start(false), fullscreen(true),
10 music(true), shadows(false), additive(false), transparent(true), vsync(false), aa(false) 10 music(true), shadows(false), additive(false), transparent(true), vsync(false), aa(false)
11{ 11{
12} 12}
13 13
14 14
15bool CMainMenu::run(bool& outFullscreen, bool& outMusic, bool& outShadows, 15bool CMainMenu::run(bool& outFullscreen, bool& outMusic, bool& outShadows,
16 bool& outAdditive, bool& outVSync, bool& outAA, 16 bool& outAdditive, bool& outVSync, bool& outAA,
17 video::E_DRIVER_TYPE& outDriver) 17 video::E_DRIVER_TYPE& outDriver)
18{ 18{
19 //video::E_DRIVER_TYPE driverType = video::EDT_DIRECT3D9; 19 //video::E_DRIVER_TYPE driverType = video::EDT_DIRECT3D9;
20 //video::E_DRIVER_TYPE driverType = video::EDT_OPENGL; 20 //video::E_DRIVER_TYPE driverType = video::EDT_OPENGL;
21 video::E_DRIVER_TYPE driverType = video::EDT_BURNINGSVIDEO; 21 video::E_DRIVER_TYPE driverType = video::EDT_BURNINGSVIDEO;
22 //video::E_DRIVER_TYPE driverType = video::EDT_SOFTWARE; 22 //video::E_DRIVER_TYPE driverType = video::EDT_SOFTWARE;
23 23
24 MenuDevice = createDevice(driverType, 24 MenuDevice = createDevice(driverType,
25 core::dimension2d<u32>(512, 384), 16, false, false, false, this); 25 core::dimension2d<u32>(512, 384), 16, false, false, false, this);
26 26
27 if (MenuDevice->getFileSystem()->existFile("irrlicht.dat")) 27 if (MenuDevice->getFileSystem()->existFile("irrlicht.dat"))
28 MenuDevice->getFileSystem()->addFileArchive("irrlicht.dat"); 28 MenuDevice->getFileSystem()->addFileArchive("irrlicht.dat");
29 else 29 else
30 MenuDevice->getFileSystem()->addFileArchive("../../media/irrlicht.dat"); 30 MenuDevice->getFileSystem()->addFileArchive("../../media/irrlicht.dat");
31 31
32 video::IVideoDriver* driver = MenuDevice->getVideoDriver(); 32 video::IVideoDriver* driver = MenuDevice->getVideoDriver();
33 scene::ISceneManager* smgr = MenuDevice->getSceneManager(); 33 scene::ISceneManager* smgr = MenuDevice->getSceneManager();
34 gui::IGUIEnvironment* guienv = MenuDevice->getGUIEnvironment(); 34 gui::IGUIEnvironment* guienv = MenuDevice->getGUIEnvironment();
35 35
36 core::stringw str = "Irrlicht Engine Demo v"; 36 core::stringw str = "Irrlicht Engine Demo v";
37 str += MenuDevice->getVersion(); 37 str += MenuDevice->getVersion();
38 MenuDevice->setWindowCaption(str.c_str()); 38 MenuDevice->setWindowCaption(str.c_str());
39 39
40 // set new Skin 40 // set new Skin
41 gui::IGUISkin* newskin = guienv->createSkin(gui::EGST_BURNING_SKIN); 41 gui::IGUISkin* newskin = guienv->createSkin(gui::EGST_BURNING_SKIN);
42 guienv->setSkin(newskin); 42 guienv->setSkin(newskin);
43 newskin->drop(); 43 newskin->drop();
44 44
45 // load font 45 // load font
46 gui::IGUIFont* font = guienv->getFont("../../media/fonthaettenschweiler.bmp"); 46 gui::IGUIFont* font = guienv->getFont("../../media/fonthaettenschweiler.bmp");
47 if (font) 47 if (font)
48 guienv->getSkin()->setFont(font); 48 guienv->getSkin()->setFont(font);
49 49
50 // add images 50 // add images
51 51
52 const s32 leftX = 260; 52 const s32 leftX = 260;
53 53
54 // add tab control 54 // add tab control
55 gui::IGUITabControl* tabctrl = guienv->addTabControl(core::rect<int>(leftX,10,512-10,384-10), 55 gui::IGUITabControl* tabctrl = guienv->addTabControl(core::rect<int>(leftX,10,512-10,384-10),
56 0, true, true); 56 0, true, true);
57 gui::IGUITab* optTab = tabctrl->addTab(L"Demo"); 57 gui::IGUITab* optTab = tabctrl->addTab(L"Demo");
58 gui::IGUITab* aboutTab = tabctrl->addTab(L"About"); 58 gui::IGUITab* aboutTab = tabctrl->addTab(L"About");
59 59
60 // add list box 60 // add list box
61 61
62 gui::IGUIListBox* box = guienv->addListBox(core::rect<int>(10,10,220,120), optTab, 1); 62 gui::IGUIListBox* box = guienv->addListBox(core::rect<int>(10,10,220,120), optTab, 1);
63 box->addItem(L"OpenGL 1.5"); 63 box->addItem(L"OpenGL 1.5");
64 box->addItem(L"Direct3D 8.1"); 64 box->addItem(L"Direct3D 8.1");
65 box->addItem(L"Direct3D 9.0c"); 65 box->addItem(L"Direct3D 9.0c");
66 box->addItem(L"Burning's Video 0.47"); 66 box->addItem(L"Burning's Video 0.47");
67 box->addItem(L"Irrlicht Software Renderer 1.0"); 67 box->addItem(L"Irrlicht Software Renderer 1.0");
68 box->setSelected(selected); 68 box->setSelected(selected);
69 69
70 // add button 70 // add button
71 71
72 startButton = guienv->addButton(core::rect<int>(30,295,200,324), optTab, 2, L"Start Demo"); 72 startButton = guienv->addButton(core::rect<int>(30,295,200,324), optTab, 2, L"Start Demo");
73 73
74 // add checkbox 74 // add checkbox
75 75
76 const s32 d = 50; 76 const s32 d = 50;
77 77
78 guienv->addCheckBox(fullscreen, core::rect<int>(20,85+d,130,110+d), 78 guienv->addCheckBox(fullscreen, core::rect<int>(20,85+d,130,110+d),
79 optTab, 3, L"Fullscreen"); 79 optTab, 3, L"Fullscreen");
80 guienv->addCheckBox(music, core::rect<int>(135,85+d,245,110+d), 80 guienv->addCheckBox(music, core::rect<int>(135,85+d,245,110+d),
81 optTab, 4, L"Music & Sfx"); 81 optTab, 4, L"Music & Sfx");
82 guienv->addCheckBox(shadows, core::rect<int>(20,110+d,135,135+d), 82 guienv->addCheckBox(shadows, core::rect<int>(20,110+d,135,135+d),
83 optTab, 5, L"Realtime shadows"); 83 optTab, 5, L"Realtime shadows");
84 guienv->addCheckBox(additive, core::rect<int>(20,135+d,230,160+d), 84 guienv->addCheckBox(additive, core::rect<int>(20,135+d,230,160+d),
85 optTab, 6, L"Old HW compatible blending"); 85 optTab, 6, L"Old HW compatible blending");
86 guienv->addCheckBox(vsync, core::rect<int>(20,160+d,230,185+d), 86 guienv->addCheckBox(vsync, core::rect<int>(20,160+d,230,185+d),
87 optTab, 7, L"Vertical synchronisation"); 87 optTab, 7, L"Vertical synchronisation");
88 guienv->addCheckBox(aa, core::rect<int>(20,185+d,230,210+d), 88 guienv->addCheckBox(aa, core::rect<int>(20,185+d,230,210+d),
89 optTab, 8, L"Antialiasing"); 89 optTab, 8, L"Antialiasing");
90 90
91 // add about text 91 // add about text
92 92
93 const wchar_t* text2 = L"This is the tech demo of the Irrlicht engine. To start, "\ 93 const wchar_t* text2 = L"This is the tech demo of the Irrlicht engine. To start, "\
94 L"select a video driver which works best with your hardware and press 'Start Demo'.\n"\ 94 L"select a video driver which works best with your hardware and press 'Start Demo'.\n"\
95 L"What you currently see is displayed using the Burning Software Renderer (Thomas Alten).\n"\ 95 L"What you currently see is displayed using the Burning Software Renderer (Thomas Alten).\n"\
96 L"The Irrlicht Engine was written by me, Nikolaus Gebhardt. The models, "\ 96 L"The Irrlicht Engine was written by me, Nikolaus Gebhardt. The models, "\
97 L"maps and textures were placed at my disposal by B.Collins, M.Cook and J.Marton. The music was created by "\ 97 L"maps and textures were placed at my disposal by B.Collins, M.Cook and J.Marton. The music was created by "\
98 L"M.Rohde and is played back by irrKlang.\n"\ 98 L"M.Rohde and is played back by irrKlang.\n"\
99 L"For more informations, please visit the homepage of the Irrlicht engine:\nhttp://irrlicht.sourceforge.net"; 99 L"For more informations, please visit the homepage of the Irrlicht engine:\nhttp://irrlicht.sourceforge.net";
100 100
101 guienv->addStaticText(text2, core::rect<int>(10, 10, 230, 320), 101 guienv->addStaticText(text2, core::rect<int>(10, 10, 230, 320),
102 true, true, aboutTab); 102 true, true, aboutTab);
103 103
104 // add md2 model 104 // add md2 model
105 105
106 scene::IAnimatedMesh* mesh = smgr->getMesh("../../media/faerie.md2"); 106 scene::IAnimatedMesh* mesh = smgr->getMesh("../../media/faerie.md2");
107 scene::IAnimatedMeshSceneNode* modelNode = smgr->addAnimatedMeshSceneNode(mesh); 107 scene::IAnimatedMeshSceneNode* modelNode = smgr->addAnimatedMeshSceneNode(mesh);
108 if (modelNode) 108 if (modelNode)
109 { 109 {
110 modelNode->setPosition( core::vector3df(0.f, 0.f, -5.f) ); 110 modelNode->setPosition( core::vector3df(0.f, 0.f, -5.f) );
111 modelNode->setMaterialTexture(0, driver->getTexture("../../media/faerie2.bmp")); 111 modelNode->setMaterialTexture(0, driver->getTexture("../../media/faerie2.bmp"));
112 modelNode->setMaterialFlag(video::EMF_LIGHTING, true); 112 modelNode->setMaterialFlag(video::EMF_LIGHTING, true);
113 modelNode->getMaterial(0).Shininess = 50.f; 113 modelNode->getMaterial(0).Shininess = 50.f;
114 modelNode->getMaterial(0).NormalizeNormals = true; 114 modelNode->getMaterial(0).NormalizeNormals = true;
115 modelNode->setMD2Animation(scene::EMAT_STAND); 115 modelNode->setMD2Animation(scene::EMAT_STAND);
116 } 116 }
117 117
118 // set ambient light (no sun light in the catacombs) 118 // set ambient light (no sun light in the catacombs)
119 smgr->setAmbientLight( video::SColorf(0.2f, 0.2f, 0.2f) ); 119 smgr->setAmbientLight( video::SColorf(0.2f, 0.2f, 0.2f) );
120 120
121 scene::ILightSceneNode *light; 121 scene::ILightSceneNode *light;
122 scene::ISceneNodeAnimator* anim; 122 scene::ISceneNodeAnimator* anim;
123 scene::ISceneNode* bill; 123 scene::ISceneNode* bill;
124 124
125 enum eLightParticle 125 enum eLightParticle
126 { 126 {
127 LIGHT_NONE, 127 LIGHT_NONE,
128 LIGHT_GLOBAL, 128 LIGHT_GLOBAL,
129 LIGHT_RED, 129 LIGHT_RED,
130 LIGHT_BLUE 130 LIGHT_BLUE
131 }; 131 };
132 core::vector3df lightDir[2] = { 132 core::vector3df lightDir[2] = {
133 core::vector3df(0.f, 0.1f, 0.4f), 133 core::vector3df(0.f, 0.1f, 0.4f),
134 core::vector3df(0.f, 0.1f, -0.4f), 134 core::vector3df(0.f, 0.1f, -0.4f),
135 }; 135 };
136 136
137 struct SLightParticle 137 struct SLightParticle
138 { 138 {
139 eLightParticle type; 139 eLightParticle type;
140 u32 dir; 140 u32 dir;
141 }; 141 };
142 const SLightParticle lightParticle[] = 142 const SLightParticle lightParticle[] =
143 { 143 {
144 //LIGHT_GLOBAL,0, 144 //LIGHT_GLOBAL,0,
145 {LIGHT_RED,0}, 145 {LIGHT_RED,0},
146 {LIGHT_BLUE,0}, 146 {LIGHT_BLUE,0},
147 {LIGHT_RED,1}, 147 {LIGHT_RED,1},
148 {LIGHT_BLUE,1}, 148 {LIGHT_BLUE,1},
149 {LIGHT_NONE,0} 149 {LIGHT_NONE,0}
150 }; 150 };
151 151
152 const SLightParticle *l = lightParticle; 152 const SLightParticle *l = lightParticle;
153 while ( l->type != LIGHT_NONE ) 153 while ( l->type != LIGHT_NONE )
154 { 154 {
155 switch ( l->type ) 155 switch ( l->type )
156 { 156 {
157 case LIGHT_GLOBAL: 157 case LIGHT_GLOBAL:
158 // add illumination from the background 158 // add illumination from the background
159 light = smgr->addLightSceneNode(0, core::vector3df(10.f,40.f,-5.f), 159 light = smgr->addLightSceneNode(0, core::vector3df(10.f,40.f,-5.f),
160 video::SColorf(0.2f, 0.2f, 0.2f), 90.f); 160 video::SColorf(0.2f, 0.2f, 0.2f), 90.f);
161 break; 161 break;
162 case LIGHT_RED: 162 case LIGHT_RED:
163 // add light nearly red 163 // add light nearly red
164 light = smgr->addLightSceneNode(0, core::vector3df(0,1,0), 164 light = smgr->addLightSceneNode(0, core::vector3df(0,1,0),
165 video::SColorf(0.8f, 0.f, 0.f, 0.0f), 30.0f); 165 video::SColorf(0.8f, 0.f, 0.f, 0.0f), 30.0f);
166 // attach red billboard to the light 166 // attach red billboard to the light
167 bill = smgr->addBillboardSceneNode(light, core::dimension2d<f32>(10, 10)); 167 bill = smgr->addBillboardSceneNode(light, core::dimension2d<f32>(10, 10));
168 if ( bill ) 168 if ( bill )
169 { 169 {
170 bill->setMaterialFlag(video::EMF_LIGHTING, false); 170 bill->setMaterialFlag(video::EMF_LIGHTING, false);
171 bill->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR); 171 bill->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR);
172 bill->setMaterialTexture(0, driver->getTexture("../../media/particlered.bmp")); 172 bill->setMaterialTexture(0, driver->getTexture("../../media/particlered.bmp"));
173 } 173 }
174 // add fly circle animator to the light 174 // add fly circle animator to the light
175 anim = smgr->createFlyCircleAnimator(core::vector3df(0.f,0.f,-5.f),20.f, 175 anim = smgr->createFlyCircleAnimator(core::vector3df(0.f,0.f,-5.f),20.f,
176 0.002f, lightDir [l->dir] ); 176 0.002f, lightDir [l->dir] );
177 light->addAnimator(anim); 177 light->addAnimator(anim);
178 anim->drop(); 178 anim->drop();
179 break; 179 break;
180 case LIGHT_BLUE: 180 case LIGHT_BLUE:
181 // add light nearly blue 181 // add light nearly blue
182 light = smgr->addLightSceneNode(0, core::vector3df(0,1,0), 182 light = smgr->addLightSceneNode(0, core::vector3df(0,1,0),
183 video::SColorf(0.f, 0.0f, 0.8f, 0.0f), 30.0f); 183 video::SColorf(0.f, 0.0f, 0.8f, 0.0f), 30.0f);
184 // attach blue billboard to the light 184 // attach blue billboard to the light
185 bill = smgr->addBillboardSceneNode(light, core::dimension2d<f32>(10, 10)); 185 bill = smgr->addBillboardSceneNode(light, core::dimension2d<f32>(10, 10));
186 if (bill) 186 if (bill)
187 { 187 {
188 bill->setMaterialFlag(video::EMF_LIGHTING, false); 188 bill->setMaterialFlag(video::EMF_LIGHTING, false);
189 bill->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR); 189 bill->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR);
190 bill->setMaterialTexture(0, driver->getTexture("../../media/portal1.bmp")); 190 bill->setMaterialTexture(0, driver->getTexture("../../media/portal1.bmp"));
191 } 191 }
192 // add fly circle animator to the light 192 // add fly circle animator to the light
193 anim = smgr->createFlyCircleAnimator(core::vector3df(0.f,0.f,-5.f),20.f, 193 anim = smgr->createFlyCircleAnimator(core::vector3df(0.f,0.f,-5.f),20.f,
194 -0.002f, lightDir [l->dir], 0.5f); 194 -0.002f, lightDir [l->dir], 0.5f);
195 light->addAnimator(anim); 195 light->addAnimator(anim);
196 anim->drop(); 196 anim->drop();
197 break; 197 break;
198 case LIGHT_NONE: 198 case LIGHT_NONE:
199 break; 199 break;
200 } 200 }
201 l += 1; 201 l += 1;
202 } 202 }
203 203
204 // create a fixed camera 204 // create a fixed camera
205 smgr->addCameraSceneNode(0, core::vector3df(45,0,0), core::vector3df(0,0,10)); 205 smgr->addCameraSceneNode(0, core::vector3df(45,0,0), core::vector3df(0,0,10));
206 206
207 207
208 // irrlicht logo and background 208 // irrlicht logo and background
209 // add irrlicht logo 209 // add irrlicht logo
210 bool oldMipMapState = driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS); 210 bool oldMipMapState = driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
211 driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false); 211 driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
212 212
213 guienv->addImage(driver->getTexture("../../media/irrlichtlogo3.png"), 213 guienv->addImage(driver->getTexture("../../media/irrlichtlogo3.png"),
214 core::position2d<s32>(5,5)); 214 core::position2d<s32>(5,5));
215 215
216 video::ITexture* irrlichtBack = driver->getTexture("../../media/demoback.jpg"); 216 video::ITexture* irrlichtBack = driver->getTexture("../../media/demoback.jpg");
217 217
218 driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState); 218 driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, oldMipMapState);
219 219
220 // query original skin color 220 // query original skin color
221 getOriginalSkinColor(); 221 getOriginalSkinColor();
222 222
223 // set transparency 223 // set transparency
224 setTransparency(); 224 setTransparency();
225 225
226 // draw all 226 // draw all
227 227
228 while(MenuDevice->run()) 228 while(MenuDevice->run())
229 { 229 {
230 if (MenuDevice->isWindowActive()) 230 if (MenuDevice->isWindowActive())
231 { 231 {
232 driver->beginScene(false, true, video::SColor(0,0,0,0)); 232 driver->beginScene(false, true, video::SColor(0,0,0,0));
233 233
234 if (irrlichtBack) 234 if (irrlichtBack)
235 driver->draw2DImage(irrlichtBack, 235 driver->draw2DImage(irrlichtBack,
236 core::position2d<int>(0,0)); 236 core::position2d<int>(0,0));
237 237
238 smgr->drawAll(); 238 smgr->drawAll();
239 guienv->drawAll(); 239 guienv->drawAll();
240 driver->endScene(); 240 driver->endScene();
241 } 241 }
242 } 242 }
243 243
244 MenuDevice->drop(); 244 MenuDevice->drop();
245 245
246 outFullscreen = fullscreen; 246 outFullscreen = fullscreen;
247 outMusic = music; 247 outMusic = music;
248 outShadows = shadows; 248 outShadows = shadows;
249 outAdditive = additive; 249 outAdditive = additive;
250 outVSync = vsync; 250 outVSync = vsync;
251 outAA = aa; 251 outAA = aa;
252 252
253 switch(selected) 253 switch(selected)
254 { 254 {
255 case 0: outDriver = video::EDT_OPENGL; break; 255 case 0: outDriver = video::EDT_OPENGL; break;
256 case 1: outDriver = video::EDT_DIRECT3D8; break; 256 case 1: outDriver = video::EDT_DIRECT3D8; break;
257 case 2: outDriver = video::EDT_DIRECT3D9; break; 257 case 2: outDriver = video::EDT_DIRECT3D9; break;
258 case 3: outDriver = video::EDT_BURNINGSVIDEO; break; 258 case 3: outDriver = video::EDT_BURNINGSVIDEO; break;
259 case 4: outDriver = video::EDT_SOFTWARE; break; 259 case 4: outDriver = video::EDT_SOFTWARE; break;
260 } 260 }
261 261
262 return start; 262 return start;
263} 263}
264 264
265 265
266bool CMainMenu::OnEvent(const SEvent& event) 266bool CMainMenu::OnEvent(const SEvent& event)
267{ 267{
268 if (event.EventType == EET_KEY_INPUT_EVENT && 268 if (event.EventType == EET_KEY_INPUT_EVENT &&
269 event.KeyInput.Key == KEY_F9 && 269 event.KeyInput.Key == KEY_F9 &&
270 event.KeyInput.PressedDown == false) 270 event.KeyInput.PressedDown == false)
271 { 271 {
272 video::IImage* image = MenuDevice->getVideoDriver()->createScreenShot(); 272 video::IImage* image = MenuDevice->getVideoDriver()->createScreenShot();
273 if (image) 273 if (image)
274 { 274 {
275 MenuDevice->getVideoDriver()->writeImageToFile(image, "screenshot_main.jpg"); 275 MenuDevice->getVideoDriver()->writeImageToFile(image, "screenshot_main.jpg");
276 image->drop(); 276 image->drop();
277 } 277 }
278 } 278 }
279 else 279 else
280 if (event.EventType == irr::EET_MOUSE_INPUT_EVENT && 280 if (event.EventType == irr::EET_MOUSE_INPUT_EVENT &&
281 event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP ) 281 event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP )
282 { 282 {
283 core::rect<s32> r(event.MouseInput.X, event.MouseInput.Y, 0, 0); 283 core::rect<s32> r(event.MouseInput.X, event.MouseInput.Y, 0, 0);
284 gui::IGUIContextMenu* menu = MenuDevice->getGUIEnvironment()->addContextMenu(r, 0, 45); 284 gui::IGUIContextMenu* menu = MenuDevice->getGUIEnvironment()->addContextMenu(r, 0, 45);
285 menu->addItem(L"transparent menus", 666, transparent == false); 285 menu->addItem(L"transparent menus", 666, transparent == false);
286 menu->addItem(L"solid menus", 666, transparent == true); 286 menu->addItem(L"solid menus", 666, transparent == true);
287 menu->addSeparator(); 287 menu->addSeparator();
288 menu->addItem(L"Cancel"); 288 menu->addItem(L"Cancel");
289 } 289 }
290 else 290 else
291 if (event.EventType == EET_GUI_EVENT) 291 if (event.EventType == EET_GUI_EVENT)
292 { 292 {
293 s32 id = event.GUIEvent.Caller->getID(); 293 s32 id = event.GUIEvent.Caller->getID();
294 switch(id) 294 switch(id)
295 { 295 {
296 case 45: // context menu 296 case 45: // context menu
297 if (event.GUIEvent.EventType == gui::EGET_MENU_ITEM_SELECTED) 297 if (event.GUIEvent.EventType == gui::EGET_MENU_ITEM_SELECTED)
298 { 298 {
299 s32 s = ((gui::IGUIContextMenu*)event.GUIEvent.Caller)->getSelectedItem(); 299 s32 s = ((gui::IGUIContextMenu*)event.GUIEvent.Caller)->getSelectedItem();
300 if (s == 0 || s == 1) 300 if (s == 0 || s == 1)
301 { 301 {
302 transparent = !transparent; 302 transparent = !transparent;
303 setTransparency(); 303 setTransparency();
304 } 304 }
305 } 305 }
306 break; 306 break;
307 case 1: 307 case 1:
308 if (event.GUIEvent.EventType == gui::EGET_LISTBOX_CHANGED || 308 if (event.GUIEvent.EventType == gui::EGET_LISTBOX_CHANGED ||
309 event.GUIEvent.EventType == gui::EGET_LISTBOX_SELECTED_AGAIN) 309 event.GUIEvent.EventType == gui::EGET_LISTBOX_SELECTED_AGAIN)
310 { 310 {
311 selected = ((gui::IGUIListBox*)event.GUIEvent.Caller)->getSelected(); 311 selected = ((gui::IGUIListBox*)event.GUIEvent.Caller)->getSelected();
312 //startButton->setEnabled(selected != 4); 312 //startButton->setEnabled(selected != 4);
313 startButton->setEnabled(true); 313 startButton->setEnabled(true);
314 } 314 }
315 break; 315 break;
316 case 2: 316 case 2:
317 if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED ) 317 if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED )
318 { 318 {
319 MenuDevice->closeDevice(); 319 MenuDevice->closeDevice();
320 start = true; 320 start = true;
321 } 321 }
322 case 3: 322 case 3:
323 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED ) 323 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED )
324 fullscreen = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked(); 324 fullscreen = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked();
325 break; 325 break;
326 case 4: 326 case 4:
327 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED ) 327 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED )
328 music = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked(); 328 music = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked();
329 break; 329 break;
330 case 5: 330 case 5:
331 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED ) 331 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED )
332 shadows = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked(); 332 shadows = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked();
333 break; 333 break;
334 case 6: 334 case 6:
335 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED ) 335 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED )
336 additive = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked(); 336 additive = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked();
337 break; 337 break;
338 case 7: 338 case 7:
339 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED ) 339 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED )
340 vsync = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked(); 340 vsync = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked();
341 break; 341 break;
342 case 8: 342 case 8:
343 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED ) 343 if (event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED )
344 aa = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked(); 344 aa = ((gui::IGUICheckBox*)event.GUIEvent.Caller)->isChecked();
345 break; 345 break;
346 } 346 }
347 } 347 }
348 348
349 return false; 349 return false;
350} 350}
351 351
352 352
353void CMainMenu::getOriginalSkinColor() 353void CMainMenu::getOriginalSkinColor()
354{ 354{
355 irr::gui::IGUISkin * skin = MenuDevice->getGUIEnvironment()->getSkin(); 355 irr::gui::IGUISkin * skin = MenuDevice->getGUIEnvironment()->getSkin();
356 for (s32 i=0; i<gui::EGDC_COUNT ; ++i) 356 for (s32 i=0; i<gui::EGDC_COUNT ; ++i)
357 { 357 {
358 SkinColor[i] = skin->getColor( (gui::EGUI_DEFAULT_COLOR)i ); 358 SkinColor[i] = skin->getColor( (gui::EGUI_DEFAULT_COLOR)i );
359 } 359 }
360 360
361} 361}
362 362
363 363
364void CMainMenu::setTransparency() 364void CMainMenu::setTransparency()
365{ 365{
366 irr::gui::IGUISkin * skin = MenuDevice->getGUIEnvironment()->getSkin(); 366 irr::gui::IGUISkin * skin = MenuDevice->getGUIEnvironment()->getSkin();
367 367
368 for (u32 i=0; i<gui::EGDC_COUNT ; ++i) 368 for (u32 i=0; i<gui::EGDC_COUNT ; ++i)
369 { 369 {
370 video::SColor col = SkinColor[i]; 370 video::SColor col = SkinColor[i];
371 371
372 if (false == transparent) 372 if (false == transparent)
373 col.setAlpha(255); 373 col.setAlpha(255);
374 374
375 skin->setColor((gui::EGUI_DEFAULT_COLOR)i, col); 375 skin->setColor((gui::EGUI_DEFAULT_COLOR)i, col);
376 } 376 }
377} 377}
378 378
diff --git a/libraries/irrlicht-1.8/examples/Demo/CMainMenu.h b/libraries/irrlicht-1.8/examples/Demo/CMainMenu.h
index 06a0d04..ec3e18a 100644
--- a/libraries/irrlicht-1.8/examples/Demo/CMainMenu.h
+++ b/libraries/irrlicht-1.8/examples/Demo/CMainMenu.h
@@ -1,48 +1,48 @@
1// This is a Demo of the Irrlicht Engine (c) 2005 by N.Gebhardt. 1// This is a Demo of the Irrlicht Engine (c) 2005 by N.Gebhardt.
2// This file is not documentated. 2// This file is not documentated.
3 3
4#ifndef __C_MAIN_MENU_H_INCLUDED__ 4#ifndef __C_MAIN_MENU_H_INCLUDED__
5#define __C_MAIN_MENU_H_INCLUDED__ 5#define __C_MAIN_MENU_H_INCLUDED__
6 6
7#include <irrlicht.h> 7#include <irrlicht.h>
8 8
9using namespace irr; 9using namespace irr;
10 10
11class CMainMenu : public IEventReceiver 11class CMainMenu : public IEventReceiver
12{ 12{
13public: 13public:
14 14
15 CMainMenu(); 15 CMainMenu();
16 16
17 bool run(bool& outFullscreen, bool& outMusic, bool& outShadows, 17 bool run(bool& outFullscreen, bool& outMusic, bool& outShadows,
18 bool& outAdditive, bool &outVSync, bool& outAA, 18 bool& outAdditive, bool &outVSync, bool& outAA,
19 video::E_DRIVER_TYPE& outDriver); 19 video::E_DRIVER_TYPE& outDriver);
20 20
21 virtual bool OnEvent(const SEvent& event); 21 virtual bool OnEvent(const SEvent& event);
22 22
23private: 23private:
24 24
25 void setTransparency(); 25 void setTransparency();
26 26
27 gui::IGUIButton* startButton; 27 gui::IGUIButton* startButton;
28 IrrlichtDevice *MenuDevice; 28 IrrlichtDevice *MenuDevice;
29 s32 selected; 29 s32 selected;
30 bool start; 30 bool start;
31 bool fullscreen; 31 bool fullscreen;
32 bool music; 32 bool music;
33 bool shadows; 33 bool shadows;
34 bool additive; 34 bool additive;
35 bool transparent; 35 bool transparent;
36 bool vsync; 36 bool vsync;
37 bool aa; 37 bool aa;
38 38
39 scene::IAnimatedMesh* quakeLevel; 39 scene::IAnimatedMesh* quakeLevel;
40 scene::ISceneNode* lightMapNode; 40 scene::ISceneNode* lightMapNode;
41 scene::ISceneNode* dynamicNode; 41 scene::ISceneNode* dynamicNode;
42 42
43 video::SColor SkinColor [ gui::EGDC_COUNT ]; 43 video::SColor SkinColor [ gui::EGDC_COUNT ];
44 void getOriginalSkinColor(); 44 void getOriginalSkinColor();
45}; 45};
46 46
47#endif 47#endif
48 48
diff --git a/libraries/irrlicht-1.8/examples/Demo/Demo.vcproj b/libraries/irrlicht-1.8/examples/Demo/Demo.vcproj
index fe55b37..baea234 100644
--- a/libraries/irrlicht-1.8/examples/Demo/Demo.vcproj
+++ b/libraries/irrlicht-1.8/examples/Demo/Demo.vcproj
@@ -1,223 +1,223 @@
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="Demo" 5 Name="Demo"
6 ProjectGUID="{6F076455-D955-45D4-9C68-4AD4E45F2D47}" 6 ProjectGUID="{6F076455-D955-45D4-9C68-4AD4E45F2D47}"
7 SccProjectName="" 7 SccProjectName=""
8 SccLocalPath=""> 8 SccLocalPath="">
9 <Platforms> 9 <Platforms>
10 <Platform 10 <Platform
11 Name="Win32"/> 11 Name="Win32"/>
12 </Platforms> 12 </Platforms>
13 <Configurations> 13 <Configurations>
14 <Configuration 14 <Configuration
15 Name="Release|Win32" 15 Name="Release|Win32"
16 OutputDirectory=".\Release" 16 OutputDirectory=".\Release"
17 IntermediateDirectory=".\Release" 17 IntermediateDirectory=".\Release"
18 ConfigurationType="1" 18 ConfigurationType="1"
19 UseOfMFC="0" 19 UseOfMFC="0"
20 ATLMinimizesCRunTimeLibraryUsage="FALSE" 20 ATLMinimizesCRunTimeLibraryUsage="FALSE"
21 CharacterSet="2"> 21 CharacterSet="2">
22 <Tool 22 <Tool
23 Name="VCCLCompilerTool" 23 Name="VCCLCompilerTool"
24 Optimization="2" 24 Optimization="2"
25 InlineFunctionExpansion="1" 25 InlineFunctionExpansion="1"
26 AdditionalIncludeDirectories="..\..\include" 26 AdditionalIncludeDirectories="..\..\include"
27 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" 27 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
28 StringPooling="TRUE" 28 StringPooling="TRUE"
29 RuntimeLibrary="4" 29 RuntimeLibrary="4"
30 EnableFunctionLevelLinking="TRUE" 30 EnableFunctionLevelLinking="TRUE"
31 UsePrecompiledHeader="2" 31 UsePrecompiledHeader="2"
32 PrecompiledHeaderFile=".\Release/Demo.pch" 32 PrecompiledHeaderFile=".\Release/Demo.pch"
33 AssemblerListingLocation=".\Release/" 33 AssemblerListingLocation=".\Release/"
34 ObjectFile=".\Release/" 34 ObjectFile=".\Release/"
35 ProgramDataBaseFileName=".\Release/" 35 ProgramDataBaseFileName=".\Release/"
36 WarningLevel="3" 36 WarningLevel="3"
37 SuppressStartupBanner="TRUE" 37 SuppressStartupBanner="TRUE"
38 CompileAs="0"/> 38 CompileAs="0"/>
39 <Tool 39 <Tool
40 Name="VCCustomBuildTool"/> 40 Name="VCCustomBuildTool"/>
41 <Tool 41 <Tool
42 Name="VCLinkerTool" 42 Name="VCLinkerTool"
43 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe" 43 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe"
44 LinkIncremental="0" 44 LinkIncremental="0"
45 SuppressStartupBanner="TRUE" 45 SuppressStartupBanner="TRUE"
46 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" 46 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
47 ProgramDatabaseFile=".\Release/Demo.pdb" 47 ProgramDatabaseFile=".\Release/Demo.pdb"
48 SubSystem="2" 48 SubSystem="2"
49 TargetMachine="1"/> 49 TargetMachine="1"/>
50 <Tool 50 <Tool
51 Name="VCMIDLTool" 51 Name="VCMIDLTool"
52 PreprocessorDefinitions="NDEBUG" 52 PreprocessorDefinitions="NDEBUG"
53 MkTypLibCompatible="TRUE" 53 MkTypLibCompatible="TRUE"
54 SuppressStartupBanner="TRUE" 54 SuppressStartupBanner="TRUE"
55 TargetEnvironment="1" 55 TargetEnvironment="1"
56 TypeLibraryName=".\Release/Demo.tlb" 56 TypeLibraryName=".\Release/Demo.tlb"
57 HeaderFileName=""/> 57 HeaderFileName=""/>
58 <Tool 58 <Tool
59 Name="VCPostBuildEventTool"/> 59 Name="VCPostBuildEventTool"/>
60 <Tool 60 <Tool
61 Name="VCPreBuildEventTool"/> 61 Name="VCPreBuildEventTool"/>
62 <Tool 62 <Tool
63 Name="VCPreLinkEventTool"/> 63 Name="VCPreLinkEventTool"/>
64 <Tool 64 <Tool
65 Name="VCResourceCompilerTool" 65 Name="VCResourceCompilerTool"
66 PreprocessorDefinitions="NDEBUG" 66 PreprocessorDefinitions="NDEBUG"
67 Culture="3079"/> 67 Culture="3079"/>
68 <Tool 68 <Tool
69 Name="VCWebServiceProxyGeneratorTool"/> 69 Name="VCWebServiceProxyGeneratorTool"/>
70 <Tool 70 <Tool
71 Name="VCXMLDataGeneratorTool"/> 71 Name="VCXMLDataGeneratorTool"/>
72 <Tool 72 <Tool
73 Name="VCWebDeploymentTool"/> 73 Name="VCWebDeploymentTool"/>
74 <Tool 74 <Tool
75 Name="VCManagedWrapperGeneratorTool"/> 75 Name="VCManagedWrapperGeneratorTool"/>
76 <Tool 76 <Tool
77 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 77 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
78 </Configuration> 78 </Configuration>
79 <Configuration 79 <Configuration
80 Name="Debug|Win32" 80 Name="Debug|Win32"
81 OutputDirectory=".\Debug" 81 OutputDirectory=".\Debug"
82 IntermediateDirectory=".\Debug" 82 IntermediateDirectory=".\Debug"
83 ConfigurationType="1" 83 ConfigurationType="1"
84 UseOfMFC="0" 84 UseOfMFC="0"
85 ATLMinimizesCRunTimeLibraryUsage="FALSE" 85 ATLMinimizesCRunTimeLibraryUsage="FALSE"
86 CharacterSet="2"> 86 CharacterSet="2">
87 <Tool 87 <Tool
88 Name="VCCLCompilerTool" 88 Name="VCCLCompilerTool"
89 Optimization="0" 89 Optimization="0"
90 AdditionalIncludeDirectories="..\..\include" 90 AdditionalIncludeDirectories="..\..\include"
91 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" 91 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
92 BasicRuntimeChecks="3" 92 BasicRuntimeChecks="3"
93 RuntimeLibrary="5" 93 RuntimeLibrary="5"
94 UsePrecompiledHeader="2" 94 UsePrecompiledHeader="2"
95 PrecompiledHeaderFile=".\Debug/Demo.pch" 95 PrecompiledHeaderFile=".\Debug/Demo.pch"
96 AssemblerListingLocation=".\Debug/" 96 AssemblerListingLocation=".\Debug/"
97 ObjectFile=".\Debug/" 97 ObjectFile=".\Debug/"
98 ProgramDataBaseFileName=".\Debug/" 98 ProgramDataBaseFileName=".\Debug/"
99 WarningLevel="3" 99 WarningLevel="3"
100 SuppressStartupBanner="TRUE" 100 SuppressStartupBanner="TRUE"
101 DebugInformationFormat="4" 101 DebugInformationFormat="4"
102 CompileAs="0"/> 102 CompileAs="0"/>
103 <Tool 103 <Tool
104 Name="VCCustomBuildTool"/> 104 Name="VCCustomBuildTool"/>
105 <Tool 105 <Tool
106 Name="VCLinkerTool" 106 Name="VCLinkerTool"
107 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe" 107 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe"
108 LinkIncremental="0" 108 LinkIncremental="0"
109 SuppressStartupBanner="TRUE" 109 SuppressStartupBanner="TRUE"
110 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" 110 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
111 GenerateDebugInformation="TRUE" 111 GenerateDebugInformation="TRUE"
112 ProgramDatabaseFile=".\Debug/Demo.pdb" 112 ProgramDatabaseFile=".\Debug/Demo.pdb"
113 SubSystem="2" 113 SubSystem="2"
114 TargetMachine="1"/> 114 TargetMachine="1"/>
115 <Tool 115 <Tool
116 Name="VCMIDLTool" 116 Name="VCMIDLTool"
117 PreprocessorDefinitions="_DEBUG" 117 PreprocessorDefinitions="_DEBUG"
118 MkTypLibCompatible="TRUE" 118 MkTypLibCompatible="TRUE"
119 SuppressStartupBanner="TRUE" 119 SuppressStartupBanner="TRUE"
120 TargetEnvironment="1" 120 TargetEnvironment="1"
121 TypeLibraryName=".\Debug/Demo.tlb" 121 TypeLibraryName=".\Debug/Demo.tlb"
122 HeaderFileName=""/> 122 HeaderFileName=""/>
123 <Tool 123 <Tool
124 Name="VCPostBuildEventTool"/> 124 Name="VCPostBuildEventTool"/>
125 <Tool 125 <Tool
126 Name="VCPreBuildEventTool"/> 126 Name="VCPreBuildEventTool"/>
127 <Tool 127 <Tool
128 Name="VCPreLinkEventTool"/> 128 Name="VCPreLinkEventTool"/>
129 <Tool 129 <Tool
130 Name="VCResourceCompilerTool" 130 Name="VCResourceCompilerTool"
131 PreprocessorDefinitions="_DEBUG" 131 PreprocessorDefinitions="_DEBUG"
132 Culture="3079"/> 132 Culture="3079"/>
133 <Tool 133 <Tool
134 Name="VCWebServiceProxyGeneratorTool"/> 134 Name="VCWebServiceProxyGeneratorTool"/>
135 <Tool 135 <Tool
136 Name="VCXMLDataGeneratorTool"/> 136 Name="VCXMLDataGeneratorTool"/>
137 <Tool 137 <Tool
138 Name="VCWebDeploymentTool"/> 138 Name="VCWebDeploymentTool"/>
139 <Tool 139 <Tool
140 Name="VCManagedWrapperGeneratorTool"/> 140 Name="VCManagedWrapperGeneratorTool"/>
141 <Tool 141 <Tool
142 Name="VCAuxiliaryManagedWrapperGeneratorTool"/> 142 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
143 </Configuration> 143 </Configuration>
144 </Configurations> 144 </Configurations>
145 <References> 145 <References>
146 </References> 146 </References>
147 <Files> 147 <Files>
148 <File 148 <File
149 RelativePath="CDemo.cpp"> 149 RelativePath="CDemo.cpp">
150 <FileConfiguration 150 <FileConfiguration
151 Name="Release|Win32"> 151 Name="Release|Win32">
152 <Tool 152 <Tool
153 Name="VCCLCompilerTool" 153 Name="VCCLCompilerTool"
154 Optimization="2" 154 Optimization="2"
155 AdditionalIncludeDirectories="" 155 AdditionalIncludeDirectories=""
156 PreprocessorDefinitions=""/> 156 PreprocessorDefinitions=""/>
157 </FileConfiguration> 157 </FileConfiguration>
158 <FileConfiguration 158 <FileConfiguration
159 Name="Debug|Win32"> 159 Name="Debug|Win32">
160 <Tool 160 <Tool
161 Name="VCCLCompilerTool" 161 Name="VCCLCompilerTool"
162 Optimization="0" 162 Optimization="0"
163 AdditionalIncludeDirectories="" 163 AdditionalIncludeDirectories=""
164 PreprocessorDefinitions="" 164 PreprocessorDefinitions=""
165 BasicRuntimeChecks="3"/> 165 BasicRuntimeChecks="3"/>
166 </FileConfiguration> 166 </FileConfiguration>
167 </File> 167 </File>
168 <File 168 <File
169 RelativePath="CDemo.h"> 169 RelativePath="CDemo.h">
170 </File> 170 </File>
171 <File 171 <File
172 RelativePath="CMainMenu.cpp"> 172 RelativePath="CMainMenu.cpp">
173 <FileConfiguration 173 <FileConfiguration
174 Name="Release|Win32"> 174 Name="Release|Win32">
175 <Tool 175 <Tool
176 Name="VCCLCompilerTool" 176 Name="VCCLCompilerTool"
177 Optimization="2" 177 Optimization="2"
178 AdditionalIncludeDirectories="" 178 AdditionalIncludeDirectories=""
179 PreprocessorDefinitions=""/> 179 PreprocessorDefinitions=""/>
180 </FileConfiguration> 180 </FileConfiguration>
181 <FileConfiguration 181 <FileConfiguration
182 Name="Debug|Win32"> 182 Name="Debug|Win32">
183 <Tool 183 <Tool
184 Name="VCCLCompilerTool" 184 Name="VCCLCompilerTool"
185 Optimization="0" 185 Optimization="0"
186 AdditionalIncludeDirectories="" 186 AdditionalIncludeDirectories=""
187 PreprocessorDefinitions="" 187 PreprocessorDefinitions=""
188 BasicRuntimeChecks="3"/> 188 BasicRuntimeChecks="3"/>
189 </FileConfiguration> 189 </FileConfiguration>
190 </File> 190 </File>
191 <File 191 <File
192 RelativePath="CMainMenu.h"> 192 RelativePath="CMainMenu.h">
193 </File> 193 </File>
194 <File 194 <File
195 RelativePath="icon.ico"> 195 RelativePath="icon.ico">
196 </File> 196 </File>
197 <File 197 <File
198 RelativePath="main.cpp"> 198 RelativePath="main.cpp">
199 <FileConfiguration 199 <FileConfiguration
200 Name="Release|Win32"> 200 Name="Release|Win32">
201 <Tool 201 <Tool
202 Name="VCCLCompilerTool" 202 Name="VCCLCompilerTool"
203 Optimization="2" 203 Optimization="2"
204 AdditionalIncludeDirectories="" 204 AdditionalIncludeDirectories=""
205 PreprocessorDefinitions=""/> 205 PreprocessorDefinitions=""/>
206 </FileConfiguration> 206 </FileConfiguration>
207 <FileConfiguration 207 <FileConfiguration
208 Name="Debug|Win32"> 208 Name="Debug|Win32">
209 <Tool 209 <Tool
210 Name="VCCLCompilerTool" 210 Name="VCCLCompilerTool"
211 Optimization="0" 211 Optimization="0"
212 AdditionalIncludeDirectories="" 212 AdditionalIncludeDirectories=""
213 PreprocessorDefinitions="" 213 PreprocessorDefinitions=""
214 BasicRuntimeChecks="3"/> 214 BasicRuntimeChecks="3"/>
215 </FileConfiguration> 215 </FileConfiguration>
216 </File> 216 </File>
217 <File 217 <File
218 RelativePath="resscript.rc"> 218 RelativePath="resscript.rc">
219 </File> 219 </File>
220 </Files> 220 </Files>
221 <Globals> 221 <Globals>
222 </Globals> 222 </Globals>
223</VisualStudioProject> 223</VisualStudioProject>
diff --git a/libraries/irrlicht-1.8/examples/Demo/Demo_vc10.vcxproj b/libraries/irrlicht-1.8/examples/Demo/Demo_vc10.vcxproj
index 73b5a2f..6f5d883 100644
--- a/libraries/irrlicht-1.8/examples/Demo/Demo_vc10.vcxproj
+++ b/libraries/irrlicht-1.8/examples/Demo/Demo_vc10.vcxproj
@@ -1,279 +1,279 @@
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 <ProjectGuid>{6F076455-D955-45D4-9C68-4AD4E45F2D47}</ProjectGuid> 22 <ProjectGuid>{6F076455-D955-45D4-9C68-4AD4E45F2D47}</ProjectGuid>
23 <ProjectName>Demo</ProjectName> 23 <ProjectName>Demo</ProjectName>
24 </PropertyGroup> 24 </PropertyGroup>
25 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 25 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
27 <ConfigurationType>Application</ConfigurationType> 27 <ConfigurationType>Application</ConfigurationType>
28 <CharacterSet>MultiByte</CharacterSet> 28 <CharacterSet>MultiByte</CharacterSet>
29 </PropertyGroup> 29 </PropertyGroup>
30 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 30 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
31 <ConfigurationType>Application</ConfigurationType> 31 <ConfigurationType>Application</ConfigurationType>
32 <CharacterSet>MultiByte</CharacterSet> 32 <CharacterSet>MultiByte</CharacterSet>
33 </PropertyGroup> 33 </PropertyGroup>
34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35 <ConfigurationType>Application</ConfigurationType> 35 <ConfigurationType>Application</ConfigurationType>
36 <CharacterSet>MultiByte</CharacterSet> 36 <CharacterSet>MultiByte</CharacterSet>
37 </PropertyGroup> 37 </PropertyGroup>
38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
39 <ConfigurationType>Application</ConfigurationType> 39 <ConfigurationType>Application</ConfigurationType>
40 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
41 </PropertyGroup> 41 </PropertyGroup>
42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
43 <ImportGroup Label="ExtensionSettings"> 43 <ImportGroup Label="ExtensionSettings">
44 </ImportGroup> 44 </ImportGroup>
45 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 45 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
46 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 46 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
47 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> 47 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
48 </ImportGroup> 48 </ImportGroup>
49 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 49 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
50 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 50 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
51 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> 51 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
52 </ImportGroup> 52 </ImportGroup>
53 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 53 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
54 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 54 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> 55 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
56 </ImportGroup> 56 </ImportGroup>
57 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 57 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
58 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 58 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> 59 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
60 </ImportGroup> 60 </ImportGroup>
61 <PropertyGroup Label="UserMacros" /> 61 <PropertyGroup Label="UserMacros" />
62 <PropertyGroup> 62 <PropertyGroup>
63 <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> 63 <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
64 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> 64 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\Win32-VisualStudio\</OutDir>
65 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\Win64-VisualStudio\</OutDir> 65 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\Win64-VisualStudio\</OutDir>
66 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> 66 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
67 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> 67 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
68 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> 68 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\Win32-VisualStudio\</OutDir>
69 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\Win64-VisualStudio\</OutDir> 69 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\Win64-VisualStudio\</OutDir>
70 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> 70 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
71 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> 71 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
72 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> 72 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
73 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> 73 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
74 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> 74 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
75 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> 75 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
76 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> 76 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
77 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> 77 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
78 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> 78 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
79 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> 79 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
80 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> 80 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
81 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> 81 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
82 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> 82 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
83 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> 83 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
84 </PropertyGroup> 84 </PropertyGroup>
85 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 85 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
86 <Midl> 86 <Midl>
87 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 87 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
88 <MkTypLibCompatible>true</MkTypLibCompatible> 88 <MkTypLibCompatible>true</MkTypLibCompatible>
89 <SuppressStartupBanner>true</SuppressStartupBanner> 89 <SuppressStartupBanner>true</SuppressStartupBanner>
90 <TargetEnvironment>Win32</TargetEnvironment> 90 <TargetEnvironment>Win32</TargetEnvironment>
91 <TypeLibraryName>.\Release/Demo.tlb</TypeLibraryName> 91 <TypeLibraryName>.\Release/Demo.tlb</TypeLibraryName>
92 <HeaderFileName> 92 <HeaderFileName>
93 </HeaderFileName> 93 </HeaderFileName>
94 </Midl> 94 </Midl>
95 <ClCompile> 95 <ClCompile>
96 <Optimization>MaxSpeed</Optimization> 96 <Optimization>MaxSpeed</Optimization>
97 <InlineFunctionExpansion>Default</InlineFunctionExpansion> 97 <InlineFunctionExpansion>Default</InlineFunctionExpansion>
98 <WholeProgramOptimization>false</WholeProgramOptimization> 98 <WholeProgramOptimization>false</WholeProgramOptimization>
99 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 99 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
100 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 100 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(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\Demo.exe</OutputFile> 113 <OutputFile>..\..\bin\Win32-VisualStudio\Demo.exe</OutputFile>
114 <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 114 <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
115 <SubSystem>Windows</SubSystem> 115 <SubSystem>Windows</SubSystem>
116 <DataExecutionPrevention> 116 <DataExecutionPrevention>
117 </DataExecutionPrevention> 117 </DataExecutionPrevention>
118 </Link> 118 </Link>
119 </ItemDefinitionGroup> 119 </ItemDefinitionGroup>
120 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 120 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
121 <Midl> 121 <Midl>
122 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 122 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123 <MkTypLibCompatible>true</MkTypLibCompatible> 123 <MkTypLibCompatible>true</MkTypLibCompatible>
124 <SuppressStartupBanner>true</SuppressStartupBanner> 124 <SuppressStartupBanner>true</SuppressStartupBanner>
125 <TypeLibraryName>.\Release/Demo.tlb</TypeLibraryName> 125 <TypeLibraryName>.\Release/Demo.tlb</TypeLibraryName>
126 <HeaderFileName> 126 <HeaderFileName>
127 </HeaderFileName> 127 </HeaderFileName>
128 </Midl> 128 </Midl>
129 <ClCompile> 129 <ClCompile>
130 <Optimization>MaxSpeed</Optimization> 130 <Optimization>MaxSpeed</Optimization>
131 <InlineFunctionExpansion>Default</InlineFunctionExpansion> 131 <InlineFunctionExpansion>Default</InlineFunctionExpansion>
132 <WholeProgramOptimization>false</WholeProgramOptimization> 132 <WholeProgramOptimization>false</WholeProgramOptimization>
133 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 133 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134 <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 134 <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135 <StringPooling>true</StringPooling> 135 <StringPooling>true</StringPooling>
136 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 136 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
137 <FunctionLevelLinking>true</FunctionLevelLinking> 137 <FunctionLevelLinking>true</FunctionLevelLinking>
138 <PrecompiledHeader> 138 <PrecompiledHeader>
139 </PrecompiledHeader> 139 </PrecompiledHeader>
140 <WarningLevel>Level3</WarningLevel> 140 <WarningLevel>Level3</WarningLevel>
141 </ClCompile> 141 </ClCompile>
142 <ResourceCompile> 142 <ResourceCompile>
143 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 143 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144 <Culture>0x0c07</Culture> 144 <Culture>0x0c07</Culture>
145 </ResourceCompile> 145 </ResourceCompile>
146 <Link> 146 <Link>
147 <OutputFile>..\..\bin\Win32-VisualStudio\Demo.exe</OutputFile> 147 <OutputFile>..\..\bin\Win32-VisualStudio\Demo.exe</OutputFile>
148 <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 148 <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
149 <SubSystem>Windows</SubSystem> 149 <SubSystem>Windows</SubSystem>
150 <DataExecutionPrevention> 150 <DataExecutionPrevention>
151 </DataExecutionPrevention> 151 </DataExecutionPrevention>
152 </Link> 152 </Link>
153 </ItemDefinitionGroup> 153 </ItemDefinitionGroup>
154 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 154 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
155 <Midl> 155 <Midl>
156 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 156 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
157 <MkTypLibCompatible>true</MkTypLibCompatible> 157 <MkTypLibCompatible>true</MkTypLibCompatible>
158 <SuppressStartupBanner>true</SuppressStartupBanner> 158 <SuppressStartupBanner>true</SuppressStartupBanner>
159 <TargetEnvironment>Win32</TargetEnvironment> 159 <TargetEnvironment>Win32</TargetEnvironment>
160 <TypeLibraryName>.\Debug/Demo.tlb</TypeLibraryName> 160 <TypeLibraryName>.\Debug/Demo.tlb</TypeLibraryName>
161 <HeaderFileName> 161 <HeaderFileName>
162 </HeaderFileName> 162 </HeaderFileName>
163 </Midl> 163 </Midl>
164 <ClCompile> 164 <ClCompile>
165 <Optimization>Disabled</Optimization> 165 <Optimization>Disabled</Optimization>
166 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 166 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
167 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 167 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
168 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> 168 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
169 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 169 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
170 <PrecompiledHeader> 170 <PrecompiledHeader>
171 </PrecompiledHeader> 171 </PrecompiledHeader>
172 <WarningLevel>Level3</WarningLevel> 172 <WarningLevel>Level3</WarningLevel>
173 <DebugInformationFormat>EditAndContinue</DebugInformationFormat> 173 <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
174 </ClCompile> 174 </ClCompile>
175 <ResourceCompile> 175 <ResourceCompile>
176 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 176 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
177 <Culture>0x0c07</Culture> 177 <Culture>0x0c07</Culture>
178 </ResourceCompile> 178 </ResourceCompile>
179 <Link> 179 <Link>
180 <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 180 <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
181 <GenerateDebugInformation>true</GenerateDebugInformation> 181 <GenerateDebugInformation>true</GenerateDebugInformation>
182 <SubSystem>Windows</SubSystem> 182 <SubSystem>Windows</SubSystem>
183 <DataExecutionPrevention> 183 <DataExecutionPrevention>
184 </DataExecutionPrevention> 184 </DataExecutionPrevention>
185 </Link> 185 </Link>
186 </ItemDefinitionGroup> 186 </ItemDefinitionGroup>
187 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 187 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
188 <Midl> 188 <Midl>
189 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 189 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
190 <MkTypLibCompatible>true</MkTypLibCompatible> 190 <MkTypLibCompatible>true</MkTypLibCompatible>
191 <SuppressStartupBanner>true</SuppressStartupBanner> 191 <SuppressStartupBanner>true</SuppressStartupBanner>
192 <TypeLibraryName>.\Debug/Demo.tlb</TypeLibraryName> 192 <TypeLibraryName>.\Debug/Demo.tlb</TypeLibraryName>
193 <HeaderFileName> 193 <HeaderFileName>
194 </HeaderFileName> 194 </HeaderFileName>
195 </Midl> 195 </Midl>
196 <ClCompile> 196 <ClCompile>
197 <Optimization>Disabled</Optimization> 197 <Optimization>Disabled</Optimization>
198 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 198 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
199 <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 199 <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
200 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> 200 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
201 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 201 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
202 <PrecompiledHeader> 202 <PrecompiledHeader>
203 </PrecompiledHeader> 203 </PrecompiledHeader>
204 <WarningLevel>Level3</WarningLevel> 204 <WarningLevel>Level3</WarningLevel>
205 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 205 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
206 </ClCompile> 206 </ClCompile>
207 <ResourceCompile> 207 <ResourceCompile>
208 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 208 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
209 <Culture>0x0c07</Culture> 209 <Culture>0x0c07</Culture>
210 </ResourceCompile> 210 </ResourceCompile>
211 <Link> 211 <Link>
212 <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 212 <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
213 <GenerateDebugInformation>true</GenerateDebugInformation> 213 <GenerateDebugInformation>true</GenerateDebugInformation>
214 <SubSystem>Windows</SubSystem> 214 <SubSystem>Windows</SubSystem>
215 <DataExecutionPrevention> 215 <DataExecutionPrevention>
216 </DataExecutionPrevention> 216 </DataExecutionPrevention>
217 </Link> 217 </Link>
218 </ItemDefinitionGroup> 218 </ItemDefinitionGroup>
219 <ItemGroup> 219 <ItemGroup>
220 <ClCompile Include="CDemo.cpp"> 220 <ClCompile Include="CDemo.cpp">
221 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> 221 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
222 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> 222 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
223 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 223 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
224 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 224 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
225 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 225 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
226 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 226 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
227 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> 227 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
228 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> 228 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
229 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> 229 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
230 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> 230 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
231 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 231 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
232 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 232 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
233 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 233 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
234 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 234 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
235 </ClCompile> 235 </ClCompile>
236 <ClCompile Include="CMainMenu.cpp"> 236 <ClCompile Include="CMainMenu.cpp">
237 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> 237 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
238 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> 238 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
239 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 239 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
240 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 240 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
241 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 241 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
242 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 242 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
243 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> 243 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
244 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> 244 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
245 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> 245 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
246 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> 246 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
247 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 247 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
248 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 248 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
249 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 249 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
250 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 250 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
251 </ClCompile> 251 </ClCompile>
252 <ClCompile Include="main.cpp"> 252 <ClCompile Include="main.cpp">
253 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> 253 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
254 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> 254 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
255 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 255 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
256 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 256 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
257 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 257 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
258 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 258 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
259 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> 259 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
260 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> 260 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
261 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> 261 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
262 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> 262 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
263 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 263 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
264 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 264 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
265 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 265 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
266 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 266 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
267 </ClCompile> 267 </ClCompile>
268 </ItemGroup> 268 </ItemGroup>
269 <ItemGroup> 269 <ItemGroup>
270 <ClInclude Include="CDemo.h" /> 270 <ClInclude Include="CDemo.h" />
271 <ClInclude Include="CMainMenu.h" /> 271 <ClInclude Include="CMainMenu.h" />
272 </ItemGroup> 272 </ItemGroup>
273 <ItemGroup> 273 <ItemGroup>
274 <None Include="icon.ico" /> 274 <None Include="icon.ico" />
275 </ItemGroup> 275 </ItemGroup>
276 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 276 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
277 <ImportGroup Label="ExtensionTargets"> 277 <ImportGroup Label="ExtensionTargets">
278 </ImportGroup> 278 </ImportGroup>
279</Project> \ No newline at end of file 279</Project> \ No newline at end of file
diff --git a/libraries/irrlicht-1.8/examples/Demo/Demo_vc11.vcxproj b/libraries/irrlicht-1.8/examples/Demo/Demo_vc11.vcxproj
index ecb5f33..7e0014d 100644
--- a/libraries/irrlicht-1.8/examples/Demo/Demo_vc11.vcxproj
+++ b/libraries/irrlicht-1.8/examples/Demo/Demo_vc11.vcxproj
@@ -1,283 +1,283 @@
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 <ProjectGuid>{6F076455-D955-45D4-9C68-4AD4E45F2D47}</ProjectGuid> 22 <ProjectGuid>{6F076455-D955-45D4-9C68-4AD4E45F2D47}</ProjectGuid>
23 <ProjectName>Demo</ProjectName> 23 <ProjectName>Demo</ProjectName>
24 </PropertyGroup> 24 </PropertyGroup>
25 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 25 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
27 <ConfigurationType>Application</ConfigurationType> 27 <ConfigurationType>Application</ConfigurationType>
28 <CharacterSet>MultiByte</CharacterSet> 28 <CharacterSet>MultiByte</CharacterSet>
29 <PlatformToolset>v110</PlatformToolset> 29 <PlatformToolset>v110</PlatformToolset>
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 <PlatformToolset>v110</PlatformToolset> 34 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 35 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
37 <ConfigurationType>Application</ConfigurationType> 37 <ConfigurationType>Application</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 38 <CharacterSet>MultiByte</CharacterSet>
39 <PlatformToolset>v110</PlatformToolset> 39 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 40 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
42 <ConfigurationType>Application</ConfigurationType> 42 <ConfigurationType>Application</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 43 <CharacterSet>MultiByte</CharacterSet>
44 <PlatformToolset>v110</PlatformToolset> 44 <PlatformToolset>v110</PlatformToolset>
45 </PropertyGroup> 45 </PropertyGroup>
46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
47 <ImportGroup Label="ExtensionSettings"> 47 <ImportGroup Label="ExtensionSettings">
48 </ImportGroup> 48 </ImportGroup>
49 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 49 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
50 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 50 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
51 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> 51 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
52 </ImportGroup> 52 </ImportGroup>
53 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 53 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
54 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 54 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> 55 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
56 </ImportGroup> 56 </ImportGroup>
57 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 57 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
58 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 58 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> 59 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
60 </ImportGroup> 60 </ImportGroup>
61 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 61 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
62 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 62 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> 63 <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
64 </ImportGroup> 64 </ImportGroup>
65 <PropertyGroup Label="UserMacros" /> 65 <PropertyGroup Label="UserMacros" />
66 <PropertyGroup> 66 <PropertyGroup>
67 <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> 67 <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
68 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> 68 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\Win32-VisualStudio\</OutDir>
69 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\Win64-VisualStudio\</OutDir> 69 <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\Win64-VisualStudio\</OutDir>
70 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> 70 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
71 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> 71 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
72 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\Win32-VisualStudio\</OutDir> 72 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\Win32-VisualStudio\</OutDir>
73 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\Win64-VisualStudio\</OutDir> 73 <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\Win64-VisualStudio\</OutDir>
74 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> 74 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
75 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> 75 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
76 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> 76 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
77 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> 77 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
78 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> 78 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
79 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> 79 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
80 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> 80 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
81 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> 81 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
82 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> 82 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
83 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> 83 <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
84 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> 84 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
85 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> 85 <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
86 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> 86 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
87 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> 87 <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
88 </PropertyGroup> 88 </PropertyGroup>
89 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 89 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
90 <Midl> 90 <Midl>
91 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 91 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
92 <MkTypLibCompatible>true</MkTypLibCompatible> 92 <MkTypLibCompatible>true</MkTypLibCompatible>
93 <SuppressStartupBanner>true</SuppressStartupBanner> 93 <SuppressStartupBanner>true</SuppressStartupBanner>
94 <TargetEnvironment>Win32</TargetEnvironment> 94 <TargetEnvironment>Win32</TargetEnvironment>
95 <TypeLibraryName>.\Release/Demo.tlb</TypeLibraryName> 95 <TypeLibraryName>.\Release/Demo.tlb</TypeLibraryName>
96 <HeaderFileName> 96 <HeaderFileName>
97 </HeaderFileName> 97 </HeaderFileName>
98 </Midl> 98 </Midl>
99 <ClCompile> 99 <ClCompile>
100 <Optimization>MaxSpeed</Optimization> 100 <Optimization>MaxSpeed</Optimization>
101 <InlineFunctionExpansion>Default</InlineFunctionExpansion> 101 <InlineFunctionExpansion>Default</InlineFunctionExpansion>
102 <WholeProgramOptimization>false</WholeProgramOptimization> 102 <WholeProgramOptimization>false</WholeProgramOptimization>
103 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 103 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
104 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 104 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105 <StringPooling>true</StringPooling> 105 <StringPooling>true</StringPooling>
106 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 106 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
107 <FunctionLevelLinking>true</FunctionLevelLinking> 107 <FunctionLevelLinking>true</FunctionLevelLinking>
108 <PrecompiledHeader> 108 <PrecompiledHeader>
109 </PrecompiledHeader> 109 </PrecompiledHeader>
110 <WarningLevel>Level3</WarningLevel> 110 <WarningLevel>Level3</WarningLevel>
111 </ClCompile> 111 </ClCompile>
112 <ResourceCompile> 112 <ResourceCompile>
113 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 113 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
114 <Culture>0x0c07</Culture> 114 <Culture>0x0c07</Culture>
115 </ResourceCompile> 115 </ResourceCompile>
116 <Link> 116 <Link>
117 <OutputFile>..\..\bin\Win32-VisualStudio\Demo.exe</OutputFile> 117 <OutputFile>..\..\bin\Win32-VisualStudio\Demo.exe</OutputFile>
118 <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 118 <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
119 <SubSystem>Windows</SubSystem> 119 <SubSystem>Windows</SubSystem>
120 <DataExecutionPrevention> 120 <DataExecutionPrevention>
121 </DataExecutionPrevention> 121 </DataExecutionPrevention>
122 </Link> 122 </Link>
123 </ItemDefinitionGroup> 123 </ItemDefinitionGroup>
124 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 124 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
125 <Midl> 125 <Midl>
126 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 126 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127 <MkTypLibCompatible>true</MkTypLibCompatible> 127 <MkTypLibCompatible>true</MkTypLibCompatible>
128 <SuppressStartupBanner>true</SuppressStartupBanner> 128 <SuppressStartupBanner>true</SuppressStartupBanner>
129 <TypeLibraryName>.\Release/Demo.tlb</TypeLibraryName> 129 <TypeLibraryName>.\Release/Demo.tlb</TypeLibraryName>
130 <HeaderFileName> 130 <HeaderFileName>
131 </HeaderFileName> 131 </HeaderFileName>
132 </Midl> 132 </Midl>
133 <ClCompile> 133 <ClCompile>
134 <Optimization>MaxSpeed</Optimization> 134 <Optimization>MaxSpeed</Optimization>
135 <InlineFunctionExpansion>Default</InlineFunctionExpansion> 135 <InlineFunctionExpansion>Default</InlineFunctionExpansion>
136 <WholeProgramOptimization>false</WholeProgramOptimization> 136 <WholeProgramOptimization>false</WholeProgramOptimization>
137 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 137 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
138 <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 138 <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139 <StringPooling>true</StringPooling> 139 <StringPooling>true</StringPooling>
140 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 140 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
141 <FunctionLevelLinking>true</FunctionLevelLinking> 141 <FunctionLevelLinking>true</FunctionLevelLinking>
142 <PrecompiledHeader> 142 <PrecompiledHeader>
143 </PrecompiledHeader> 143 </PrecompiledHeader>
144 <WarningLevel>Level3</WarningLevel> 144 <WarningLevel>Level3</WarningLevel>
145 </ClCompile> 145 </ClCompile>
146 <ResourceCompile> 146 <ResourceCompile>
147 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 147 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148 <Culture>0x0c07</Culture> 148 <Culture>0x0c07</Culture>
149 </ResourceCompile> 149 </ResourceCompile>
150 <Link> 150 <Link>
151 <OutputFile>..\..\bin\Win32-VisualStudio\Demo.exe</OutputFile> 151 <OutputFile>..\..\bin\Win32-VisualStudio\Demo.exe</OutputFile>
152 <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 152 <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
153 <SubSystem>Windows</SubSystem> 153 <SubSystem>Windows</SubSystem>
154 <DataExecutionPrevention> 154 <DataExecutionPrevention>
155 </DataExecutionPrevention> 155 </DataExecutionPrevention>
156 </Link> 156 </Link>
157 </ItemDefinitionGroup> 157 </ItemDefinitionGroup>
158 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 158 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
159 <Midl> 159 <Midl>
160 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 160 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
161 <MkTypLibCompatible>true</MkTypLibCompatible> 161 <MkTypLibCompatible>true</MkTypLibCompatible>
162 <SuppressStartupBanner>true</SuppressStartupBanner> 162 <SuppressStartupBanner>true</SuppressStartupBanner>
163 <TargetEnvironment>Win32</TargetEnvironment> 163 <TargetEnvironment>Win32</TargetEnvironment>
164 <TypeLibraryName>.\Debug/Demo.tlb</TypeLibraryName> 164 <TypeLibraryName>.\Debug/Demo.tlb</TypeLibraryName>
165 <HeaderFileName> 165 <HeaderFileName>
166 </HeaderFileName> 166 </HeaderFileName>
167 </Midl> 167 </Midl>
168 <ClCompile> 168 <ClCompile>
169 <Optimization>Disabled</Optimization> 169 <Optimization>Disabled</Optimization>
170 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 170 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 171 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
172 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> 172 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
173 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 173 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
174 <PrecompiledHeader> 174 <PrecompiledHeader>
175 </PrecompiledHeader> 175 </PrecompiledHeader>
176 <WarningLevel>Level3</WarningLevel> 176 <WarningLevel>Level3</WarningLevel>
177 <DebugInformationFormat>EditAndContinue</DebugInformationFormat> 177 <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
178 </ClCompile> 178 </ClCompile>
179 <ResourceCompile> 179 <ResourceCompile>
180 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 180 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
181 <Culture>0x0c07</Culture> 181 <Culture>0x0c07</Culture>
182 </ResourceCompile> 182 </ResourceCompile>
183 <Link> 183 <Link>
184 <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 184 <AdditionalLibraryDirectories>..\..\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
185 <GenerateDebugInformation>true</GenerateDebugInformation> 185 <GenerateDebugInformation>true</GenerateDebugInformation>
186 <SubSystem>Windows</SubSystem> 186 <SubSystem>Windows</SubSystem>
187 <DataExecutionPrevention> 187 <DataExecutionPrevention>
188 </DataExecutionPrevention> 188 </DataExecutionPrevention>
189 </Link> 189 </Link>
190 </ItemDefinitionGroup> 190 </ItemDefinitionGroup>
191 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 191 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
192 <Midl> 192 <Midl>
193 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 193 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194 <MkTypLibCompatible>true</MkTypLibCompatible> 194 <MkTypLibCompatible>true</MkTypLibCompatible>
195 <SuppressStartupBanner>true</SuppressStartupBanner> 195 <SuppressStartupBanner>true</SuppressStartupBanner>
196 <TypeLibraryName>.\Debug/Demo.tlb</TypeLibraryName> 196 <TypeLibraryName>.\Debug/Demo.tlb</TypeLibraryName>
197 <HeaderFileName> 197 <HeaderFileName>
198 </HeaderFileName> 198 </HeaderFileName>
199 </Midl> 199 </Midl>
200 <ClCompile> 200 <ClCompile>
201 <Optimization>Disabled</Optimization> 201 <Optimization>Disabled</Optimization>
202 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 202 <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
203 <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 203 <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
204 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> 204 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
205 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 205 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
206 <PrecompiledHeader> 206 <PrecompiledHeader>
207 </PrecompiledHeader> 207 </PrecompiledHeader>
208 <WarningLevel>Level3</WarningLevel> 208 <WarningLevel>Level3</WarningLevel>
209 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 209 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
210 </ClCompile> 210 </ClCompile>
211 <ResourceCompile> 211 <ResourceCompile>
212 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> 212 <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
213 <Culture>0x0c07</Culture> 213 <Culture>0x0c07</Culture>
214 </ResourceCompile> 214 </ResourceCompile>
215 <Link> 215 <Link>
216 <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 216 <AdditionalLibraryDirectories>..\..\lib\Win64-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
217 <GenerateDebugInformation>true</GenerateDebugInformation> 217 <GenerateDebugInformation>true</GenerateDebugInformation>
218 <SubSystem>Windows</SubSystem> 218 <SubSystem>Windows</SubSystem>
219 <DataExecutionPrevention> 219 <DataExecutionPrevention>
220 </DataExecutionPrevention> 220 </DataExecutionPrevention>
221 </Link> 221 </Link>
222 </ItemDefinitionGroup> 222 </ItemDefinitionGroup>
223 <ItemGroup> 223 <ItemGroup>
224 <ClCompile Include="CDemo.cpp"> 224 <ClCompile Include="CDemo.cpp">
225 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> 225 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
226 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> 226 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
227 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 227 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
228 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 228 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
229 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 229 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
230 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 230 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
231 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> 231 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
232 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> 232 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
233 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> 233 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
234 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> 234 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
235 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 235 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
236 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 236 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
237 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 237 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
238 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 238 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
239 </ClCompile> 239 </ClCompile>
240 <ClCompile Include="CMainMenu.cpp"> 240 <ClCompile Include="CMainMenu.cpp">
241 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> 241 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
242 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> 242 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
243 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 243 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
244 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 244 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
245 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 245 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
246 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 246 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
247 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> 247 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
248 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> 248 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
249 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> 249 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
250 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> 250 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
251 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 251 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
252 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 252 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
253 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 253 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
254 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 254 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
255 </ClCompile> 255 </ClCompile>
256 <ClCompile Include="main.cpp"> 256 <ClCompile Include="main.cpp">
257 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> 257 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
258 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> 258 <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
259 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 259 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
260 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 260 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
261 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 261 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
262 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 262 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
263 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> 263 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
264 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> 264 <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
265 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> 265 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
266 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> 266 <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
267 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 267 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
268 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 268 <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
269 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 269 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
270 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> 270 <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
271 </ClCompile> 271 </ClCompile>
272 </ItemGroup> 272 </ItemGroup>
273 <ItemGroup> 273 <ItemGroup>
274 <ClInclude Include="CDemo.h" /> 274 <ClInclude Include="CDemo.h" />
275 <ClInclude Include="CMainMenu.h" /> 275 <ClInclude Include="CMainMenu.h" />
276 </ItemGroup> 276 </ItemGroup>
277 <ItemGroup> 277 <ItemGroup>
278 <None Include="icon.ico" /> 278 <None Include="icon.ico" />
279 </ItemGroup> 279 </ItemGroup>
280 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 280 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
281 <ImportGroup Label="ExtensionTargets"> 281 <ImportGroup Label="ExtensionTargets">
282 </ImportGroup> 282 </ImportGroup>
283</Project> \ No newline at end of file 283</Project> \ No newline at end of file
diff --git a/libraries/irrlicht-1.8/examples/Demo/Demo_vc8.vcproj b/libraries/irrlicht-1.8/examples/Demo/Demo_vc8.vcproj
index 5504310..650e686 100644
--- a/libraries/irrlicht-1.8/examples/Demo/Demo_vc8.vcproj
+++ b/libraries/irrlicht-1.8/examples/Demo/Demo_vc8.vcproj
@@ -1,300 +1,300 @@
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="Demo_vc8" 5 Name="Demo_vc8"
6 ProjectGUID="{6F076455-D955-45D4-9C68-4AD4E45F2D47}" 6 ProjectGUID="{6F076455-D955-45D4-9C68-4AD4E45F2D47}"
7 > 7 >
8 <Platforms> 8 <Platforms>
9 <Platform 9 <Platform
10 Name="Win32" 10 Name="Win32"
11 /> 11 />
12 </Platforms> 12 </Platforms>
13 <ToolFiles> 13 <ToolFiles>
14 </ToolFiles> 14 </ToolFiles>
15 <Configurations> 15 <Configurations>
16 <Configuration 16 <Configuration
17 Name="Release|Win32" 17 Name="Release|Win32"
18 OutputDirectory=".\Release" 18 OutputDirectory=".\Release"
19 IntermediateDirectory=".\Release" 19 IntermediateDirectory=".\Release"
20 ConfigurationType="1" 20 ConfigurationType="1"
21 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 21 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
22 UseOfMFC="0" 22 UseOfMFC="0"
23 ATLMinimizesCRunTimeLibraryUsage="false" 23 ATLMinimizesCRunTimeLibraryUsage="false"
24 CharacterSet="2" 24 CharacterSet="2"
25 > 25 >
26 <Tool 26 <Tool
27 Name="VCPreBuildEventTool" 27 Name="VCPreBuildEventTool"
28 /> 28 />
29 <Tool 29 <Tool
30 Name="VCCustomBuildTool" 30 Name="VCCustomBuildTool"
31 /> 31 />
32 <Tool 32 <Tool
33 Name="VCXMLDataGeneratorTool" 33 Name="VCXMLDataGeneratorTool"
34 /> 34 />
35 <Tool 35 <Tool
36 Name="VCWebServiceProxyGeneratorTool" 36 Name="VCWebServiceProxyGeneratorTool"
37 /> 37 />
38 <Tool 38 <Tool
39 Name="VCMIDLTool" 39 Name="VCMIDLTool"
40 PreprocessorDefinitions="NDEBUG" 40 PreprocessorDefinitions="NDEBUG"
41 MkTypLibCompatible="true" 41 MkTypLibCompatible="true"
42 SuppressStartupBanner="true" 42 SuppressStartupBanner="true"
43 TargetEnvironment="1" 43 TargetEnvironment="1"
44 TypeLibraryName=".\Release/Demo.tlb" 44 TypeLibraryName=".\Release/Demo.tlb"
45 HeaderFileName="" 45 HeaderFileName=""
46 /> 46 />
47 <Tool 47 <Tool
48 Name="VCCLCompilerTool" 48 Name="VCCLCompilerTool"
49 Optimization="2" 49 Optimization="2"
50 InlineFunctionExpansion="1" 50 InlineFunctionExpansion="1"
51 AdditionalIncludeDirectories="..\..\include" 51 AdditionalIncludeDirectories="..\..\include"
52 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" 52 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
53 StringPooling="true" 53 StringPooling="true"
54 RuntimeLibrary="0" 54 RuntimeLibrary="0"
55 EnableFunctionLevelLinking="true" 55 EnableFunctionLevelLinking="true"
56 UsePrecompiledHeader="0" 56 UsePrecompiledHeader="0"
57 PrecompiledHeaderFile=".\Release/Demo.pch" 57 PrecompiledHeaderFile=".\Release/Demo.pch"
58 AssemblerListingLocation=".\Release/" 58 AssemblerListingLocation=".\Release/"
59 ObjectFile=".\Release/" 59 ObjectFile=".\Release/"
60 ProgramDataBaseFileName=".\Release/" 60 ProgramDataBaseFileName=".\Release/"
61 WarningLevel="3" 61 WarningLevel="3"
62 SuppressStartupBanner="true" 62 SuppressStartupBanner="true"
63 CompileAs="0" 63 CompileAs="0"
64 /> 64 />
65 <Tool 65 <Tool
66 Name="VCManagedResourceCompilerTool" 66 Name="VCManagedResourceCompilerTool"
67 /> 67 />
68 <Tool 68 <Tool
69 Name="VCResourceCompilerTool" 69 Name="VCResourceCompilerTool"
70 PreprocessorDefinitions="NDEBUG" 70 PreprocessorDefinitions="NDEBUG"
71 Culture="3079" 71 Culture="3079"
72 /> 72 />
73 <Tool 73 <Tool
74 Name="VCPreLinkEventTool" 74 Name="VCPreLinkEventTool"
75 /> 75 />
76 <Tool 76 <Tool
77 Name="VCLinkerTool" 77 Name="VCLinkerTool"
78 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe" 78 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe"
79 LinkIncremental="0" 79 LinkIncremental="0"
80 SuppressStartupBanner="true" 80 SuppressStartupBanner="true"
81 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" 81 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
82 ProgramDatabaseFile=".\Release/Demo.pdb" 82 ProgramDatabaseFile=".\Release/Demo.pdb"
83 SubSystem="2" 83 SubSystem="2"
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="VCWebDeploymentTool" 105 Name="VCWebDeploymentTool"
106 /> 106 />
107 <Tool 107 <Tool
108 Name="VCPostBuildEventTool" 108 Name="VCPostBuildEventTool"
109 /> 109 />
110 </Configuration> 110 </Configuration>
111 <Configuration 111 <Configuration
112 Name="Debug|Win32" 112 Name="Debug|Win32"
113 OutputDirectory=".\Debug" 113 OutputDirectory=".\Debug"
114 IntermediateDirectory=".\Debug" 114 IntermediateDirectory=".\Debug"
115 ConfigurationType="1" 115 ConfigurationType="1"
116 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 116 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
117 UseOfMFC="0" 117 UseOfMFC="0"
118 ATLMinimizesCRunTimeLibraryUsage="false" 118 ATLMinimizesCRunTimeLibraryUsage="false"
119 CharacterSet="2" 119 CharacterSet="2"
120 > 120 >
121 <Tool 121 <Tool
122 Name="VCPreBuildEventTool" 122 Name="VCPreBuildEventTool"
123 /> 123 />
124 <Tool 124 <Tool
125 Name="VCCustomBuildTool" 125 Name="VCCustomBuildTool"
126 /> 126 />
127 <Tool 127 <Tool
128 Name="VCXMLDataGeneratorTool" 128 Name="VCXMLDataGeneratorTool"
129 /> 129 />
130 <Tool 130 <Tool
131 Name="VCWebServiceProxyGeneratorTool" 131 Name="VCWebServiceProxyGeneratorTool"
132 /> 132 />
133 <Tool 133 <Tool
134 Name="VCMIDLTool" 134 Name="VCMIDLTool"
135 PreprocessorDefinitions="_DEBUG" 135 PreprocessorDefinitions="_DEBUG"
136 MkTypLibCompatible="true" 136 MkTypLibCompatible="true"
137 SuppressStartupBanner="true" 137 SuppressStartupBanner="true"
138 TargetEnvironment="1" 138 TargetEnvironment="1"
139 TypeLibraryName=".\Debug/Demo.tlb" 139 TypeLibraryName=".\Debug/Demo.tlb"
140 HeaderFileName="" 140 HeaderFileName=""
141 /> 141 />
142 <Tool 142 <Tool
143 Name="VCCLCompilerTool" 143 Name="VCCLCompilerTool"
144 Optimization="0" 144 Optimization="0"
145 AdditionalIncludeDirectories="..\..\include" 145 AdditionalIncludeDirectories="..\..\include"
146 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" 146 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
147 BasicRuntimeChecks="3" 147 BasicRuntimeChecks="3"
148 RuntimeLibrary="1" 148 RuntimeLibrary="1"
149 UsePrecompiledHeader="0" 149 UsePrecompiledHeader="0"
150 PrecompiledHeaderFile=".\Debug/Demo.pch" 150 PrecompiledHeaderFile=".\Debug/Demo.pch"
151 AssemblerListingLocation=".\Debug/" 151 AssemblerListingLocation=".\Debug/"
152 ObjectFile=".\Debug/" 152 ObjectFile=".\Debug/"
153 ProgramDataBaseFileName=".\Debug/" 153 ProgramDataBaseFileName=".\Debug/"
154 WarningLevel="3" 154 WarningLevel="3"
155 SuppressStartupBanner="true" 155 SuppressStartupBanner="true"
156 DebugInformationFormat="4" 156 DebugInformationFormat="4"
157 CompileAs="0" 157 CompileAs="0"
158 /> 158 />
159 <Tool 159 <Tool
160 Name="VCManagedResourceCompilerTool" 160 Name="VCManagedResourceCompilerTool"
161 /> 161 />
162 <Tool 162 <Tool
163 Name="VCResourceCompilerTool" 163 Name="VCResourceCompilerTool"
164 PreprocessorDefinitions="_DEBUG" 164 PreprocessorDefinitions="_DEBUG"
165 Culture="3079" 165 Culture="3079"
166 /> 166 />
167 <Tool 167 <Tool
168 Name="VCPreLinkEventTool" 168 Name="VCPreLinkEventTool"
169 /> 169 />
170 <Tool 170 <Tool
171 Name="VCLinkerTool" 171 Name="VCLinkerTool"
172 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe" 172 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe"
173 LinkIncremental="0" 173 LinkIncremental="0"
174 SuppressStartupBanner="true" 174 SuppressStartupBanner="true"
175 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" 175 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
176 GenerateDebugInformation="true" 176 GenerateDebugInformation="true"
177 ProgramDatabaseFile=".\Debug/Demo.pdb" 177 ProgramDatabaseFile=".\Debug/Demo.pdb"
178 SubSystem="2" 178 SubSystem="2"
179 TargetMachine="1" 179 TargetMachine="1"
180 /> 180 />
181 <Tool 181 <Tool
182 Name="VCALinkTool" 182 Name="VCALinkTool"
183 /> 183 />
184 <Tool 184 <Tool
185 Name="VCManifestTool" 185 Name="VCManifestTool"
186 /> 186 />
187 <Tool 187 <Tool
188 Name="VCXDCMakeTool" 188 Name="VCXDCMakeTool"
189 /> 189 />
190 <Tool 190 <Tool
191 Name="VCBscMakeTool" 191 Name="VCBscMakeTool"
192 /> 192 />
193 <Tool 193 <Tool
194 Name="VCFxCopTool" 194 Name="VCFxCopTool"
195 /> 195 />
196 <Tool 196 <Tool
197 Name="VCAppVerifierTool" 197 Name="VCAppVerifierTool"
198 /> 198 />
199 <Tool 199 <Tool
200 Name="VCWebDeploymentTool" 200 Name="VCWebDeploymentTool"
201 /> 201 />
202 <Tool 202 <Tool
203 Name="VCPostBuildEventTool" 203 Name="VCPostBuildEventTool"
204 /> 204 />
205 </Configuration> 205 </Configuration>
206 </Configurations> 206 </Configurations>
207 <References> 207 <References>
208 </References> 208 </References>
209 <Files> 209 <Files>
210 <File 210 <File
211 RelativePath="CDemo.cpp" 211 RelativePath="CDemo.cpp"
212 > 212 >
213 <FileConfiguration 213 <FileConfiguration
214 Name="Release|Win32" 214 Name="Release|Win32"
215 > 215 >
216 <Tool 216 <Tool
217 Name="VCCLCompilerTool" 217 Name="VCCLCompilerTool"
218 Optimization="2" 218 Optimization="2"
219 AdditionalIncludeDirectories="" 219 AdditionalIncludeDirectories=""
220 PreprocessorDefinitions="" 220 PreprocessorDefinitions=""
221 /> 221 />
222 </FileConfiguration> 222 </FileConfiguration>
223 <FileConfiguration 223 <FileConfiguration
224 Name="Debug|Win32" 224 Name="Debug|Win32"
225 > 225 >
226 <Tool 226 <Tool
227 Name="VCCLCompilerTool" 227 Name="VCCLCompilerTool"
228 Optimization="0" 228 Optimization="0"
229 AdditionalIncludeDirectories="" 229 AdditionalIncludeDirectories=""
230 PreprocessorDefinitions="" 230 PreprocessorDefinitions=""
231 BasicRuntimeChecks="3" 231 BasicRuntimeChecks="3"
232 /> 232 />
233 </FileConfiguration> 233 </FileConfiguration>
234 </File> 234 </File>
235 <File 235 <File
236 RelativePath="CDemo.h" 236 RelativePath="CDemo.h"
237 > 237 >
238 </File> 238 </File>
239 <File 239 <File
240 RelativePath="CMainMenu.cpp" 240 RelativePath="CMainMenu.cpp"
241 > 241 >
242 <FileConfiguration 242 <FileConfiguration
243 Name="Release|Win32" 243 Name="Release|Win32"
244 > 244 >
245 <Tool 245 <Tool
246 Name="VCCLCompilerTool" 246 Name="VCCLCompilerTool"
247 Optimization="2" 247 Optimization="2"
248 AdditionalIncludeDirectories="" 248 AdditionalIncludeDirectories=""
249 PreprocessorDefinitions="" 249 PreprocessorDefinitions=""
250 /> 250 />
251 </FileConfiguration> 251 </FileConfiguration>
252 <FileConfiguration 252 <FileConfiguration
253 Name="Debug|Win32" 253 Name="Debug|Win32"
254 > 254 >
255 <Tool 255 <Tool
256 Name="VCCLCompilerTool" 256 Name="VCCLCompilerTool"
257 Optimization="0" 257 Optimization="0"
258 AdditionalIncludeDirectories="" 258 AdditionalIncludeDirectories=""
259 PreprocessorDefinitions="" 259 PreprocessorDefinitions=""
260 BasicRuntimeChecks="3" 260 BasicRuntimeChecks="3"
261 /> 261 />
262 </FileConfiguration> 262 </FileConfiguration>
263 </File> 263 </File>
264 <File 264 <File
265 RelativePath="CMainMenu.h" 265 RelativePath="CMainMenu.h"
266 > 266 >
267 </File> 267 </File>
268 <File 268 <File
269 RelativePath="icon.ico" 269 RelativePath="icon.ico"
270 > 270 >
271 </File> 271 </File>
272 <File 272 <File
273 RelativePath="main.cpp" 273 RelativePath="main.cpp"
274 > 274 >
275 <FileConfiguration 275 <FileConfiguration
276 Name="Release|Win32" 276 Name="Release|Win32"
277 > 277 >
278 <Tool 278 <Tool
279 Name="VCCLCompilerTool" 279 Name="VCCLCompilerTool"
280 Optimization="2" 280 Optimization="2"
281 AdditionalIncludeDirectories="" 281 AdditionalIncludeDirectories=""
282 PreprocessorDefinitions="" 282 PreprocessorDefinitions=""
283 /> 283 />
284 </FileConfiguration> 284 </FileConfiguration>
285 <FileConfiguration 285 <FileConfiguration
286 Name="Debug|Win32" 286 Name="Debug|Win32"
287 > 287 >
288 <Tool 288 <Tool
289 Name="VCCLCompilerTool" 289 Name="VCCLCompilerTool"
290 Optimization="0" 290 Optimization="0"
291 AdditionalIncludeDirectories="" 291 AdditionalIncludeDirectories=""
292 PreprocessorDefinitions="" 292 PreprocessorDefinitions=""
293 BasicRuntimeChecks="3" 293 BasicRuntimeChecks="3"
294 /> 294 />
295 </FileConfiguration> 295 </FileConfiguration>
296 </File> 296 </File>
297 </Files> 297 </Files>
298 <Globals> 298 <Globals>
299 </Globals> 299 </Globals>
300</VisualStudioProject> 300</VisualStudioProject>
diff --git a/libraries/irrlicht-1.8/examples/Demo/Demo_vc9.vcproj b/libraries/irrlicht-1.8/examples/Demo/Demo_vc9.vcproj
index e0052aa..f1c1da6 100644
--- a/libraries/irrlicht-1.8/examples/Demo/Demo_vc9.vcproj
+++ b/libraries/irrlicht-1.8/examples/Demo/Demo_vc9.vcproj
@@ -1,300 +1,300 @@
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="Demo_vc9" 5 Name="Demo_vc9"
6 ProjectGUID="{6F076455-D955-45D4-9C68-4AD4E45F2D47}" 6 ProjectGUID="{6F076455-D955-45D4-9C68-4AD4E45F2D47}"
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 PreprocessorDefinitions="NDEBUG" 41 PreprocessorDefinitions="NDEBUG"
42 MkTypLibCompatible="true" 42 MkTypLibCompatible="true"
43 SuppressStartupBanner="true" 43 SuppressStartupBanner="true"
44 TargetEnvironment="1" 44 TargetEnvironment="1"
45 TypeLibraryName=".\Release/Demo.tlb" 45 TypeLibraryName=".\Release/Demo.tlb"
46 HeaderFileName="" 46 HeaderFileName=""
47 /> 47 />
48 <Tool 48 <Tool
49 Name="VCCLCompilerTool" 49 Name="VCCLCompilerTool"
50 Optimization="2" 50 Optimization="2"
51 InlineFunctionExpansion="0" 51 InlineFunctionExpansion="0"
52 WholeProgramOptimization="false" 52 WholeProgramOptimization="false"
53 AdditionalIncludeDirectories="..\..\include" 53 AdditionalIncludeDirectories="..\..\include"
54 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" 54 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
55 StringPooling="true" 55 StringPooling="true"
56 RuntimeLibrary="0" 56 RuntimeLibrary="0"
57 EnableFunctionLevelLinking="true" 57 EnableFunctionLevelLinking="true"
58 UsePrecompiledHeader="0" 58 UsePrecompiledHeader="0"
59 PrecompiledHeaderFile=".\Release/Demo.pch" 59 PrecompiledHeaderFile=".\Release/Demo.pch"
60 AssemblerListingLocation=".\Release/" 60 AssemblerListingLocation=".\Release/"
61 ObjectFile=".\Release/" 61 ObjectFile=".\Release/"
62 ProgramDataBaseFileName=".\Release/" 62 ProgramDataBaseFileName=".\Release/"
63 WarningLevel="3" 63 WarningLevel="3"
64 SuppressStartupBanner="true" 64 SuppressStartupBanner="true"
65 CompileAs="0" 65 CompileAs="0"
66 /> 66 />
67 <Tool 67 <Tool
68 Name="VCManagedResourceCompilerTool" 68 Name="VCManagedResourceCompilerTool"
69 /> 69 />
70 <Tool 70 <Tool
71 Name="VCResourceCompilerTool" 71 Name="VCResourceCompilerTool"
72 PreprocessorDefinitions="NDEBUG" 72 PreprocessorDefinitions="NDEBUG"
73 Culture="3079" 73 Culture="3079"
74 /> 74 />
75 <Tool 75 <Tool
76 Name="VCPreLinkEventTool" 76 Name="VCPreLinkEventTool"
77 /> 77 />
78 <Tool 78 <Tool
79 Name="VCLinkerTool" 79 Name="VCLinkerTool"
80 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe" 80 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe"
81 LinkIncremental="0" 81 LinkIncremental="0"
82 SuppressStartupBanner="true" 82 SuppressStartupBanner="true"
83 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" 83 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
84 ProgramDatabaseFile=".\Release/Demo.pdb" 84 ProgramDatabaseFile=".\Release/Demo.pdb"
85 SubSystem="2" 85 SubSystem="2"
86 RandomizedBaseAddress="1" 86 RandomizedBaseAddress="1"
87 DataExecutionPrevention="0" 87 DataExecutionPrevention="0"
88 TargetMachine="1" 88 TargetMachine="1"
89 /> 89 />
90 <Tool 90 <Tool
91 Name="VCALinkTool" 91 Name="VCALinkTool"
92 /> 92 />
93 <Tool 93 <Tool
94 Name="VCManifestTool" 94 Name="VCManifestTool"
95 /> 95 />
96 <Tool 96 <Tool
97 Name="VCXDCMakeTool" 97 Name="VCXDCMakeTool"
98 /> 98 />
99 <Tool 99 <Tool
100 Name="VCBscMakeTool" 100 Name="VCBscMakeTool"
101 /> 101 />
102 <Tool 102 <Tool
103 Name="VCFxCopTool" 103 Name="VCFxCopTool"
104 /> 104 />
105 <Tool 105 <Tool
106 Name="VCAppVerifierTool" 106 Name="VCAppVerifierTool"
107 /> 107 />
108 <Tool 108 <Tool
109 Name="VCPostBuildEventTool" 109 Name="VCPostBuildEventTool"
110 /> 110 />
111 </Configuration> 111 </Configuration>
112 <Configuration 112 <Configuration
113 Name="Debug|Win32" 113 Name="Debug|Win32"
114 OutputDirectory=".\Debug" 114 OutputDirectory=".\Debug"
115 IntermediateDirectory=".\Debug" 115 IntermediateDirectory=".\Debug"
116 ConfigurationType="1" 116 ConfigurationType="1"
117 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 117 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
118 UseOfMFC="0" 118 UseOfMFC="0"
119 ATLMinimizesCRunTimeLibraryUsage="false" 119 ATLMinimizesCRunTimeLibraryUsage="false"
120 CharacterSet="2" 120 CharacterSet="2"
121 > 121 >
122 <Tool 122 <Tool
123 Name="VCPreBuildEventTool" 123 Name="VCPreBuildEventTool"
124 /> 124 />
125 <Tool 125 <Tool
126 Name="VCCustomBuildTool" 126 Name="VCCustomBuildTool"
127 /> 127 />
128 <Tool 128 <Tool
129 Name="VCXMLDataGeneratorTool" 129 Name="VCXMLDataGeneratorTool"
130 /> 130 />
131 <Tool 131 <Tool
132 Name="VCWebServiceProxyGeneratorTool" 132 Name="VCWebServiceProxyGeneratorTool"
133 /> 133 />
134 <Tool 134 <Tool
135 Name="VCMIDLTool" 135 Name="VCMIDLTool"
136 PreprocessorDefinitions="_DEBUG" 136 PreprocessorDefinitions="_DEBUG"
137 MkTypLibCompatible="true" 137 MkTypLibCompatible="true"
138 SuppressStartupBanner="true" 138 SuppressStartupBanner="true"
139 TargetEnvironment="1" 139 TargetEnvironment="1"
140 TypeLibraryName=".\Debug/Demo.tlb" 140 TypeLibraryName=".\Debug/Demo.tlb"
141 HeaderFileName="" 141 HeaderFileName=""
142 /> 142 />
143 <Tool 143 <Tool
144 Name="VCCLCompilerTool" 144 Name="VCCLCompilerTool"
145 Optimization="0" 145 Optimization="0"
146 AdditionalIncludeDirectories="..\..\include" 146 AdditionalIncludeDirectories="..\..\include"
147 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" 147 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
148 BasicRuntimeChecks="3" 148 BasicRuntimeChecks="3"
149 RuntimeLibrary="1" 149 RuntimeLibrary="1"
150 UsePrecompiledHeader="0" 150 UsePrecompiledHeader="0"
151 PrecompiledHeaderFile=".\Debug/Demo.pch" 151 PrecompiledHeaderFile=".\Debug/Demo.pch"
152 AssemblerListingLocation=".\Debug/" 152 AssemblerListingLocation=".\Debug/"
153 ObjectFile=".\Debug/" 153 ObjectFile=".\Debug/"
154 ProgramDataBaseFileName=".\Debug/" 154 ProgramDataBaseFileName=".\Debug/"
155 WarningLevel="3" 155 WarningLevel="3"
156 SuppressStartupBanner="true" 156 SuppressStartupBanner="true"
157 DebugInformationFormat="4" 157 DebugInformationFormat="4"
158 CompileAs="0" 158 CompileAs="0"
159 /> 159 />
160 <Tool 160 <Tool
161 Name="VCManagedResourceCompilerTool" 161 Name="VCManagedResourceCompilerTool"
162 /> 162 />
163 <Tool 163 <Tool
164 Name="VCResourceCompilerTool" 164 Name="VCResourceCompilerTool"
165 PreprocessorDefinitions="_DEBUG" 165 PreprocessorDefinitions="_DEBUG"
166 Culture="3079" 166 Culture="3079"
167 /> 167 />
168 <Tool 168 <Tool
169 Name="VCPreLinkEventTool" 169 Name="VCPreLinkEventTool"
170 /> 170 />
171 <Tool 171 <Tool
172 Name="VCLinkerTool" 172 Name="VCLinkerTool"
173 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe" 173 OutputFile="..\..\bin\Win32-VisualStudio\Demo.exe"
174 LinkIncremental="0" 174 LinkIncremental="0"
175 SuppressStartupBanner="true" 175 SuppressStartupBanner="true"
176 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio" 176 AdditionalLibraryDirectories="..\..\lib\Win32-visualstudio"
177 GenerateDebugInformation="true" 177 GenerateDebugInformation="true"
178 ProgramDatabaseFile=".\Debug/Demo.pdb" 178 ProgramDatabaseFile=".\Debug/Demo.pdb"
179 SubSystem="2" 179 SubSystem="2"
180 RandomizedBaseAddress="1" 180 RandomizedBaseAddress="1"
181 DataExecutionPrevention="0" 181 DataExecutionPrevention="0"
182 TargetMachine="1" 182 TargetMachine="1"
183 /> 183 />
184 <Tool 184 <Tool
185 Name="VCALinkTool" 185 Name="VCALinkTool"
186 /> 186 />
187 <Tool 187 <Tool
188 Name="VCManifestTool" 188 Name="VCManifestTool"
189 /> 189 />
190 <Tool 190 <Tool
191 Name="VCXDCMakeTool" 191 Name="VCXDCMakeTool"
192 /> 192 />
193 <Tool 193 <Tool
194 Name="VCBscMakeTool" 194 Name="VCBscMakeTool"
195 /> 195 />
196 <Tool 196 <Tool
197 Name="VCFxCopTool" 197 Name="VCFxCopTool"
198 /> 198 />
199 <Tool 199 <Tool
200 Name="VCAppVerifierTool" 200 Name="VCAppVerifierTool"
201 /> 201 />
202 <Tool 202 <Tool
203 Name="VCPostBuildEventTool" 203 Name="VCPostBuildEventTool"
204 /> 204 />
205 </Configuration> 205 </Configuration>
206 </Configurations> 206 </Configurations>
207 <References> 207 <References>
208 </References> 208 </References>
209 <Files> 209 <Files>
210 <File 210 <File
211 RelativePath="CDemo.cpp" 211 RelativePath="CDemo.cpp"
212 > 212 >
213 <FileConfiguration 213 <FileConfiguration
214 Name="Release|Win32" 214 Name="Release|Win32"
215 > 215 >
216 <Tool 216 <Tool
217 Name="VCCLCompilerTool" 217 Name="VCCLCompilerTool"
218 Optimization="2" 218 Optimization="2"
219 AdditionalIncludeDirectories="" 219 AdditionalIncludeDirectories=""
220 PreprocessorDefinitions="" 220 PreprocessorDefinitions=""
221 /> 221 />
222 </FileConfiguration> 222 </FileConfiguration>
223 <FileConfiguration 223 <FileConfiguration
224 Name="Debug|Win32" 224 Name="Debug|Win32"
225 > 225 >
226 <Tool 226 <Tool
227 Name="VCCLCompilerTool" 227 Name="VCCLCompilerTool"
228 Optimization="0" 228 Optimization="0"
229 AdditionalIncludeDirectories="" 229 AdditionalIncludeDirectories=""
230 PreprocessorDefinitions="" 230 PreprocessorDefinitions=""
231 BasicRuntimeChecks="3" 231 BasicRuntimeChecks="3"
232 /> 232 />
233 </FileConfiguration> 233 </FileConfiguration>
234 </File> 234 </File>
235 <File 235 <File
236 RelativePath="CDemo.h" 236 RelativePath="CDemo.h"
237 > 237 >
238 </File> 238 </File>
239 <File 239 <File
240 RelativePath="CMainMenu.cpp" 240 RelativePath="CMainMenu.cpp"
241 > 241 >
242 <FileConfiguration 242 <FileConfiguration
243 Name="Release|Win32" 243 Name="Release|Win32"
244 > 244 >
245 <Tool 245 <Tool
246 Name="VCCLCompilerTool" 246 Name="VCCLCompilerTool"
247 Optimization="2" 247 Optimization="2"
248 AdditionalIncludeDirectories="" 248 AdditionalIncludeDirectories=""
249 PreprocessorDefinitions="" 249 PreprocessorDefinitions=""
250 /> 250 />
251 </FileConfiguration> 251 </FileConfiguration>
252 <FileConfiguration 252 <FileConfiguration
253 Name="Debug|Win32" 253 Name="Debug|Win32"
254 > 254 >
255 <Tool 255 <Tool
256 Name="VCCLCompilerTool" 256 Name="VCCLCompilerTool"
257 Optimization="0" 257 Optimization="0"
258 AdditionalIncludeDirectories="" 258 AdditionalIncludeDirectories=""
259 PreprocessorDefinitions="" 259 PreprocessorDefinitions=""
260 BasicRuntimeChecks="3" 260 BasicRuntimeChecks="3"
261 /> 261 />
262 </FileConfiguration> 262 </FileConfiguration>
263 </File> 263 </File>
264 <File 264 <File
265 RelativePath="CMainMenu.h" 265 RelativePath="CMainMenu.h"
266 > 266 >
267 </File> 267 </File>
268 <File 268 <File
269 RelativePath="icon.ico" 269 RelativePath="icon.ico"
270 > 270 >
271 </File> 271 </File>
272 <File 272 <File
273 RelativePath="main.cpp" 273 RelativePath="main.cpp"
274 > 274 >
275 <FileConfiguration 275 <FileConfiguration
276 Name="Release|Win32" 276 Name="Release|Win32"
277 > 277 >
278 <Tool 278 <Tool
279 Name="VCCLCompilerTool" 279 Name="VCCLCompilerTool"
280 Optimization="2" 280 Optimization="2"
281 AdditionalIncludeDirectories="" 281 AdditionalIncludeDirectories=""
282 PreprocessorDefinitions="" 282 PreprocessorDefinitions=""
283 /> 283 />
284 </FileConfiguration> 284 </FileConfiguration>
285 <FileConfiguration 285 <FileConfiguration
286 Name="Debug|Win32" 286 Name="Debug|Win32"
287 > 287 >
288 <Tool 288 <Tool
289 Name="VCCLCompilerTool" 289 Name="VCCLCompilerTool"
290 Optimization="0" 290 Optimization="0"
291 AdditionalIncludeDirectories="" 291 AdditionalIncludeDirectories=""
292 PreprocessorDefinitions="" 292 PreprocessorDefinitions=""
293 BasicRuntimeChecks="3" 293 BasicRuntimeChecks="3"
294 /> 294 />
295 </FileConfiguration> 295 </FileConfiguration>
296 </File> 296 </File>
297 </Files> 297 </Files>
298 <Globals> 298 <Globals>
299 </Globals> 299 </Globals>
300</VisualStudioProject> 300</VisualStudioProject>
diff --git a/libraries/irrlicht-1.8/examples/Demo/Makefile b/libraries/irrlicht-1.8/examples/Demo/Makefile
index 1577ac9..5a45876 100644
--- a/libraries/irrlicht-1.8/examples/Demo/Makefile
+++ b/libraries/irrlicht-1.8/examples/Demo/Makefile
@@ -1,43 +1,43 @@
1# Irrlicht Engine Demo Makefile 1# Irrlicht Engine Demo Makefile
2Target = Demo 2Target = Demo
3Sources = CDemo.cpp CMainMenu.cpp main.cpp 3Sources = CDemo.cpp CMainMenu.cpp main.cpp
4 4
5CPPFLAGS = -I../../include -I/usr/X11R6/include 5CPPFLAGS = -I../../include -I/usr/X11R6/include
6CXXFLAGS = -Wall -O3 -ffast-math 6CXXFLAGS = -Wall -O3 -ffast-math
7 7
8ifeq ($(HOSTTYPE), x86_64) 8ifeq ($(HOSTTYPE), x86_64)
9LIBSELECT=64 9LIBSELECT=64
10endif 10endif
11 11
12all: all_linux 12all: all_linux
13 13
14# target specific settings 14# target specific settings
15all_linux: SYSTEM=Linux 15all_linux: SYSTEM=Linux
16all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor 16all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
17 17
18all_win32 clean_win32: SYSTEM=Win32-gcc 18all_win32 clean_win32: SYSTEM=Win32-gcc
19all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm 19all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm
20 20
21# if you enable sound add the proper library for linking 21# if you enable sound add the proper library for linking
22#LDFLAGS += -lIrrKlang 22#LDFLAGS += -lIrrKlang
23#LDFLAGS += -laudiere 23#LDFLAGS += -laudiere
24#LDFLAGS += -lSDL_mixer -lSDL 24#LDFLAGS += -lSDL_mixer -lSDL
25 25
26all_win32 clean_win32: SUF=.exe 26all_win32 clean_win32: SUF=.exe
27# name of the binary - only valid for targets which set SYSTEM 27# name of the binary - only valid for targets which set SYSTEM
28DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF) 28DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
29 29
30OBJ = $(Sources:.cpp=.o) 30OBJ = $(Sources:.cpp=.o)
31 31
32all_linux all_win32: $(OBJ) 32all_linux all_win32: $(OBJ)
33 $(warning Building...) 33 $(warning Building...)
34 $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $(DESTPATH) $(LDFLAGS) 34 $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $(DESTPATH) $(LDFLAGS)
35 35
36clean: clean_linux clean_win32 36clean: clean_linux clean_win32
37 $(warning Cleaning...) 37 $(warning Cleaning...)
38 @$(RM) $(OBJ) 38 @$(RM) $(OBJ)
39 39
40clean_linux clean_win32: 40clean_linux clean_win32:
41 @$(RM) $(DESTPATH) 41 @$(RM) $(DESTPATH)
42 42
43.PHONY: all all_win32 clean clean_linux clean_win32 43.PHONY: all all_win32 clean clean_linux clean_win32
diff --git a/libraries/irrlicht-1.8/examples/Demo/demo.dev b/libraries/irrlicht-1.8/examples/Demo/demo.dev
index 9e1b4c0..c2aae64 100644
--- a/libraries/irrlicht-1.8/examples/Demo/demo.dev
+++ b/libraries/irrlicht-1.8/examples/Demo/demo.dev
@@ -1,99 +1,99 @@
1[Project] 1[Project]
2FileName=demo.dev 2FileName=demo.dev
3Name=Irrlicht Tech Demo 3Name=Irrlicht Tech Demo
4UnitCount=5 4UnitCount=5
5Type=1 5Type=1
6Ver=1 6Ver=1
7ObjFiles= 7ObjFiles=
8Includes=..\..\include 8Includes=..\..\include
9Libs= 9Libs=
10PrivateResource= 10PrivateResource=
11ResourceIncludes= 11ResourceIncludes=
12MakeIncludes= 12MakeIncludes=
13Compiler= 13Compiler=
14CppCompiler= 14CppCompiler=
15Linker=../../lib/Win32-gcc/libIrrlicht.a_@@_ 15Linker=../../lib/Win32-gcc/libIrrlicht.a_@@_
16IsCpp=1 16IsCpp=1
17Icon= 17Icon=
18ExeOutput=../../bin/Win32-gcc 18ExeOutput=../../bin/Win32-gcc
19ObjectOutput=obj 19ObjectOutput=obj
20OverrideOutput=1 20OverrideOutput=1
21OverrideOutputName=Demo.exe 21OverrideOutputName=Demo.exe
22HostApplication= 22HostApplication=
23Folders= 23Folders=
24CommandLine= 24CommandLine=
25IncludeVersionInfo=0 25IncludeVersionInfo=0
26SupportXPThemes=0 26SupportXPThemes=0
27CompilerSet=0 27CompilerSet=0
28CompilerSettings=0000000000000000000000 28CompilerSettings=0000000000000000000000
29UseCustomMakefile=0 29UseCustomMakefile=0
30CustomMakefile= 30CustomMakefile=
31 31
32[Unit1] 32[Unit1]
33FileName=main.cpp 33FileName=main.cpp
34CompileCpp=1 34CompileCpp=1
35Folder=Projekt1 35Folder=Projekt1
36Compile=1 36Compile=1
37Link=1 37Link=1
38Priority=1000 38Priority=1000
39OverrideBuildCmd=0 39OverrideBuildCmd=0
40BuildCmd= 40BuildCmd=
41 41
42[VersionInfo] 42[VersionInfo]
43Major=0 43Major=0
44Minor=1 44Minor=1
45Release=1 45Release=1
46Build=1 46Build=1
47LanguageID=1033 47LanguageID=1033
48CharsetID=1252 48CharsetID=1252
49CompanyName= 49CompanyName=
50FileVersion= 50FileVersion=
51FileDescription=Irrlicht Engine example compiled using DevCpp and gcc 51FileDescription=Irrlicht Engine example compiled using DevCpp and gcc
52InternalName= 52InternalName=
53LegalCopyright= 53LegalCopyright=
54LegalTrademarks= 54LegalTrademarks=
55OriginalFilename= 55OriginalFilename=
56ProductName= 56ProductName=
57ProductVersion= 57ProductVersion=
58AutoIncBuildNr=0 58AutoIncBuildNr=0
59 59
60[Unit2] 60[Unit2]
61FileName=CDemo.h 61FileName=CDemo.h
62CompileCpp=1 62CompileCpp=1
63Folder=Irrlicht Tech Demo 63Folder=Irrlicht Tech Demo
64Compile=1 64Compile=1
65Link=1 65Link=1
66Priority=1000 66Priority=1000
67OverrideBuildCmd=0 67OverrideBuildCmd=0
68BuildCmd= 68BuildCmd=
69 69
70[Unit3] 70[Unit3]
71FileName=CMainMenu.cpp 71FileName=CMainMenu.cpp
72CompileCpp=1 72CompileCpp=1
73Folder=Irrlicht Tech Demo 73Folder=Irrlicht Tech Demo
74Compile=1 74Compile=1
75Link=1 75Link=1
76Priority=1000 76Priority=1000
77OverrideBuildCmd=0 77OverrideBuildCmd=0
78BuildCmd= 78BuildCmd=
79 79
80[Unit4] 80[Unit4]
81FileName=CMainMenu.h 81FileName=CMainMenu.h
82CompileCpp=1 82CompileCpp=1
83Folder=Irrlicht Tech Demo 83Folder=Irrlicht Tech Demo
84Compile=1 84Compile=1
85Link=1 85Link=1
86Priority=1000 86Priority=1000
87OverrideBuildCmd=0 87OverrideBuildCmd=0
88BuildCmd= 88BuildCmd=
89 89
90[Unit5] 90[Unit5]
91FileName=CDemo.cpp 91FileName=CDemo.cpp
92CompileCpp=1 92CompileCpp=1
93Folder=Irrlicht Tech Demo 93Folder=Irrlicht Tech Demo
94Compile=1 94Compile=1
95Link=1 95Link=1
96Priority=1000 96Priority=1000
97OverrideBuildCmd=0 97OverrideBuildCmd=0
98BuildCmd= 98BuildCmd=
99 99
diff --git a/libraries/irrlicht-1.8/examples/Demo/main.cpp b/libraries/irrlicht-1.8/examples/Demo/main.cpp
index 3d26999..a21b48e 100644
--- a/libraries/irrlicht-1.8/examples/Demo/main.cpp
+++ b/libraries/irrlicht-1.8/examples/Demo/main.cpp
@@ -1,49 +1,49 @@
1// This is a Demo of the Irrlicht Engine (c) 2005-2009 by N.Gebhardt. 1// This is a Demo of the Irrlicht Engine (c) 2005-2009 by N.Gebhardt.
2// This file is not documented. 2// This file is not documented.
3 3
4#include <irrlicht.h> 4#include <irrlicht.h>
5#ifdef _IRR_WINDOWS_ 5#ifdef _IRR_WINDOWS_
6#include <windows.h> 6#include <windows.h>
7#endif 7#endif
8 8
9#include <stdio.h> 9#include <stdio.h>
10 10
11#include "CMainMenu.h" 11#include "CMainMenu.h"
12#include "CDemo.h" 12#include "CDemo.h"
13 13
14using namespace irr; 14using namespace irr;
15 15
16#ifdef _WIN32 16#ifdef _WIN32
17 17
18#pragma comment(lib, "Irrlicht.lib") 18#pragma comment(lib, "Irrlicht.lib")
19INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT ) 19INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
20#else 20#else
21int main(int argc, char* argv[]) 21int main(int argc, char* argv[])
22#endif 22#endif
23{ 23{
24 bool fullscreen = false; 24 bool fullscreen = false;
25 bool music = true; 25 bool music = true;
26 bool shadows = false; 26 bool shadows = false;
27 bool additive = false; 27 bool additive = false;
28 bool vsync = false; 28 bool vsync = false;
29 bool aa = false; 29 bool aa = false;
30 30
31#ifndef _IRR_WINDOWS_ 31#ifndef _IRR_WINDOWS_
32 video::E_DRIVER_TYPE driverType = video::EDT_OPENGL; 32 video::E_DRIVER_TYPE driverType = video::EDT_OPENGL;
33#else 33#else
34 video::E_DRIVER_TYPE driverType = video::EDT_DIRECT3D9; 34 video::E_DRIVER_TYPE driverType = video::EDT_DIRECT3D9;
35#endif 35#endif
36 36
37 CMainMenu menu; 37 CMainMenu menu;
38 38
39//#ifndef _DEBUG 39//#ifndef _DEBUG
40 if (menu.run(fullscreen, music, shadows, additive, vsync, aa, driverType)) 40 if (menu.run(fullscreen, music, shadows, additive, vsync, aa, driverType))
41//#endif 41//#endif
42 { 42 {
43 CDemo demo(fullscreen, music, shadows, additive, vsync, aa, driverType); 43 CDemo demo(fullscreen, music, shadows, additive, vsync, aa, driverType);
44 demo.run(); 44 demo.run();
45 } 45 }
46 46
47 return 0; 47 return 0;
48} 48}
49 49
diff --git a/libraries/irrlicht-1.8/examples/Demo/resource.h b/libraries/irrlicht-1.8/examples/Demo/resource.h
index eb3b976..8e6c760 100644
--- a/libraries/irrlicht-1.8/examples/Demo/resource.h
+++ b/libraries/irrlicht-1.8/examples/Demo/resource.h
@@ -1,16 +1,16 @@
1//{{NO_DEPENDENCIES}} 1//{{NO_DEPENDENCIES}}
2// Microsoft Developer Studio generated include file. 2// Microsoft Developer Studio generated include file.
3// Used by resscript.rc 3// Used by resscript.rc
4// 4//
5#define IDI_ICON1 101 5#define IDI_ICON1 101
6 6
7// Next default values for new objects 7// Next default values for new objects
8// 8//
9#ifdef APSTUDIO_INVOKED 9#ifdef APSTUDIO_INVOKED
10#ifndef APSTUDIO_READONLY_SYMBOLS 10#ifndef APSTUDIO_READONLY_SYMBOLS
11#define _APS_NEXT_RESOURCE_VALUE 102 11#define _APS_NEXT_RESOURCE_VALUE 102
12#define _APS_NEXT_COMMAND_VALUE 40001 12#define _APS_NEXT_COMMAND_VALUE 40001
13#define _APS_NEXT_CONTROL_VALUE 1000 13#define _APS_NEXT_CONTROL_VALUE 1000
14#define _APS_NEXT_SYMED_VALUE 101 14#define _APS_NEXT_SYMED_VALUE 101
15#endif 15#endif
16#endif 16#endif
diff --git a/libraries/irrlicht-1.8/examples/Demo/resscript.rc b/libraries/irrlicht-1.8/examples/Demo/resscript.rc
index be12eb7..e439524 100644
--- a/libraries/irrlicht-1.8/examples/Demo/resscript.rc
+++ b/libraries/irrlicht-1.8/examples/Demo/resscript.rc
@@ -1,72 +1,72 @@
1//Microsoft Developer Studio generated resource script. 1//Microsoft Developer Studio generated resource script.
2// 2//
3#include "resource.h" 3#include "resource.h"
4 4
5#define APSTUDIO_READONLY_SYMBOLS 5#define APSTUDIO_READONLY_SYMBOLS
6///////////////////////////////////////////////////////////////////////////// 6/////////////////////////////////////////////////////////////////////////////
7// 7//
8// Generated from the TEXTINCLUDE 2 resource. 8// Generated from the TEXTINCLUDE 2 resource.
9// 9//
10#include "afxres.h" 10#include "afxres.h"
11 11
12///////////////////////////////////////////////////////////////////////////// 12/////////////////////////////////////////////////////////////////////////////
13#undef APSTUDIO_READONLY_SYMBOLS 13#undef APSTUDIO_READONLY_SYMBOLS
14 14
15///////////////////////////////////////////////////////////////////////////// 15/////////////////////////////////////////////////////////////////////////////
16// Deutsch (Österreich) resources 16// Deutsch (Österreich) resources
17 17
18#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA) 18#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)
19#ifdef _WIN32 19#ifdef _WIN32
20LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN 20LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
21#pragma code_page(1252) 21#pragma code_page(1252)
22#endif //_WIN32 22#endif //_WIN32
23 23
24#ifdef APSTUDIO_INVOKED 24#ifdef APSTUDIO_INVOKED
25///////////////////////////////////////////////////////////////////////////// 25/////////////////////////////////////////////////////////////////////////////
26// 26//
27// TEXTINCLUDE 27// TEXTINCLUDE
28// 28//
29 29
301 TEXTINCLUDE DISCARDABLE 301 TEXTINCLUDE DISCARDABLE
31BEGIN 31BEGIN
32 "resource.h\0" 32 "resource.h\0"
33END 33END
34 34
352 TEXTINCLUDE DISCARDABLE 352 TEXTINCLUDE DISCARDABLE
36BEGIN 36BEGIN
37 "#include ""afxres.h""\r\n" 37 "#include ""afxres.h""\r\n"
38 "\0" 38 "\0"
39END 39END
40 40
413 TEXTINCLUDE DISCARDABLE 413 TEXTINCLUDE DISCARDABLE
42BEGIN 42BEGIN
43 "\r\n" 43 "\r\n"
44 "\0" 44 "\0"
45END 45END
46 46
47#endif // APSTUDIO_INVOKED 47#endif // APSTUDIO_INVOKED
48 48
49 49
50///////////////////////////////////////////////////////////////////////////// 50/////////////////////////////////////////////////////////////////////////////
51// 51//
52// Icon 52// Icon
53// 53//
54 54
55// Icon with lowest ID value placed first to ensure application icon 55// Icon with lowest ID value placed first to ensure application icon
56// remains consistent on all systems. 56// remains consistent on all systems.
57IDI_ICON1 ICON DISCARDABLE "icon.ico" 57IDI_ICON1 ICON DISCARDABLE "icon.ico"
58#endif // Deutsch (Österreich) resources 58#endif // Deutsch (Österreich) resources
59///////////////////////////////////////////////////////////////////////////// 59/////////////////////////////////////////////////////////////////////////////
60 60
61 61
62 62
63#ifndef APSTUDIO_INVOKED 63#ifndef APSTUDIO_INVOKED
64///////////////////////////////////////////////////////////////////////////// 64/////////////////////////////////////////////////////////////////////////////
65// 65//
66// Generated from the TEXTINCLUDE 3 resource. 66// Generated from the TEXTINCLUDE 3 resource.
67// 67//
68 68
69 69
70///////////////////////////////////////////////////////////////////////////// 70/////////////////////////////////////////////////////////////////////////////
71#endif // not APSTUDIO_INVOKED 71#endif // not APSTUDIO_INVOKED
72 72
generated by cgit v1.1 at 2024-07-06 15:36:38 +0000