Commit ae25bdf2 authored by hybrid's avatar hybrid

Merged from 1.8 branch, revisions 4345-4378. All release fixes since the...

Merged from 1.8 branch, revisions 4345-4378. All release fixes since the branch to 1.8, and some fixes after that. Now commencing development on this branch, and only bug fixes on the others.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4379 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 36ad2bb9
This diff is collapsed.
Copyright (C) 2002-2012 Nikolaus Gebhardt
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Please note that the Irrlicht Engine is based in part on the work of the
Independent JPEG Group, the zlib, libPng and aesGladman. This means that if you use
the Irrlicht Engine in your product, you must acknowledge somewhere in your
documentation that you've used the IJPG code. It would also be nice to mention
that you use the Irrlicht Engine, the zlib, libPng and aesGladman. See the
corresponding license files for further informations. It is also possible to disable
usage of those additional libraries by defines in the IrrCompileConfig.h header and
recompiling the engine.
This diff is collapsed.
This copy of the libpng notices is provided for your convenience. In case of
any discrepancy between this copy and the notices in the file png.h that is
included in the libpng distribution, the latter shall prevail.
COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.5.9, February 18, 2012, are
Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
Cosmin Truta
libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.0.6
with the following individuals added to the list of Contributing Authors
Simon-Pierre Cadieux
Eric S. Raymond
Gilles Vollant
and with the following additions to the disclaimer:
There is no warranty against interference with your enjoyment of the
library or against infringement. There is no warranty that our
efforts or the library will fulfill any of your particular purposes
or needs. This library is provided with all faults, and the entire
risk of satisfactory quality, performance, accuracy, and effort is with
the user.
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-0.96,
with the following individuals added to the list of Contributing Authors:
Tom Lane
Glenn Randers-Pehrson
Willem van Schaik
libpng versions 0.89, June 1996, through 0.96, May 1997, are
Copyright (c) 1996, 1997 Andreas Dilger
Distributed according to the same disclaimer and license as libpng-0.88,
with the following individuals added to the list of Contributing Authors:
John Bowler
Kevin Bracey
Sam Bushell
Magnus Holmgren
Greg Roelofs
Tom Tanner
libpng versions 0.5, May 1995, through 0.88, January 1996, are
Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
For the purposes of this copyright and license, "Contributing Authors"
is defined as the following set of individuals:
Andreas Dilger
Dave Martindale
Guy Eric Schalnat
Paul Schmidt
Tim Wegner
The PNG Reference Library is supplied "AS IS". The Contributing Authors
and Group 42, Inc. disclaim all warranties, expressed or implied,
including, without limitation, the warranties of merchantability and of
fitness for any purpose. The Contributing Authors and Group 42, Inc.
assume no liability for direct, indirect, incidental, special, exemplary,
or consequential damages, which may result from the use of the PNG
Reference Library, even if advised of the possibility of such damage.
Permission is hereby granted to use, copy, modify, and distribute this
source code, or portions hereof, for any purpose, without fee, subject
to the following restrictions:
1. The origin of this source code must not be misrepresented.
2. Altered versions must be plainly marked as such and must not
be misrepresented as being the original source.
3. This Copyright notice may not be removed or altered from any
source or altered source distribution.
The Contributing Authors and Group 42, Inc. specifically permit, without
fee, and encourage the use of this source code as a component to
supporting the PNG file format in commercial products. If you use this
source code in a product, acknowledgment is not required but would be
appreciated.
A "png_get_copyright" function is available, for convenient use in "about"
boxes and the like:
printf("%s",png_get_copyright(NULL));
Also, the PNG logo (in PNG format, of course) is supplied in the
files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a
certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
February 18, 2012
...@@ -8,11 +8,10 @@ ...@@ -8,11 +8,10 @@
<Build> <Build>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/HelloWorld" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\HelloWorld" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -20,32 +19,28 @@ ...@@ -20,32 +19,28 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/HelloWorld" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\HelloWorld" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../lib/Win32-gcc" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc/" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
<VirtualTargets> <VirtualTargets>
<Add alias="All" targets="Windows;Linux" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
......
...@@ -8,11 +8,10 @@ ...@@ -8,11 +8,10 @@
<Build> <Build>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/QuakeMap" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\QuakeMap" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -20,31 +19,28 @@ ...@@ -20,31 +19,28 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/Quake3Map" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\Quake3Map" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-Wall" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
<VirtualTargets> <VirtualTargets>
<Add alias="All" targets="Windows;Linux" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +49,7 @@ ...@@ -53,6 +49,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,12 +8,11 @@ ...@@ -8,12 +8,11 @@
<Build> <Build>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/CustomSceneNode" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\CustomSceneNode" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -21,20 +20,20 @@ ...@@ -21,20 +20,20 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux/" /> <Add directory="..\..\lib\Linux\" />
</Linker> </Linker>
</Target> </Target>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/CustomSceneNode" prefix_auto="1" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\CustomSceneNode" prefix_auto="1" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc/" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,13 +41,12 @@ ...@@ -42,13 +41,12 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../bin/gcc" /> <Add directory="..\..\bin\gcc" />
</Linker> </Linker>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
......
...@@ -7,44 +7,40 @@ ...@@ -7,44 +7,40 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option output="../../bin/Win32-gcc/Movement" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\Movement" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/Movement" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\Movement" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-W" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
<VirtualTargets> <VirtualTargets>
<Add alias="All" targets="Windows;Linux" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
......
...@@ -8,33 +8,30 @@ ...@@ -8,33 +8,30 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/gcc/UserInterface" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\UserInterface" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/UserInterface" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\UserInterface" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,9 +39,8 @@ ...@@ -42,9 +39,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +49,7 @@ ...@@ -53,6 +49,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -43,6 +43,19 @@ enum ...@@ -43,6 +43,19 @@ enum
GUI_ID_TRANSPARENCY_SCROLL_BAR GUI_ID_TRANSPARENCY_SCROLL_BAR
}; };
/*
Set the skin transparency by changing the alpha values of all skin-colors
*/
void setSkinTransparency(s32 alpha, irr::gui::IGUISkin * skin)
{
for (s32 i=0; i<irr::gui::EGDC_COUNT ; ++i)
{
video::SColor col = skin->getColor((EGUI_DEFAULT_COLOR)i);
col.setAlpha(alpha);
skin->setColor((EGUI_DEFAULT_COLOR)i, col);
}
}
/* /*
The Event Receiver is not only capable of getting keyboard and The Event Receiver is not only capable of getting keyboard and
mouse input events, but also events of the graphical user interface mouse input events, but also events of the graphical user interface
...@@ -81,14 +94,7 @@ public: ...@@ -81,14 +94,7 @@ public:
if (id == GUI_ID_TRANSPARENCY_SCROLL_BAR) if (id == GUI_ID_TRANSPARENCY_SCROLL_BAR)
{ {
s32 pos = ((IGUIScrollBar*)event.GUIEvent.Caller)->getPos(); s32 pos = ((IGUIScrollBar*)event.GUIEvent.Caller)->getPos();
setSkinTransparency(pos, env->getSkin());
for (u32 i=0; i<EGDC_COUNT ; ++i)
{
SColor col = env->getSkin()->getColor((EGUI_DEFAULT_COLOR)i);
col.setAlpha(pos);
env->getSkin()->setColor((EGUI_DEFAULT_COLOR)i, col);
}
} }
break; break;
...@@ -232,6 +238,8 @@ int main() ...@@ -232,6 +238,8 @@ int main()
IGUIScrollBar* scrollbar = env->addScrollBar(true, IGUIScrollBar* scrollbar = env->addScrollBar(true,
rect<s32>(150, 45, 350, 60), 0, GUI_ID_TRANSPARENCY_SCROLL_BAR); rect<s32>(150, 45, 350, 60), 0, GUI_ID_TRANSPARENCY_SCROLL_BAR);
scrollbar->setMax(255); scrollbar->setMax(255);
scrollbar->setPos(255);
setSkinTransparency( scrollbar->getPos(), env->getSkin());
// set scrollbar position to alpha value of an arbitrary element // set scrollbar position to alpha value of an arbitrary element
scrollbar->setPos(env->getSkin()->getColor(EGDC_WINDOW).getAlpha()); scrollbar->setPos(env->getSkin()->getColor(EGDC_WINDOW).getAlpha());
......
...@@ -8,33 +8,30 @@ ...@@ -8,33 +8,30 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/2DGraphics" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\2DGraphics" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/2DGraphics" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\2DGraphics" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,9 +39,8 @@ ...@@ -42,9 +39,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +49,7 @@ ...@@ -53,6 +49,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,33 +8,30 @@ ...@@ -8,33 +8,30 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/Collision" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\Collision" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/Collision" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\Collision" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,9 +39,8 @@ ...@@ -42,9 +39,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +49,7 @@ ...@@ -53,6 +49,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,33 +8,29 @@ ...@@ -8,33 +8,29 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/SpecialFX" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\SpecialFX" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/SpeciaFX" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\SpeciaFX" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,9 +38,8 @@ ...@@ -42,9 +38,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +48,7 @@ ...@@ -53,6 +48,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -269,6 +269,7 @@ int main() ...@@ -269,6 +269,7 @@ int main()
scene::ICameraSceneNode* camera = smgr->addCameraSceneNodeFPS(); scene::ICameraSceneNode* camera = smgr->addCameraSceneNodeFPS();
camera->setPosition(core::vector3df(-50,50,-150)); camera->setPosition(core::vector3df(-50,50,-150));
camera->setFarValue(10000.0f); // this increase a shadow visible range.
// disable mouse cursor // disable mouse cursor
device->getCursorControl()->setVisible(false); device->getCursorControl()->setVisible(false);
......
...@@ -8,24 +8,22 @@ ...@@ -8,24 +8,22 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/MeshViewer" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\MeshViewer" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option output="../../bin/Linux/MeshViewer" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\MeshViewer" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -33,7 +31,7 @@ ...@@ -33,7 +31,7 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -41,9 +39,8 @@ ...@@ -41,9 +39,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -52,6 +49,7 @@ ...@@ -52,6 +49,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,25 +8,23 @@ ...@@ -8,25 +8,23 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/Shaders" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\Shaders" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/Shaders" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\Shaders" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -34,7 +32,7 @@ ...@@ -34,7 +32,7 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,9 +40,8 @@ ...@@ -42,9 +40,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +50,7 @@ ...@@ -53,6 +50,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-W" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="..\..\lib\Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
...@@ -28,7 +27,6 @@ ...@@ -28,7 +27,6 @@
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-W" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
...@@ -43,7 +41,6 @@ ...@@ -43,7 +41,6 @@
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-W" />
<Add directory="..\..\include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
......
...@@ -8,22 +8,20 @@ ...@@ -8,22 +8,20 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/TerrainRendering" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\TerrainRendering" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/TerrainRendering" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\TerrainRendering" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
...@@ -34,7 +32,7 @@ ...@@ -34,7 +32,7 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,9 +40,8 @@ ...@@ -42,9 +40,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +50,7 @@ ...@@ -53,6 +50,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,33 +8,30 @@ ...@@ -8,33 +8,30 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/RenderToTexture" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\RenderToTexture" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/RenderToTexture" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\RenderToTexture" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,9 +39,8 @@ ...@@ -42,9 +39,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +49,7 @@ ...@@ -53,6 +49,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -9,18 +9,17 @@ ...@@ -9,18 +9,17 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/Win32Window" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\Win32Window" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectCompilerOptionsRelation="0" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="gdi32" /> <Add library="gdi32" />
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -28,9 +27,8 @@ ...@@ -28,9 +27,8 @@
<Add alias="All" targets="Windows;" /> <Add alias="All" targets="Windows;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
......
...@@ -8,34 +8,29 @@ ...@@ -8,34 +8,29 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/LoadIrrFile" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\LoadIrrFile" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/LoadIrrFile" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\LoadIrrFile" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option use_console_runner="0" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -43,9 +38,8 @@ ...@@ -43,9 +38,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -54,6 +48,7 @@ ...@@ -54,6 +48,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,34 +8,31 @@ ...@@ -8,34 +8,31 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/Q3MapShader" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\Q3MapShader" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="..\..\lib\Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/Q3MapShader" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\Q3MapShader" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-W" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -43,9 +40,8 @@ ...@@ -43,9 +40,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -54,6 +50,7 @@ ...@@ -54,6 +50,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,33 +8,30 @@ ...@@ -8,33 +8,30 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/SplitScreen" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\SplitScreen" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/SplitScreen" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\SplitScreen" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,9 +39,8 @@ ...@@ -42,9 +39,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +49,7 @@ ...@@ -53,6 +49,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,25 +8,23 @@ ...@@ -8,25 +8,23 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/gcc/MouseAndJoystick" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\MouseAndJoystick" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/MouseAndJoystick" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\MouseAndJoystick" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -34,7 +32,7 @@ ...@@ -34,7 +32,7 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,9 +40,8 @@ ...@@ -42,9 +40,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +50,7 @@ ...@@ -53,6 +50,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,26 +8,24 @@ ...@@ -8,26 +8,24 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/ManagedLights" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\ManagedLights" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/ManagedLights" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\ManagedLights" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -35,7 +33,7 @@ ...@@ -35,7 +33,7 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -43,9 +41,8 @@ ...@@ -43,9 +41,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -54,6 +51,7 @@ ...@@ -54,6 +51,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,11 +8,10 @@ ...@@ -8,11 +8,10 @@
<Build> <Build>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/Quake3Explorer" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\Quake3Explorer" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -20,22 +19,19 @@ ...@@ -20,22 +19,19 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/Quake3Explorer" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\Quake3Explorer" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../lib/Win32-gcc" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc/" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -43,9 +39,8 @@ ...@@ -43,9 +39,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
......
...@@ -8,33 +8,30 @@ ...@@ -8,33 +8,30 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/MaterialViewer" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\MaterialViewer" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/MaterialViewer" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\MaterialViewer" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -42,9 +39,8 @@ ...@@ -42,9 +39,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -53,6 +49,7 @@ ...@@ -53,6 +49,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,25 +8,28 @@ ...@@ -8,25 +8,28 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/SMeshHandling" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\SMeshHandling" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
</Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/SMeshHandling" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\SMeshHandling" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
......
...@@ -222,7 +222,9 @@ public: ...@@ -222,7 +222,9 @@ public:
} }
Mesh->MeshBuffers.erase(i,Mesh->getMeshBufferCount()-i); Mesh->MeshBuffers.erase(i,Mesh->getMeshBufferCount()-i);
} }
// set dirty flag to make sure that hardware copies of this
// buffer are also updated, see IMesh::setHardwareMappingHint
Mesh->setDirty();
Mesh->recalculateBoundingBox(); Mesh->recalculateBoundingBox();
} }
......
...@@ -8,11 +8,10 @@ ...@@ -8,11 +8,10 @@
<Build> <Build>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/CursorControl" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\CursorControl" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -20,22 +19,20 @@ ...@@ -20,22 +19,20 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/CursorControl" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\CursorControl" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../lib/Win32-gcc" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc/" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -43,9 +40,8 @@ ...@@ -43,9 +40,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
......
...@@ -8,11 +8,10 @@ ...@@ -8,11 +8,10 @@
<Build> <Build>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/XmlHandling" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\XmlHandling" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -20,22 +19,19 @@ ...@@ -20,22 +19,19 @@
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/XmlHandling" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\XmlHandling" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../lib/Win32-gcc" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc/" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -43,9 +39,8 @@ ...@@ -43,9 +39,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
......
...@@ -7,44 +7,40 @@ ...@@ -7,44 +7,40 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option output="../../bin/Win32-gcc/OcclusionQuery" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\OcclusionQuery" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/OcclusionQuery" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\OcclusionQuery" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-W" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
<VirtualTargets> <VirtualTargets>
<Add alias="All" targets="Windows;Linux" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
......
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9,00"
Name="26.OcclusionQuery_vc9" Name="26.OcclusionQuery_vc9"
ProjectGUID="{7BDBB7E8-E0C9-4A0D-83C1-D389D6140FEF}" ProjectGUID="{9A859369-0A56-4DAB-9E0C-9F93C91CF0F2}"
RootNamespace="OcclusionQuery_vc9" RootNamespace="OcclusionQuery_vc9"
TargetFrameworkVersion="131072" TargetFrameworkVersion="131072"
> >
......
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file> <CodeBlocks_workspace_file>
<Workspace title="Build all examples"> <Workspace title="Build all examples">
<Project filename="01.HelloWorld/HelloWorld.cbp" /> <Project filename="../source/Irrlicht/Irrlicht-gcc.cbp" />
<Project filename="02.Quake3Map/Quake3Map.cbp" active="1" /> <Project filename="01.HelloWorld/HelloWorld.cbp" active="1" />
<Project filename="02.Quake3Map/Quake3Map.cbp" />
<Project filename="03.CustomSceneNode/CustomSceneNode.cbp" /> <Project filename="03.CustomSceneNode/CustomSceneNode.cbp" />
<Project filename="04.Movement/Movement.cbp" /> <Project filename="04.Movement/Movement.cbp" />
<Project filename="05.UserInterface/UserInterface.cbp" /> <Project filename="05.UserInterface/UserInterface.cbp" />
...@@ -29,7 +30,6 @@ ...@@ -29,7 +30,6 @@
<Project filename="Demo/demo.cbp" /> <Project filename="Demo/demo.cbp" />
<Project filename="../tools/GUIEditor/GUIEditor_gcc.cbp" /> <Project filename="../tools/GUIEditor/GUIEditor_gcc.cbp" />
<Project filename="../tools/MeshConverter/MeshConverter.cbp" /> <Project filename="../tools/MeshConverter/MeshConverter.cbp" />
<Project filename="../source/Irrlicht/Irrlicht-gcc.cbp" />
<Project filename="../tools/FileToHeader/FileToHeader.cbp" /> <Project filename="../tools/FileToHeader/FileToHeader.cbp" />
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>
 
Microsoft Visual Studio Solution File, Format Version 10.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008 # Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01.HelloWorld_vc9", "01.HelloWorld\HelloWorld_vc9.vcproj", "{5AD4C95C-BA38-4692-BA4B-8C25A86208F9}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01.HelloWorld_vc9", "01.HelloWorld\HelloWorld_vc9.vcproj", "{5AD4C95C-BA38-4692-BA4B-8C25A86208F9}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F} {E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
...@@ -113,7 +113,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "21.Quake3Explorer_vc9", "21 ...@@ -113,7 +113,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "21.Quake3Explorer_vc9", "21
{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F} {E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "22.MaterialViewer_vc9", "22.MaterialViewer\MaterialViewer_vc9.vcproj", "{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "22.MaterialViewer_vc9", "22.MaterialViewer\MaterialViewer_vc9.vcproj", "{F4C8112D-57A8-4D01-BB62-BAC6A09A6902}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F} {E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
EndProjectSection EndProjectSection
...@@ -143,6 +143,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mesh Converter", "..\tools\ ...@@ -143,6 +143,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mesh Converter", "..\tools\
{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F} {E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "25.XmlHandling_vc9", "25.XmlHandling\XmlHandling_vc9.vcproj", "{8FDA260E-EF27-4F8C-8720-7AF707DD0D9E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "26.OcclusionQuery_vc9", "26.OcclusionQuery\OcclusionQuery_vc9.vcproj", "{9A859369-0A56-4DAB-9E0C-9F93C91CF0F2}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
...@@ -221,6 +225,10 @@ Global ...@@ -221,6 +225,10 @@ Global
{EB3B38EA-5CE7-4983-845B-880661E69D09}.Debug|Win32.Build.0 = Debug|Win32 {EB3B38EA-5CE7-4983-845B-880661E69D09}.Debug|Win32.Build.0 = Debug|Win32
{EB3B38EA-5CE7-4983-845B-880661E69D09}.Release|Win32.ActiveCfg = Release|Win32 {EB3B38EA-5CE7-4983-845B-880661E69D09}.Release|Win32.ActiveCfg = Release|Win32
{EB3B38EA-5CE7-4983-845B-880661E69D09}.Release|Win32.Build.0 = Release|Win32 {EB3B38EA-5CE7-4983-845B-880661E69D09}.Release|Win32.Build.0 = Release|Win32
{2A29B6B1-AFC4-46C7-9944-7052AAE66F7B}.Debug|Win32.ActiveCfg = Debug|Win32
{2A29B6B1-AFC4-46C7-9944-7052AAE66F7B}.Debug|Win32.Build.0 = Debug|Win32
{2A29B6B1-AFC4-46C7-9944-7052AAE66F7B}.Release|Win32.ActiveCfg = Release|Win32
{2A29B6B1-AFC4-46C7-9944-7052AAE66F7B}.Release|Win32.Build.0 = Release|Win32
{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Debug|Win32.ActiveCfg = Debug|Win32 {1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Debug|Win32.ActiveCfg = Debug|Win32
{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Debug|Win32.Build.0 = Debug|Win32 {1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Debug|Win32.Build.0 = Debug|Win32
{1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Release|Win32.ActiveCfg = Release|Win32 {1AB9413E-4F53-42A3-8CB2-CB4BE22336D0}.Release|Win32.ActiveCfg = Release|Win32
...@@ -237,18 +245,18 @@ Global ...@@ -237,18 +245,18 @@ Global
{CDC4AAA9-72E1-4FFA-A04D-7EF59D8B97CD}.Debug|Win32.Build.0 = Debug|Win32 {CDC4AAA9-72E1-4FFA-A04D-7EF59D8B97CD}.Debug|Win32.Build.0 = Debug|Win32
{CDC4AAA9-72E1-4FFA-A04D-7EF59D8B97CD}.Release|Win32.ActiveCfg = Release|Win32 {CDC4AAA9-72E1-4FFA-A04D-7EF59D8B97CD}.Release|Win32.ActiveCfg = Release|Win32
{CDC4AAA9-72E1-4FFA-A04D-7EF59D8B97CD}.Release|Win32.Build.0 = Release|Win32 {CDC4AAA9-72E1-4FFA-A04D-7EF59D8B97CD}.Release|Win32.Build.0 = Release|Win32
{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}.Debug|Win32.ActiveCfg = Debug|Win32 {F4C8112D-57A8-4D01-BB62-BAC6A09A6902}.Debug|Win32.ActiveCfg = Debug|Win32
{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}.Debug|Win32.Build.0 = Debug|Win32 {F4C8112D-57A8-4D01-BB62-BAC6A09A6902}.Debug|Win32.Build.0 = Debug|Win32
{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}.Release|Win32.ActiveCfg = Release|Win32 {F4C8112D-57A8-4D01-BB62-BAC6A09A6902}.Release|Win32.ActiveCfg = Release|Win32
{4E6C2F8D-BA92-4C5B-96FD-72D4FE8BD7FA}.Release|Win32.Build.0 = Release|Win32 {F4C8112D-57A8-4D01-BB62-BAC6A09A6902}.Release|Win32.Build.0 = Release|Win32
{6AEC2AA2-C9FF-4B7D-B07A-94A9D34B41D7}.Debug|Win32.ActiveCfg = Debug|Win32 {6AEC2AA2-C9FF-4B7D-B07A-94A9D34B41D7}.Debug|Win32.ActiveCfg = Debug|Win32
{6AEC2AA2-C9FF-4B7D-B07A-94A9D34B41D7}.Debug|Win32.Build.0 = Debug|Win32 {6AEC2AA2-C9FF-4B7D-B07A-94A9D34B41D7}.Debug|Win32.Build.0 = Debug|Win32
{6AEC2AA2-C9FF-4B7D-B07A-94A9D34B41D7}.Release|Win32.ActiveCfg = Release|Win32 {6AEC2AA2-C9FF-4B7D-B07A-94A9D34B41D7}.Release|Win32.ActiveCfg = Release|Win32
{6AEC2AA2-C9FF-4B7D-B07A-94A9D34B41D7}.Release|Win32.Build.0 = Release|Win32 {6AEC2AA2-C9FF-4B7D-B07A-94A9D34B41D7}.Release|Win32.Build.0 = Release|Win32
{2A29B6B1-AFC4-46C7-9944-7052AAE66F7B}.Debug|Win32.ActiveCfg = Debug|Win32 {02B67A37-50E1-49DB-BECF-905BC029C2FE}.Debug|Win32.ActiveCfg = Debug|Win32
{2A29B6B1-AFC4-46C7-9944-7052AAE66F7B}.Debug|Win32.Build.0 = Debug|Win32 {02B67A37-50E1-49DB-BECF-905BC029C2FE}.Debug|Win32.Build.0 = Debug|Win32
{2A29B6B1-AFC4-46C7-9944-7052AAE66F7B}.Release|Win32.ActiveCfg = Release|Win32 {02B67A37-50E1-49DB-BECF-905BC029C2FE}.Release|Win32.ActiveCfg = Release|Win32
{2A29B6B1-AFC4-46C7-9944-7052AAE66F7B}.Release|Win32.Build.0 = Release|Win32 {02B67A37-50E1-49DB-BECF-905BC029C2FE}.Release|Win32.Build.0 = Release|Win32
{853A396E-C031-4C26-A716-5B4E176BE11D}.Debug|Win32.ActiveCfg = Debug|Win32 {853A396E-C031-4C26-A716-5B4E176BE11D}.Debug|Win32.ActiveCfg = Debug|Win32
{853A396E-C031-4C26-A716-5B4E176BE11D}.Debug|Win32.Build.0 = Debug|Win32 {853A396E-C031-4C26-A716-5B4E176BE11D}.Debug|Win32.Build.0 = Debug|Win32
{853A396E-C031-4C26-A716-5B4E176BE11D}.Release|Win32.ActiveCfg = Release|Win32 {853A396E-C031-4C26-A716-5B4E176BE11D}.Release|Win32.ActiveCfg = Release|Win32
...@@ -261,10 +269,14 @@ Global ...@@ -261,10 +269,14 @@ Global
{E72B637E-4AA6-46F3-885F-AC67B4B470ED}.Debug|Win32.Build.0 = Debug|Win32 {E72B637E-4AA6-46F3-885F-AC67B4B470ED}.Debug|Win32.Build.0 = Debug|Win32
{E72B637E-4AA6-46F3-885F-AC67B4B470ED}.Release|Win32.ActiveCfg = Release|Win32 {E72B637E-4AA6-46F3-885F-AC67B4B470ED}.Release|Win32.ActiveCfg = Release|Win32
{E72B637E-4AA6-46F3-885F-AC67B4B470ED}.Release|Win32.Build.0 = Release|Win32 {E72B637E-4AA6-46F3-885F-AC67B4B470ED}.Release|Win32.Build.0 = Release|Win32
{02B67A37-50E1-49DB-BECF-905BC029C2FE}.Debug|Win32.ActiveCfg = Debug|Win32 {8FDA260E-EF27-4F8C-8720-7AF707DD0D9E}.Debug|Win32.ActiveCfg = Debug|Win32
{02B67A37-50E1-49DB-BECF-905BC029C2FE}.Debug|Win32.Build.0 = Debug|Win32 {8FDA260E-EF27-4F8C-8720-7AF707DD0D9E}.Debug|Win32.Build.0 = Debug|Win32
{02B67A37-50E1-49DB-BECF-905BC029C2FE}.Release|Win32.ActiveCfg = Release|Win32 {8FDA260E-EF27-4F8C-8720-7AF707DD0D9E}.Release|Win32.ActiveCfg = Release|Win32
{02B67A37-50E1-49DB-BECF-905BC029C2FE}.Release|Win32.Build.0 = Release|Win32 {8FDA260E-EF27-4F8C-8720-7AF707DD0D9E}.Release|Win32.Build.0 = Release|Win32
{9A859369-0A56-4DAB-9E0C-9F93C91CF0F2}.Debug|Win32.ActiveCfg = Debug|Win32
{9A859369-0A56-4DAB-9E0C-9F93C91CF0F2}.Debug|Win32.Build.0 = Debug|Win32
{9A859369-0A56-4DAB-9E0C-9F93C91CF0F2}.Release|Win32.ActiveCfg = Release|Win32
{9A859369-0A56-4DAB-9E0C-9F93C91CF0F2}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
...@@ -322,6 +322,7 @@ void CDemo::switchToNextScene() ...@@ -322,6 +322,7 @@ void CDemo::switchToNextScene()
camera = sm->addCameraSceneNodeFPS(0, 100.0f, .4f, -1, keyMap, 9, false, 3.f); camera = sm->addCameraSceneNodeFPS(0, 100.0f, .4f, -1, keyMap, 9, false, 3.f);
camera->setPosition(core::vector3df(108,140,-140)); camera->setPosition(core::vector3df(108,140,-140));
camera->setFarValue(5000.0f);
scene::ISceneNodeAnimatorCollisionResponse* collider = scene::ISceneNodeAnimatorCollisionResponse* collider =
sm->createCollisionResponseAnimator( sm->createCollisionResponseAnimator(
...@@ -703,7 +704,7 @@ void CDemo::createParticleImpacts() ...@@ -703,7 +704,7 @@ void CDemo::createParticleImpacts()
scene::IParticleEmitter* em = pas->createBoxEmitter( scene::IParticleEmitter* em = pas->createBoxEmitter(
core::aabbox3d<f32>(-5,-5,-5,5,5,5), core::aabbox3d<f32>(-5,-5,-5,5,5,5),
Impacts[i].outVector, 20,40, video::SColor(0,255,255,255),video::SColor(0,255,255,255), Impacts[i].outVector, 20,40, video::SColor(50,255,255,255),video::SColor(50,255,255,255),
1200,1600, 20); 1200,1600, 20);
pas->setEmitter(em); pas->setEmitter(em);
...@@ -716,7 +717,7 @@ void CDemo::createParticleImpacts() ...@@ -716,7 +717,7 @@ void CDemo::createParticleImpacts()
pas->setMaterialFlag(video::EMF_LIGHTING, false); pas->setMaterialFlag(video::EMF_LIGHTING, false);
pas->setMaterialFlag(video::EMF_ZWRITE_ENABLE, false); pas->setMaterialFlag(video::EMF_ZWRITE_ENABLE, false);
pas->setMaterialTexture(0, device->getVideoDriver()->getTexture("../../media/smoke.bmp")); pas->setMaterialTexture(0, device->getVideoDriver()->getTexture("../../media/smoke.bmp"));
pas->setMaterialType(video::EMT_TRANSPARENT_VERTEX_ALPHA); pas->setMaterialType(video::EMT_TRANSPARENT_ADD_COLOR);
scene::ISceneNodeAnimator* anim = sm->createDeleteAnimator(2000); scene::ISceneNodeAnimator* anim = sm->createDeleteAnimator(2000);
pas->addAnimator(anim); pas->addAnimator(anim);
......
...@@ -8,26 +8,23 @@ ...@@ -8,26 +8,23 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/Demo" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\Demo" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/Demo" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\Demo" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -36,7 +33,7 @@ ...@@ -36,7 +33,7 @@
<Add library="Xcursor" /> <Add library="Xcursor" />
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -46,11 +43,11 @@ ...@@ -46,11 +43,11 @@
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add directory="../../lib/gcc" /> <Add directory="..\..\lib\gcc" />
</Linker> </Linker>
<Unit filename="CDemo.cpp" /> <Unit filename="CDemo.cpp" />
<Unit filename="CDemo.h" /> <Unit filename="CDemo.h" />
...@@ -59,11 +56,13 @@ ...@@ -59,11 +56,13 @@
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Unit filename="resource.h" /> <Unit filename="resource.h" />
<Unit filename="resscript.rc"> <Unit filename="resscript.rc">
<Option compilerVar="WINDRES" />
<Option target="Windows" /> <Option target="Windows" />
</Unit> </Unit>
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#define IRRLICHT_VERSION_REVISION 0 #define IRRLICHT_VERSION_REVISION 0
// This flag will be defined only in SVN, the official release code will have // This flag will be defined only in SVN, the official release code will have
// it undefined // it undefined
#define IRRLICHT_VERSION_SVN -alpha //#define IRRLICHT_VERSION_SVN -alpha
#define IRRLICHT_SDK_VERSION "1.8.0-alpha" #define IRRLICHT_SDK_VERSION "1.8.0"
#include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw #include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
......
...@@ -395,6 +395,7 @@ namespace video ...@@ -395,6 +395,7 @@ namespace video
} }
break; break;
default: default:
color = 0xffffffff;
break; break;
} }
} }
......
...@@ -120,7 +120,7 @@ typedef double f64; ...@@ -120,7 +120,7 @@ typedef double f64;
#if defined(_MSC_VER) && _MSC_VER > 1310 && !defined (_WIN32_WCE) #if defined(_MSC_VER) && _MSC_VER > 1310 && !defined (_WIN32_WCE)
#define swprintf swprintf_s #define swprintf swprintf_s
#define snprintf sprintf_s #define snprintf sprintf_s
#else #elif !defined(__CYGWIN__)
#define swprintf _snwprintf #define swprintf _snwprintf
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
......
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
#include "vector2d.h" #include "vector2d.h"
#include "vector3d.h" #include "vector3d.h"
/*! \mainpage Irrlicht Engine 1.7 API documentation /*! \mainpage Irrlicht Engine 1.8 API documentation
* *
* <div align="center"><img src="logobig.png" ></div> * <div align="center"><img src="logobig.png" ></div>
* *
......
...@@ -75,14 +75,10 @@ The Irrlicht Engine SDK version 1.8 ...@@ -75,14 +75,10 @@ The Irrlicht Engine SDK version 1.8
with Irrlicht or recompile the engine. However, other compilers/IDEs may with Irrlicht or recompile the engine. However, other compilers/IDEs may
work as well, we simply didn't test them. work as well, we simply didn't test them.
* gcc 3.3
* gcc 3.4
* gcc 4.x * gcc 4.x
* Visual Studio.NET 2003 (7.1) * Visual Studio 2008(9.0)-2012(11.0)
* Visual Studio 2005(8.0)-2010(10.0) * Code::Blocks (& gcc or visual studio toolkit)
* Code::Blocks 1.0 (& gcc or visual studio toolkit)
* DevC++ 5.0 & gcc (project files included, please use Code::Blocks instead)
If you ever want to (re)compile the engine yourself (which means you don't If you ever want to (re)compile the engine yourself (which means you don't
want to use the precompiled version) you need the following: want to use the precompiled version) you need the following:
...@@ -175,17 +171,20 @@ The Irrlicht Engine SDK version 1.8 ...@@ -175,17 +171,20 @@ The Irrlicht Engine SDK version 1.8
See http://irrlicht.sourceforge.net/author.html for more informations) See http://irrlicht.sourceforge.net/author.html for more informations)
Christian Stehno (hybrid) Contribution Coordinator/Developer Christian Stehno (hybrid) Contribution Coordinator/Developer
Michael Zeilfelder (cutealien) GUI Developer
Patryk Nadrowski (Nadro) Developer
Yoran Bosman (Yoran) Webserver administrator
Gareth Davidson (bitplane) Developer/ Forum admin Gareth Davidson (bitplane) Developer/ Forum admin
Thomas Alten (burningwater) Wrote the burningsvideo software rasterizer Thomas Alten (burningwater) Wrote the burningsvideo software rasterizer
Luke P. Hoschke (luke) Wrote the b3d loader, the new animation system, VBOs and other things Luke P. Hoschke (luke) Wrote the b3d loader, the new animation system, VBOs and other things
Colin MacDonald (rogerborg) All hands person Colin MacDonald (rogerborg) All hands person
Michael Zeilfelder (cutealien) GUI and patch expert
Ahmed Hilali (blindside) The shader and advanced effects man Ahmed Hilali (blindside) The shader and advanced effects man
Dean Wadsworth (varmint) OSX port maintainer and game developer Dean Wadsworth (varmint) OSX port maintainer and game developer
Alvaro F. Celis (afecelis) Lots of work in the community, for example video tutorials about Irrlicht, forum admin Alvaro F. Celis (afecelis) Lots of work in the community, for example video tutorials about Irrlicht, forum admin
John Goewert (Saigumi) Wrote some tutorials for the Irrlicht Engine and doing admin stuff John Goewert (Saigumi) Wrote some tutorials for the Irrlicht Engine and doing admin stuff
Jam Takes care of moderating the forums and keeps them clean from those evil spammers. Jam Takes care of moderating the forums and keeps them clean from those evil spammers.
Many others (this list hasn't been updated in a while, but they are often mentioned in changes.txt)
Etienne Petitjean wrote the MacPort of the engine Etienne Petitjean wrote the MacPort of the engine
Mark Jeacocke Wrote lots of helpful comments and ideas in the forums and per email. Mark Jeacocke Wrote lots of helpful comments and ideas in the forums and per email.
Julio Gorgé Created the 'Unofficial DirectX 9.0 Driver for the Irrlicht Engine' Julio Gorgé Created the 'Unofficial DirectX 9.0 Driver for the Irrlicht Engine'
...@@ -230,6 +229,8 @@ The Irrlicht Engine SDK version 1.8 ...@@ -230,6 +229,8 @@ The Irrlicht Engine SDK version 1.8
William Finlayson OpenGL RTT, GLSL support and the reflection 2 layer material for OpenGL. William Finlayson OpenGL RTT, GLSL support and the reflection 2 layer material for OpenGL.
Delight Various code contributions for Irrlicht.NET (particle system, basic shader support and more) Delight Various code contributions for Irrlicht.NET (particle system, basic shader support and more)
Michael Zoech Improved GLSL support Michael Zoech Improved GLSL support
Greg Roelofs Created the zlib and libpng Jean-loup Gailly, Mark Adler Created the zlib and libpng
Guy Eric Schalnat, Andreas Dilger, Glenn Randers-Pehrson and others Created libpng Guy Eric Schalnat, Andreas Dilger, Glenn Randers-Pehrson and others Created libpng
The Independent JPEG Group Created JPEG lib The Independent JPEG Group Created JPEG lib
Dr Brian Gladman AES Created aesGladman
...@@ -926,30 +926,13 @@ static void executeBlit_TextureBlendColor_32_to_32( const SBlitJob * job ) ...@@ -926,30 +926,13 @@ static void executeBlit_TextureBlendColor_32_to_32( const SBlitJob * job )
*/ */
static void executeBlit_Color_16_to_16( const SBlitJob * job ) static void executeBlit_Color_16_to_16( const SBlitJob * job )
{ {
const u16 c = video::A8R8G8B8toA1R5G5B5(job->argb);
u16 *dst = (u16*) job->dst; u16 *dst = (u16*) job->dst;
u16 c0 = video::A8R8G8B8toA1R5G5B5( job->argb ); for ( s32 dy = 0; dy != job->height; ++dy )
u32 c = c0 | c0 << 16;
if ( 0 == (job->srcPitch & 3 ) )
{
for ( s32 dy = 0; dy != job->height; ++dy )
{
memset32( dst, c, job->srcPitch );
dst = (u16*) ( (u8*) (dst) + job->dstPitch );
}
}
else
{ {
s32 dx = job->width - 1; memset16(dst, c, job->srcPitch);
dst = (u16*) ( (u8*) (dst) + job->dstPitch );
for ( s32 dy = 0; dy != job->height; ++dy )
{
memset32( dst, c, job->srcPitch );
dst[dx] = c0;
dst = (u16*) ( (u8*) (dst) + job->dstPitch );
}
} }
} }
......
...@@ -363,7 +363,7 @@ IMesh* CGeometryCreator::createSphereMesh(f32 radius, u32 polyCountX, u32 polyCo ...@@ -363,7 +363,7 @@ IMesh* CGeometryCreator::createSphereMesh(f32 radius, u32 polyCountX, u32 polyCo
buffer->Indices.reallocate((polyCountX * polyCountY) * 6); buffer->Indices.reallocate((polyCountX * polyCountY) * 6);
const video::SColor clr(100, 255,255,255); const video::SColor clr(255, 255,255,255);
u32 level = 0; u32 level = 0;
......
...@@ -1334,7 +1334,7 @@ void CIrrDeviceLinux::setResizable(bool resize) ...@@ -1334,7 +1334,7 @@ void CIrrDeviceLinux::setResizable(bool resize)
video::IVideoModeList* CIrrDeviceLinux::getVideoModeList() video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
{ {
#ifdef _IRR_COMPILE_WITH_X11_ #ifdef _IRR_COMPILE_WITH_X11_
if (!VideoModeList.getVideoModeCount()) if (!VideoModeList->getVideoModeCount())
{ {
bool temporaryDisplay = false; bool temporaryDisplay = false;
...@@ -1364,11 +1364,11 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList() ...@@ -1364,11 +1364,11 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
// find fitting mode // find fitting mode
VideoModeList.setDesktop(defaultDepth, core::dimension2d<u32>( VideoModeList->setDesktop(defaultDepth, core::dimension2d<u32>(
modes[0]->hdisplay, modes[0]->vdisplay)); modes[0]->hdisplay, modes[0]->vdisplay));
for (int i = 0; i<modeCount; ++i) for (int i = 0; i<modeCount; ++i)
{ {
VideoModeList.addMode(core::dimension2d<u32>( VideoModeList->addMode(core::dimension2d<u32>(
modes[i]->hdisplay, modes[i]->vdisplay), defaultDepth); modes[i]->hdisplay, modes[i]->vdisplay), defaultDepth);
} }
XFree(modes); XFree(modes);
...@@ -1382,11 +1382,11 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList() ...@@ -1382,11 +1382,11 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
XRRScreenConfiguration *config=XRRGetScreenInfo(display,DefaultRootWindow(display)); XRRScreenConfiguration *config=XRRGetScreenInfo(display,DefaultRootWindow(display));
oldRandrMode=XRRConfigCurrentConfiguration(config,&oldRandrRotation); oldRandrMode=XRRConfigCurrentConfiguration(config,&oldRandrRotation);
XRRScreenSize *modes=XRRConfigSizes(config,&modeCount); XRRScreenSize *modes=XRRConfigSizes(config,&modeCount);
VideoModeList.setDesktop(defaultDepth, core::dimension2d<u32>( VideoModeList->setDesktop(defaultDepth, core::dimension2d<u32>(
modes[oldRandrMode].width, modes[oldRandrMode].height)); modes[oldRandrMode].width, modes[oldRandrMode].height));
for (int i = 0; i<modeCount; ++i) for (int i = 0; i<modeCount; ++i)
{ {
VideoModeList.addMode(core::dimension2d<u32>( VideoModeList->addMode(core::dimension2d<u32>(
modes[i].width, modes[i].height), defaultDepth); modes[i].width, modes[i].height), defaultDepth);
} }
XRRFreeScreenConfigInfo(config); XRRFreeScreenConfigInfo(config);
...@@ -1405,7 +1405,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList() ...@@ -1405,7 +1405,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
} }
#endif #endif
return &VideoModeList; return VideoModeList;
} }
......
...@@ -704,7 +704,7 @@ void CIrrDeviceSDL::closeDevice() ...@@ -704,7 +704,7 @@ void CIrrDeviceSDL::closeDevice()
//! \return Pointer to a list with all video modes supported //! \return Pointer to a list with all video modes supported
video::IVideoModeList* CIrrDeviceSDL::getVideoModeList() video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
{ {
if (!VideoModeList.getVideoModeCount()) if (!VideoModeList->getVideoModeCount())
{ {
// enumerate video modes. // enumerate video modes.
const SDL_VideoInfo *vi = SDL_GetVideoInfo(); const SDL_VideoInfo *vi = SDL_GetVideoInfo();
...@@ -716,12 +716,12 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList() ...@@ -716,12 +716,12 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
else else
{ {
for (u32 i=0; modes[i]; ++i) for (u32 i=0; modes[i]; ++i)
VideoModeList.addMode(core::dimension2d<u32>(modes[i]->w, modes[i]->h), vi->vfmt->BitsPerPixel); VideoModeList->addMode(core::dimension2d<u32>(modes[i]->w, modes[i]->h), vi->vfmt->BitsPerPixel);
} }
} }
} }
return &VideoModeList; return VideoModeList;
} }
......
...@@ -20,8 +20,10 @@ namespace irr ...@@ -20,8 +20,10 @@ namespace irr
CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params) CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params)
: IrrlichtDevice(), VideoDriver(0), GUIEnvironment(0), SceneManager(0), : IrrlichtDevice(), VideoDriver(0), GUIEnvironment(0), SceneManager(0),
Timer(0), CursorControl(0), UserReceiver(params.EventReceiver), Logger(0), Operator(0), Timer(0), CursorControl(0), UserReceiver(params.EventReceiver), Logger(0), Operator(0),
Randomizer(0), FileSystem(0), InputReceivingSceneManager(0), CreationParams(params), Randomizer(0), FileSystem(0), InputReceivingSceneManager(0),
Close(false) VideoModeList(0), CreationParams(params), Close(false)
FileSystem(0), InputReceivingSceneManager(0), VideoModeList(0),
CreationParams(params), Close(false)
{ {
Timer = new CTimer(params.UsePerformanceTimer); Timer = new CTimer(params.UsePerformanceTimer);
if (os::Printer::Logger) if (os::Printer::Logger)
...@@ -41,6 +43,8 @@ CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params) ...@@ -41,6 +43,8 @@ CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params)
Randomizer = createDefaultRandomizer(); Randomizer = createDefaultRandomizer();
FileSystem = io::createFileSystem(); FileSystem = io::createFileSystem();
VideoModeList = new video::CVideoModeList();
core::stringc s = "Irrlicht Engine version "; core::stringc s = "Irrlicht Engine version ";
s.append(getVersion()); s.append(getVersion());
os::Printer::log(s.c_str(), ELL_INFORMATION); os::Printer::log(s.c_str(), ELL_INFORMATION);
...@@ -51,6 +55,7 @@ CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params) ...@@ -51,6 +55,7 @@ CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params)
CIrrDeviceStub::~CIrrDeviceStub() CIrrDeviceStub::~CIrrDeviceStub()
{ {
VideoModeList->drop();
FileSystem->drop(); FileSystem->drop();
if (GUIEnvironment) if (GUIEnvironment)
...@@ -154,7 +159,7 @@ gui::ICursorControl* CIrrDeviceStub::getCursorControl() ...@@ -154,7 +159,7 @@ gui::ICursorControl* CIrrDeviceStub::getCursorControl()
//! by the gfx adapter. //! by the gfx adapter.
video::IVideoModeList* CIrrDeviceStub::getVideoModeList() video::IVideoModeList* CIrrDeviceStub::getVideoModeList()
{ {
return &VideoModeList; return VideoModeList;
} }
......
...@@ -175,7 +175,7 @@ namespace irr ...@@ -175,7 +175,7 @@ namespace irr
EMOUSE_INPUT_EVENT LastMouseInputEvent; EMOUSE_INPUT_EVENT LastMouseInputEvent;
}; };
SMouseMultiClicks MouseMultiClicks; SMouseMultiClicks MouseMultiClicks;
video::CVideoModeList VideoModeList; video::CVideoModeList* VideoModeList;
SIrrlichtCreationParameters CreationParams; SIrrlichtCreationParameters CreationParams;
bool Close; bool Close;
}; };
......
...@@ -854,17 +854,21 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ...@@ -854,17 +854,21 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_ACTIVATE: case WM_ACTIVATE:
// we need to take care for screen changes, e.g. Alt-Tab // we need to take care for screen changes, e.g. Alt-Tab
dev = getDeviceFromHWnd(hWnd); dev = getDeviceFromHWnd(hWnd);
if (dev) if (dev && dev->isFullscreen())
{ {
if ((wParam&0xFF)==WA_INACTIVE) if ((wParam&0xFF)==WA_INACTIVE)
{ {
// If losing focus we minimize the app to show other one
ShowWindow(hWnd,SW_MINIMIZE); ShowWindow(hWnd,SW_MINIMIZE);
// and switch back to default resolution
dev->switchToFullScreen(true); dev->switchToFullScreen(true);
} }
else else
{ {
// Otherwise we retore the fullscreen Irrlicht app
SetForegroundWindow(hWnd); SetForegroundWindow(hWnd);
ShowWindow(hWnd, SW_RESTORE); ShowWindow(hWnd, SW_RESTORE);
// and set the fullscreen resolution again
dev->switchToFullScreen(); dev->switchToFullScreen();
} }
} }
...@@ -922,6 +926,13 @@ CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params) ...@@ -922,6 +926,13 @@ CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params)
// get handle to exe file // get handle to exe file
HINSTANCE hInstance = GetModuleHandle(0); HINSTANCE hInstance = GetModuleHandle(0);
// Store original desktop mode.
memset(&DesktopMode, 0, sizeof(DesktopMode));
DesktopMode.dmSize = sizeof(DesktopMode);
EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &DesktopMode);
// create the window if we need to and we do not use the null device // create the window if we need to and we do not use the null device
if (!CreationParams.WindowId && CreationParams.DriverType != video::EDT_NULL) if (!CreationParams.WindowId && CreationParams.DriverType != video::EDT_NULL)
{ {
...@@ -1336,22 +1347,23 @@ bool CIrrDeviceWin32::switchToFullScreen(bool reset) ...@@ -1336,22 +1347,23 @@ bool CIrrDeviceWin32::switchToFullScreen(bool reset)
if (!CreationParams.Fullscreen) if (!CreationParams.Fullscreen)
return true; return true;
DEVMODE dm;
memset(&dm, 0, sizeof(dm));
dm.dmSize = sizeof(dm);
// use default values from current setting
EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm);
if (reset) if (reset)
{ {
if (ChangedToFullScreen) if (ChangedToFullScreen)
{ {
return (ChangeDisplaySettings(&dm,0)==DISP_CHANGE_SUCCESSFUL); return (ChangeDisplaySettings(&DesktopMode,0)==DISP_CHANGE_SUCCESSFUL);
} }
else else
return true; return true;
} }
// use default values from current setting
DEVMODE dm;
memset(&dm, 0, sizeof(dm));
dm.dmSize = sizeof(dm);
EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm);
dm.dmPelsWidth = CreationParams.WindowSize.Width; dm.dmPelsWidth = CreationParams.WindowSize.Width;
dm.dmPelsHeight = CreationParams.WindowSize.Height; dm.dmPelsHeight = CreationParams.WindowSize.Height;
dm.dmBitsPerPel = CreationParams.Bits; dm.dmBitsPerPel = CreationParams.Bits;
...@@ -1406,7 +1418,7 @@ CIrrDeviceWin32::CCursorControl* CIrrDeviceWin32::getWin32CursorControl() ...@@ -1406,7 +1418,7 @@ CIrrDeviceWin32::CCursorControl* CIrrDeviceWin32::getWin32CursorControl()
//! by the gfx adapter. //! by the gfx adapter.
video::IVideoModeList* CIrrDeviceWin32::getVideoModeList() video::IVideoModeList* CIrrDeviceWin32::getVideoModeList()
{ {
if (!VideoModeList.getVideoModeCount()) if (!VideoModeList->getVideoModeCount())
{ {
// enumerate video modes. // enumerate video modes.
DWORD i=0; DWORD i=0;
...@@ -1416,17 +1428,17 @@ video::IVideoModeList* CIrrDeviceWin32::getVideoModeList() ...@@ -1416,17 +1428,17 @@ video::IVideoModeList* CIrrDeviceWin32::getVideoModeList()
while (EnumDisplaySettings(NULL, i, &mode)) while (EnumDisplaySettings(NULL, i, &mode))
{ {
VideoModeList.addMode(core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight), VideoModeList->addMode(core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight),
mode.dmBitsPerPel); mode.dmBitsPerPel);
++i; ++i;
} }
if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &mode)) if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &mode))
VideoModeList.setDesktop(mode.dmBitsPerPel, core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight)); VideoModeList->setDesktop(mode.dmBitsPerPel, core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight));
} }
return &VideoModeList; return VideoModeList;
} }
typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD); typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
......
...@@ -395,6 +395,7 @@ namespace irr ...@@ -395,6 +395,7 @@ namespace irr
bool Resized; bool Resized;
bool ExternalWindow; bool ExternalWindow;
CCursorControl* Win32CursorControl; CCursorControl* Win32CursorControl;
DEVMODE DesktopMode;
SJoystickWin32Control* JoyControl; SJoystickWin32Control* JoyControl;
}; };
......
...@@ -770,7 +770,7 @@ CIrrDeviceWinCE::CCursorControl* CIrrDeviceWinCE::getWin32CursorControl() ...@@ -770,7 +770,7 @@ CIrrDeviceWinCE::CCursorControl* CIrrDeviceWinCE::getWin32CursorControl()
/** \return Pointer to video modes list */ /** \return Pointer to video modes list */
video::IVideoModeList* CIrrDeviceWinCE::getVideoModeList() video::IVideoModeList* CIrrDeviceWinCE::getVideoModeList()
{ {
if (!VideoModeList.getVideoModeCount()) if (!VideoModeList->getVideoModeCount())
{ {
// enumerate video modes. // enumerate video modes.
DWORD i=0; DWORD i=0;
...@@ -780,17 +780,17 @@ video::IVideoModeList* CIrrDeviceWinCE::getVideoModeList() ...@@ -780,17 +780,17 @@ video::IVideoModeList* CIrrDeviceWinCE::getVideoModeList()
while (EnumDisplaySettings(NULL, i, &mode)) while (EnumDisplaySettings(NULL, i, &mode))
{ {
VideoModeList.addMode(core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight), VideoModeList->addMode(core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight),
mode.dmBitsPerPel); mode.dmBitsPerPel);
++i; ++i;
} }
if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &mode)) if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &mode))
VideoModeList.setDesktop(mode.dmBitsPerPel, core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight)); VideoModeList->setDesktop(mode.dmBitsPerPel, core::dimension2d<u32>(mode.dmPelsWidth, mode.dmPelsHeight));
} }
return &VideoModeList; return VideoModeList;
} }
......
...@@ -433,7 +433,8 @@ ISceneNode* CMeshSceneNode::clone(ISceneNode* newParent, ISceneManager* newManag ...@@ -433,7 +433,8 @@ ISceneNode* CMeshSceneNode::clone(ISceneNode* newParent, ISceneManager* newManag
nb->ReadOnlyMaterials = ReadOnlyMaterials; nb->ReadOnlyMaterials = ReadOnlyMaterials;
nb->Materials = Materials; nb->Materials = Materials;
nb->Shadow = Shadow; nb->Shadow = Shadow;
nb->Shadow->grab(); if ( nb->Shadow )
nb->Shadow->grab();
if (newParent) if (newParent)
nb->drop(); nb->drop();
......
...@@ -40,8 +40,6 @@ IAnimatedMesh* CSTLMeshFileLoader::createMesh(io::IReadFile* file) ...@@ -40,8 +40,6 @@ IAnimatedMesh* CSTLMeshFileLoader::createMesh(io::IReadFile* file)
if (filesize < 6) // we need a header if (filesize < 6) // we need a header
return 0; return 0;
const u32 WORD_BUFFER_LENGTH = 512;
SMesh* mesh = new SMesh(); SMesh* mesh = new SMesh();
SMeshBuffer* meshBuffer = new SMeshBuffer(); SMeshBuffer* meshBuffer = new SMeshBuffer();
mesh->addMeshBuffer(meshBuffer); mesh->addMeshBuffer(meshBuffer);
...@@ -50,8 +48,6 @@ IAnimatedMesh* CSTLMeshFileLoader::createMesh(io::IReadFile* file) ...@@ -50,8 +48,6 @@ IAnimatedMesh* CSTLMeshFileLoader::createMesh(io::IReadFile* file)
core::vector3df vertex[3]; core::vector3df vertex[3];
core::vector3df normal; core::vector3df normal;
c8 buffer[WORD_BUFFER_LENGTH];
bool binary = false; bool binary = false;
core::stringc token; core::stringc token;
if (getNextToken(file, token) != "solid") if (getNextToken(file, token) != "solid")
......
...@@ -1490,7 +1490,7 @@ REALINLINE s4DVertex * CBurningVideoDriver::VertexCache_getVertex ( const u32 so ...@@ -1490,7 +1490,7 @@ REALINLINE s4DVertex * CBurningVideoDriver::VertexCache_getVertex ( const u32 so
fill blockwise on the next 16(Cache_Size) unique vertices in indexlist fill blockwise on the next 16(Cache_Size) unique vertices in indexlist
merge the next 16 vertices with the current merge the next 16 vertices with the current
*/ */
REALINLINE void CBurningVideoDriver::VertexCache_get ( s4DVertex ** face ) REALINLINE void CBurningVideoDriver::VertexCache_get(const s4DVertex ** face)
{ {
SCacheInfo info[VERTEXCACHE_ELEMENT]; SCacheInfo info[VERTEXCACHE_ELEMENT];
...@@ -1595,7 +1595,8 @@ REALINLINE void CBurningVideoDriver::VertexCache_get ( s4DVertex ** face ) ...@@ -1595,7 +1595,8 @@ REALINLINE void CBurningVideoDriver::VertexCache_get ( s4DVertex ** face )
face[0] = VertexCache_getVertex ( p[ i0 ] ); face[0] = VertexCache_getVertex ( p[ i0 ] );
face[1] = VertexCache_getVertex ( p[ VertexCache.indicesRun + 1] ); face[1] = VertexCache_getVertex ( p[ VertexCache.indicesRun + 1] );
face[2] = VertexCache_getVertex ( p[ VertexCache.indicesRun + 2] ); face[2] = VertexCache_getVertex ( p[ VertexCache.indicesRun + 2] );
} break; }
break;
case 2: case 2:
{ {
...@@ -1603,12 +1604,17 @@ REALINLINE void CBurningVideoDriver::VertexCache_get ( s4DVertex ** face ) ...@@ -1603,12 +1604,17 @@ REALINLINE void CBurningVideoDriver::VertexCache_get ( s4DVertex ** face )
face[0] = VertexCache_getVertex ( p[ i0 ] ); face[0] = VertexCache_getVertex ( p[ i0 ] );
face[1] = VertexCache_getVertex ( p[ VertexCache.indicesRun + 1] ); face[1] = VertexCache_getVertex ( p[ VertexCache.indicesRun + 1] );
face[2] = VertexCache_getVertex ( p[ VertexCache.indicesRun + 2] ); face[2] = VertexCache_getVertex ( p[ VertexCache.indicesRun + 2] );
} break; }
break;
case 4: case 4:
face[0] = VertexCache_getVertex ( VertexCache.indicesRun + 0 ); face[0] = VertexCache_getVertex ( VertexCache.indicesRun + 0 );
face[1] = VertexCache_getVertex ( VertexCache.indicesRun + 1 ); face[1] = VertexCache_getVertex ( VertexCache.indicesRun + 1 );
face[2] = VertexCache_getVertex ( VertexCache.indicesRun + 2 ); face[2] = VertexCache_getVertex ( VertexCache.indicesRun + 2 );
break; break;
default:
face[0] = face[1] = face[2] = VertexCache_getVertex(VertexCache.indicesRun + 0);
break;
} }
VertexCache.indicesRun += VertexCache.primitivePitch; VertexCache.indicesRun += VertexCache.primitivePitch;
...@@ -1760,7 +1766,7 @@ void CBurningVideoDriver::drawVertexPrimitiveList(const void* vertices, u32 vert ...@@ -1760,7 +1766,7 @@ void CBurningVideoDriver::drawVertexPrimitiveList(const void* vertices, u32 vert
for ( i = 0; i < (u32) primitiveCount; ++i ) for ( i = 0; i < (u32) primitiveCount; ++i )
{ {
VertexCache_get ( (s4DVertex**) face ); VertexCache_get(face);
// if fully outside or outside on same side // if fully outside or outside on same side
if ( ( (face[0]->flag | face[1]->flag | face[2]->flag) & VERTEX4D_CLIPMASK ) if ( ( (face[0]->flag | face[1]->flag | face[2]->flag) & VERTEX4D_CLIPMASK )
......
...@@ -238,7 +238,7 @@ namespace video ...@@ -238,7 +238,7 @@ namespace video
const void* indices, u32 indexCount, const void* indices, u32 indexCount,
E_VERTEX_TYPE vType,scene::E_PRIMITIVE_TYPE pType, E_VERTEX_TYPE vType,scene::E_PRIMITIVE_TYPE pType,
E_INDEX_TYPE iType); E_INDEX_TYPE iType);
void VertexCache_get ( s4DVertex ** face ); void VertexCache_get ( const s4DVertex ** face );
void VertexCache_getbypass ( s4DVertex ** face ); void VertexCache_getbypass ( s4DVertex ** face );
void VertexCache_fill ( const u32 sourceIndex,const u32 destIndex ); void VertexCache_fill ( const u32 sourceIndex,const u32 destIndex );
......
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-W" />
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-W" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-DWIN32" /> <Add option="-DWIN32" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
<Add directory="zlib" /> <Add directory="zlib" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" />
<Add library="kernel32" /> <Add library="kernel32" />
<Add library="user32" /> <Add library="user32" />
<Add library="gdi32" /> <Add library="gdi32" />
...@@ -267,7 +268,6 @@ ...@@ -267,7 +268,6 @@
<Add option="-Wextra" /> <Add option="-Wextra" />
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-g" /> <Add option="-g" />
<Add option="-W" />
<Add option="-O0" /> <Add option="-O0" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-fPIC" /> <Add option="-fPIC" />
...@@ -296,7 +296,6 @@ ...@@ -296,7 +296,6 @@
<Compiler> <Compiler>
<Add option="-O3" /> <Add option="-O3" />
<Add option="-Wextra" /> <Add option="-Wextra" />
<Add option="-W" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-fno-exceptions" /> <Add option="-fno-exceptions" />
...@@ -323,7 +322,6 @@ ...@@ -323,7 +322,6 @@
<Compiler> <Compiler>
<Add option="-O3" /> <Add option="-O3" />
<Add option="-Wextra" /> <Add option="-Wextra" />
<Add option="-W" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-ffast-math" /> <Add option="-ffast-math" />
...@@ -352,7 +350,6 @@ ...@@ -352,7 +350,6 @@
<Add option="-Wextra" /> <Add option="-Wextra" />
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-g" /> <Add option="-g" />
<Add option="-W" />
<Add option="-O0" /> <Add option="-O0" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-fno-exceptions" /> <Add option="-fno-exceptions" />
...@@ -380,7 +377,6 @@ ...@@ -380,7 +377,6 @@
<Compiler> <Compiler>
<Add option="-O3" /> <Add option="-O3" />
<Add option="-Wextra" /> <Add option="-Wextra" />
<Add option="-W" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-fno-exceptions" /> <Add option="-fno-exceptions" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
...@@ -406,7 +402,6 @@ ...@@ -406,7 +402,6 @@
<Compiler> <Compiler>
<Add option="-O3" /> <Add option="-O3" />
<Add option="-Wextra" /> <Add option="-Wextra" />
<Add option="-W" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-ffast-math" /> <Add option="-ffast-math" />
<Add option="-fno-exceptions" /> <Add option="-fno-exceptions" />
...@@ -628,6 +623,7 @@ ...@@ -628,6 +623,7 @@
<Unit filename="CBSPMeshFileLoader.h" /> <Unit filename="CBSPMeshFileLoader.h" />
<Unit filename="CBillboardSceneNode.cpp" /> <Unit filename="CBillboardSceneNode.cpp" />
<Unit filename="CBillboardSceneNode.h" /> <Unit filename="CBillboardSceneNode.h" />
<Unit filename="CBlit.h" />
<Unit filename="CBoneSceneNode.cpp" /> <Unit filename="CBoneSceneNode.cpp" />
<Unit filename="CBoneSceneNode.h" /> <Unit filename="CBoneSceneNode.h" />
<Unit filename="CBurningShader_Raster_Reference.cpp" /> <Unit filename="CBurningShader_Raster_Reference.cpp" />
......
VERSION_MAJOR = 1 VERSION_MAJOR = 1
VERSION_MINOR = 8 VERSION_MINOR = 8
VERSION_RELEASE = 0-SVN VERSION_RELEASE = 0
# Irrlicht Engine 1.8.0-SVN # Irrlicht Engine 1.8.0
# Makefile for Linux # Makefile for Linux
# #
# To use, just run: # To use, just run:
......
...@@ -67,14 +67,16 @@ namespace irr ...@@ -67,14 +67,16 @@ namespace irr
// ----------------------- Generic ---------------------------------- // ----------------------- Generic ----------------------------------
//! a more useful memset for pixel //! a more useful memset for pixel
inline void memset32 ( void * dest, const u32 value, u32 bytesize ) // (standard memset only works with 8-bit values)
inline void memset32(void * dest, const u32 value, u32 bytesize)
{ {
u32 * d = (u32*) dest; u32 * d = (u32*) dest;
u32 i; u32 i;
i = bytesize >> ( 2 + 3 ); // loops unrolled to reduce the number of increments by factor ~8.
while( i ) i = bytesize >> (2 + 3);
while (i)
{ {
d[0] = value; d[0] = value;
d[1] = value; d[1] = value;
...@@ -91,13 +93,47 @@ inline void memset32 ( void * dest, const u32 value, u32 bytesize ) ...@@ -91,13 +93,47 @@ inline void memset32 ( void * dest, const u32 value, u32 bytesize )
} }
i = (bytesize >> 2 ) & 7; i = (bytesize >> 2 ) & 7;
while( i ) while (i)
{ {
d[0] = value; d[0] = value;
d += 1; d += 1;
i -= 1; i -= 1;
} }
}
//! a more useful memset for pixel
// (standard memset only works with 8-bit values)
inline void memset16(void * dest, const u16 value, u32 bytesize)
{
u16 * d = (u16*) dest;
u32 i;
// loops unrolled to reduce the number of increments by factor ~8.
i = bytesize >> (1 + 3);
while (i)
{
d[0] = value;
d[1] = value;
d[2] = value;
d[3] = value;
d[4] = value;
d[5] = value;
d[6] = value;
d[7] = value;
d += 8;
--i;
}
i = (bytesize >> 1 ) & 7;
while (i)
{
d[0] = value;
++d;
--i;
}
} }
/* /*
......
...@@ -29,7 +29,7 @@ static bool testLineRendering(video::E_DRIVER_TYPE type) ...@@ -29,7 +29,7 @@ static bool testLineRendering(video::E_DRIVER_TYPE type)
scene::ISceneManager* smgr = device->getSceneManager(); scene::ISceneManager* smgr = device->getSceneManager();
scene::IAnimatedMesh* mesh = smgr->getMesh("../media/sydney.md2"); scene::IAnimatedMesh* mesh = smgr->getMesh("./media/sydney.md2");
if (!mesh) if (!mesh)
{ {
device->closeDevice(); device->closeDevice();
...@@ -46,7 +46,7 @@ static bool testLineRendering(video::E_DRIVER_TYPE type) ...@@ -46,7 +46,7 @@ static bool testLineRendering(video::E_DRIVER_TYPE type)
{ {
node->setMaterialFlag(video::EMF_LIGHTING, false); node->setMaterialFlag(video::EMF_LIGHTING, false);
node->setMD2Animation(scene::EMAT_STAND); node->setMD2Animation(scene::EMAT_STAND);
node->setMaterialTexture( 0, driver->getTexture("../media/sydney.bmp") ); node->setMaterialTexture( 0, driver->getTexture("./media/sydney.bmp") );
} }
smgr->addCameraSceneNode(0, core::vector3df(0,30,-40), core::vector3df(0,5,0)); smgr->addCameraSceneNode(0, core::vector3df(0,30,-40), core::vector3df(0,5,0));
...@@ -64,7 +64,7 @@ static bool testLineRendering(video::E_DRIVER_TYPE type) ...@@ -64,7 +64,7 @@ static bool testLineRendering(video::E_DRIVER_TYPE type)
device->run(); device->run();
device->drop(); device->drop();
return result; return result;
} }
bool antiAliasing() bool antiAliasing()
{ {
......
...@@ -71,6 +71,9 @@ bool testWithDriver(video::E_DRIVER_TYPE driverType) ...@@ -71,6 +71,9 @@ bool testWithDriver(video::E_DRIVER_TYPE driverType)
default: break; default: break;
} }
// TODO: mode is buggy, but required for skybox. So driver supports it, but would core dump here.
if (driverType==video::EDT_BURNINGSVIDEO && Type==scene::EPT_TRIANGLE_FAN)
continue;
driver->setMaterial(Buffer.Material); driver->setMaterial(Buffer.Material);
driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
driver->drawVertexPrimitiveList(Buffer.getVertices(), driver->drawVertexPrimitiveList(Buffer.getVertices(),
......
...@@ -20,7 +20,7 @@ bool testLastFrame() ...@@ -20,7 +20,7 @@ bool testLastFrame()
video::IVideoDriver* driver = device->getVideoDriver(); video::IVideoDriver* driver = device->getVideoDriver();
scene::ISceneManager * smgr = device->getSceneManager(); scene::ISceneManager * smgr = device->getSceneManager();
scene::IAnimatedMesh* mesh = smgr->getMesh("../media/sydney.md2"); scene::IAnimatedMesh* mesh = smgr->getMesh("./media/sydney.md2");
bool result = (mesh != 0); bool result = (mesh != 0);
if (mesh) if (mesh)
...@@ -31,7 +31,7 @@ bool testLastFrame() ...@@ -31,7 +31,7 @@ bool testLastFrame()
{ {
node->setPosition(vector3df(20, 0, 30)); node->setPosition(vector3df(20, 0, 30));
node->setMaterialFlag(video::EMF_LIGHTING, false); node->setMaterialFlag(video::EMF_LIGHTING, false);
node->setMaterialTexture(0, driver->getTexture("../media/sydney.bmp")); node->setMaterialTexture(0, driver->getTexture("./media/sydney.bmp"));
node->setLoopMode(false); node->setLoopMode(false);
(void)smgr->addCameraSceneNode(); (void)smgr->addCameraSceneNode();
...@@ -84,7 +84,7 @@ bool testNormals() ...@@ -84,7 +84,7 @@ bool testNormals()
video::IVideoDriver* driver = device->getVideoDriver(); video::IVideoDriver* driver = device->getVideoDriver();
scene::ISceneManager * smgr = device->getSceneManager(); scene::ISceneManager * smgr = device->getSceneManager();
scene::IAnimatedMesh* mesh = smgr->getMesh("../media/sydney.md2"); scene::IAnimatedMesh* mesh = smgr->getMesh("./media/sydney.md2");
bool result = (mesh != 0); bool result = (mesh != 0);
if (mesh) if (mesh)
...@@ -95,7 +95,7 @@ bool testNormals() ...@@ -95,7 +95,7 @@ bool testNormals()
node->setPosition(vector3df(20, 0, 30)); node->setPosition(vector3df(20, 0, 30));
node->setMaterialFlag(video::EMF_LIGHTING, false); node->setMaterialFlag(video::EMF_LIGHTING, false);
node->setDebugDataVisible(scene::EDS_NORMALS); node->setDebugDataVisible(scene::EDS_NORMALS);
node->setMaterialTexture(0, driver->getTexture("../media/sydney.bmp")); node->setMaterialTexture(0, driver->getTexture("./media/sydney.bmp"));
node->setLoopMode(false); node->setLoopMode(false);
(void)smgr->addCameraSceneNode(); (void)smgr->addCameraSceneNode();
......
...@@ -54,6 +54,7 @@ static bool withSphere(video::E_DRIVER_TYPE type) ...@@ -54,6 +54,7 @@ static bool withSphere(video::E_DRIVER_TYPE type)
bool result = takeScreenshotAndCompareAgainstReference(driver, "-ucpsphere.png"); bool result = takeScreenshotAndCompareAgainstReference(driver, "-ucpsphere.png");
device->closeDevice(); device->closeDevice();
device->run();
device->drop(); device->drop();
return result; return result;
} }
......
...@@ -8,30 +8,27 @@ ...@@ -8,30 +8,27 @@
<Build> <Build>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/FileToHeader" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\FileToHeader" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-W" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/FileToHeader" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\FileToHeader" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-Wall" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -40,12 +37,12 @@ ...@@ -40,12 +37,12 @@
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-W" />
</Compiler> </Compiler>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,27 +8,24 @@ ...@@ -8,27 +8,24 @@
<Build> <Build>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/win32-gcc/GUIEditor.exe" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\win32-gcc\GUIEditor.exe" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/GUIEditor" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\GUIEditor" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" /> <Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
...@@ -36,7 +33,7 @@ ...@@ -36,7 +33,7 @@
<Add library="Irrlicht" /> <Add library="Irrlicht" />
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -44,7 +41,7 @@ ...@@ -44,7 +41,7 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -74,6 +71,7 @@ ...@@ -74,6 +71,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
...@@ -8,32 +8,29 @@ ...@@ -8,32 +8,29 @@
<Build> <Build>
<Target title="Linux"> <Target title="Linux">
<Option platforms="Unix;" /> <Option platforms="Unix;" />
<Option output="../../bin/Linux/MeshConverter" prefix_auto="0" extension_auto="0" /> <Option output="..\..\bin\Linux\MeshConverter" prefix_auto="0" extension_auto="0" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" /> <Add option="-D_IRR_STATIC_LIB_" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Xxf86vm" /> <Add library="Xxf86vm" />
<Add library="GL" /> <Add library="GL" />
<Add directory="../../lib/Linux" /> <Add directory="..\..\lib\Linux" />
</Linker> </Linker>
</Target> </Target>
<Target title="Windows"> <Target title="Windows">
<Option platforms="Windows;" /> <Option platforms="Windows;" />
<Option output="../../bin/Win32-gcc/MeshConverter" prefix_auto="0" extension_auto="1" /> <Option output="..\..\bin\Win32-gcc\MeshConverter" prefix_auto="0" extension_auto="1" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler> <Compiler>
<Add option="-Wall" />
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add directory="../../lib/Win32-gcc" /> <Add directory="..\..\lib\Win32-gcc" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
...@@ -41,9 +38,8 @@ ...@@ -41,9 +38,8 @@
<Add alias="All" targets="Windows;Linux;" /> <Add alias="All" targets="Windows;Linux;" />
</VirtualTargets> </VirtualTargets>
<Compiler> <Compiler>
<Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add directory="../../include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="Irrlicht" /> <Add library="Irrlicht" />
...@@ -52,6 +48,7 @@ ...@@ -52,6 +48,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment