MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge revision 4711:4723 from branch to ogl-es: 

- Fix c::b project obj folder names. Some static builds had used the shared folders (thx @ gerdb for reporting)
- C::B project files work again on newer Linux-distributions which have cleaned up their dev-lib dependencies.
- Fix a reorder warning.
- triangle3d constructor and line3d::getIntersectionWithSphere passing vectors now as const-ref instead of per value. Thx @nemo for reporting.
- Mention another fonttool to create Irrlicht fonts (by Armen).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4829 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2014-05-08 13:25:22 +00:00
parent 1319f4a7d6
commit fbc4fa7da1
31 changed files with 172 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes.txt
View File

@ -7,6 +7,7 @@ Changes in ogl-es (not yet released - will be merged with trunk at some point)
--------------------------
Changes in 1.9 (not yet released)
- Fix c::b project obj folder names. Some static builds had used the shared folders (thx @ gerdb for reporting)
- Add ITexture::getSource which can be used to check where the last IVideoDriver::getTexture call found the texture.
- Add IMeshTextureLoader interface and replace texture-loading algorithms in most meshloaders.
- CGUICheckBox no longer gives up focus on EMIE_LMOUSE_LEFT_UP (thx @Demre for reporting)
@ -47,6 +48,7 @@ Changes in 1.9 (not yet released)
--------------------------
Changes in 1.8.2
- C::B project files work again on newer Linux-distributions which have cleaned up their dev-lib dependencies.
- Makefile for the new IrrFontTool links now correctly to libfontconfig
--------------------------

12
examples/01.HelloWorld/HelloWorld.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -17,21 +17,21 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add library="X11" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
<Target title="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 compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/02.Quake3Map/Quake3Map.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -17,21 +17,21 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add library="X11" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
<Target title="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 compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

14
examples/03.CustomSceneNode/CustomSceneNode.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="Linux">
<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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -18,14 +18,14 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="GL" />
<Add directory="..\..\lib\Linux\" />
<Add library="X11" />
<Add directory="../../lib/Linux/" />
</Linker>
</Target>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -33,7 +33,7 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
</Build>
@ -42,11 +42,11 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />
<Add directory="..\..\bin\gcc" />
<Add directory="../../bin/gcc" />
</Linker>
<Unit filename="main.cpp" />
<Extensions>

12
examples/04.Movement/Movement.cbp
View File

@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -15,12 +15,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -29,9 +29,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add library="X11" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/05.UserInterface/UserInterface.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="Windows">
<Option platforms="Windows;" />
<Option output="..\..\bin\Win32-gcc\UserInterface" prefix_auto="0" extension_auto="1" />
<Option output="../../bin/Win32-gcc/UserInterface" prefix_auto="0" extension_auto="1" />
<Option type="1" />
<Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -29,9 +29,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add library="X11" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/06.2DGraphics/2DGraphics.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -29,9 +29,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add library="X11" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/07.Collision/Collision.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -29,9 +29,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/08.SpecialFX/SpecialFX.cbp
View File

@ -8,19 +8,19 @@
<Build>
<Target title="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 compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -28,9 +28,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -39,7 +39,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/09.Meshviewer/Meshviewer.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,11 +16,11 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<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 compiler="gcc" />
<Compiler>
@ -29,9 +29,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/10.Shaders/Shaders.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -30,9 +30,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -41,7 +41,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/11.PerPixelLighting/PerPixelLighting.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="Windows">
<Option platforms="Windows;" />
<Option output="..\..\bin\Win32-gcc\PerPixelLighting" prefix_auto="0" extension_auto="1" />
<Option output="../../bin/Win32-gcc/PerPixelLighting" prefix_auto="0" extension_auto="1" />
<Option type="1" />
<Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<Option platforms="Unix;" />
<Option output="..\..\bin\Linux\PerPixelLighting" prefix_auto="0" extension_auto="0" />
<Option output="../../bin/Linux/PerPixelLighting" prefix_auto="0" extension_auto="0" />
<Option type="1" />
<Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -30,9 +30,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -41,7 +41,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/12.TerrainRendering/TerrainRendering.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -30,9 +30,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -41,7 +41,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/13.RenderToTexture/RenderToTexture.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -29,9 +29,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/15.LoadIrrFile/LoadIrrFile.cbp
View File

@ -8,19 +8,19 @@
<Build>
<Target title="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 compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -28,9 +28,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -39,7 +39,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

14
examples/16.Quake3MapShader/Quake3MapShader.cbp
View File

@ -8,31 +8,31 @@
<Build>
<Target title="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 compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
<Add option="-g" />
<Add option="-D_IRR_STATIC_LIB_" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -41,7 +41,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/18.SplitScreen/SplitScreen.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -29,9 +29,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/19.MouseAndJoystick/MouseAndJoystick.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="Windows">
<Option platforms="Windows;" />
<Option output="..\..\bin\Win32-gcc\MouseAndJoystick" prefix_auto="0" extension_auto="1" />
<Option output="../../bin/Win32-gcc/MouseAndJoystick" prefix_auto="0" extension_auto="1" />
<Option type="1" />
<Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -30,9 +30,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -41,7 +41,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/20.ManagedLights/ManagedLights.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -31,9 +31,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -42,7 +42,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/21.Quake3Explorer/Quake3Explorer.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -17,21 +17,21 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
<Target title="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 compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/22.MaterialViewer/MaterialViewer.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -29,9 +29,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/23.SMeshHandling/SMeshHandling.cbp
View File

@ -8,28 +8,28 @@
<Build>
<Target title="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 compiler="gcc" />
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
<Compiler>
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

13
examples/24.CursorControl/CursorControl.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -17,14 +17,15 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add library="X11" />
<Add library="Xcursor" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -32,7 +33,7 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
</Build>
@ -41,7 +42,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/25.XmlHandling/XmlHandling.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -17,21 +17,21 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
<Target title="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 compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

12
examples/26.OcclusionQuery/OcclusionQuery.cbp
View File

@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -15,12 +15,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -29,9 +29,9 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -40,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />

14
examples/Demo/demo.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="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 compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
@ -16,12 +16,12 @@
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -30,10 +30,10 @@
</Compiler>
<Linker>
<Add library="Xxf86vm" />
<Add library="Xcursor" />
<Add library="X11" />
<Add library="Irrlicht" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
</Build>
@ -43,11 +43,11 @@
<Compiler>
<Add option="-Wall" />
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />
<Add directory="..\..\lib\gcc" />
<Add directory="../../lib/gcc" />
</Linker>
<Unit filename="CDemo.cpp" />
<Unit filename="CDemo.h" />

2
include/line3d.h
View File

@ -110,7 +110,7 @@ class line3d
\return True if there is an intersection.
If there is one, the distance to the first intersection point
is stored in outdistance. */
bool getIntersectionWithSphere(vector3d<T> sorigin, T sradius, f64& outdistance) const
bool getIntersectionWithSphere(const vector3d<T>& sorigin, T sradius, f64& outdistance) const
{
const vector3d<T> q = sorigin - start;
T c = q.getLength();

2
include/triangle3d.h
View File

@ -24,7 +24,7 @@ namespace core
//! Constructor for an all 0 triangle
triangle3d() {}
//! Constructor for triangle with given three vertices
triangle3d(vector3d<T> v1, vector3d<T> v2, vector3d<T> v3) : pointA(v1), pointB(v2), pointC(v3) {}
triangle3d(const vector3d<T>& v1, const vector3d<T>& v2, const vector3d<T>& v3) : pointA(v1), pointB(v2), pointC(v3) {}
//! Equality operator
bool operator==(const triangle3d<T>& other) const

9
source/Irrlicht/Irrlicht-gcc.cbp
View File

@ -179,7 +179,7 @@
<Option platforms="Windows;" />
<Option output="../../lib/Win32-gcc/Irrlicht" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="../obj/win32-gcc-release-dll" />
<Option object_output="../obj/win32-gcc-release-static" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
@ -342,7 +342,7 @@
<Option platforms="Unix;" />
<Option output="../../lib/Linux/libIrrlicht" prefix_auto="0" extension_auto="1" />
<Option working_dir="" />
<Option object_output="../obj/linux-gcc-debug-shared" />
<Option object_output="../obj/linux-gcc-debug-static" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
@ -370,7 +370,7 @@
<Option platforms="Unix;" />
<Option output="../../lib/Linux/libIrrlicht" prefix_auto="0" extension_auto="1" />
<Option working_dir="" />
<Option object_output="../obj/linux-gcc-release-shared" />
<Option object_output="../obj/linux-gcc-release-static" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
@ -395,7 +395,7 @@
<Option platforms="Unix;" />
<Option output="../../lib/Linux/libIrrlicht" prefix_auto="0" extension_auto="1" />
<Option working_dir="" />
<Option object_output="../obj/linux-gcc-release-fast-shared" />
<Option object_output="../obj/linux-gcc-release-fast-static" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
@ -507,7 +507,6 @@
<Unit filename="../../include/IMeshManipulator.h" />
<Unit filename="../../include/IMeshSceneNode.h" />
<Unit filename="../../include/IMeshTextureLoader.h" />
<Unit filename="../../include/IMeshTextureLoader.h" />
<Unit filename="../../include/IMeshWriter.h" />
<Unit filename="../../include/IMetaTriangleSelector.h" />
<Unit filename="../../include/IOSOperator.h" />

3
tools/IrrFontTool/readme.txt
View File

@ -11,3 +11,6 @@ newFontTool:
just windows. It will create multiple image files and an .xml file
containing meta information for the generated font.
You can find it as FontTool.exe in the /bin directory.
A third tool to create fonts for Irrlicht is web-based on maintained by armen:
http://armen138.me/FontMapper/

11
tools/MeshConverter/MeshConverter.cbp
View File

@ -8,7 +8,7 @@
<Build>
<Target title="Linux">
<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 compiler="gcc" />
<Compiler>
@ -18,19 +18,20 @@
<Linker>
<Add library="Xxf86vm" />
<Add library="GL" />
<Add directory="..\..\lib\Linux" />
<Add library="X11" />
<Add directory="../../lib/Linux" />
</Linker>
</Target>
<Target title="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 compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
<Linker>
<Add directory="..\..\lib\Win32-gcc" />
<Add directory="../../lib/Win32-gcc" />
</Linker>
</Target>
</Build>
@ -39,7 +40,7 @@
</VirtualTargets>
<Compiler>
<Add option="-g" />
<Add directory="..\..\include" />
<Add directory="../../include" />
</Compiler>
<Linker>
<Add library="Irrlicht" />