diff options
author | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
commit | 959831f4ef5a3e797f576c3de08cd65032c997ad (patch) | |
tree | e7351908be5995f0b325b2ebeaa02d5a34b82583 /libraries/irrlicht-1.8/source/Irrlicht/CBSPMeshFileLoader.cpp | |
parent | Add info about changes to Irrlicht. (diff) | |
download | SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.zip SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.gz SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.bz2 SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.xz |
Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.
Diffstat (limited to '')
-rw-r--r-- | libraries/irrlicht-1.8/source/Irrlicht/CBSPMeshFileLoader.cpp | 214 |
1 files changed, 107 insertions, 107 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CBSPMeshFileLoader.cpp b/libraries/irrlicht-1.8/source/Irrlicht/CBSPMeshFileLoader.cpp index 01ac04a..7965cf2 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CBSPMeshFileLoader.cpp +++ b/libraries/irrlicht-1.8/source/Irrlicht/CBSPMeshFileLoader.cpp | |||
@@ -1,107 +1,107 @@ | |||
1 | // Copyright (C) 2002-2012 Nikolaus Gebhardt | 1 | // Copyright (C) 2002-2012 Nikolaus Gebhardt |
2 | // This file is part of the "Irrlicht Engine". | 2 | // This file is part of the "Irrlicht Engine". |
3 | // For conditions of distribution and use, see copyright notice in irrlicht.h | 3 | // For conditions of distribution and use, see copyright notice in irrlicht.h |
4 | 4 | ||
5 | #include "IrrCompileConfig.h" | 5 | #include "IrrCompileConfig.h" |
6 | #ifdef _IRR_COMPILE_WITH_BSP_LOADER_ | 6 | #ifdef _IRR_COMPILE_WITH_BSP_LOADER_ |
7 | 7 | ||
8 | #include "CBSPMeshFileLoader.h" | 8 | #include "CBSPMeshFileLoader.h" |
9 | #include "CQ3LevelMesh.h" | 9 | #include "CQ3LevelMesh.h" |
10 | 10 | ||
11 | namespace irr | 11 | namespace irr |
12 | { | 12 | { |
13 | namespace scene | 13 | namespace scene |
14 | { | 14 | { |
15 | 15 | ||
16 | //! Constructor | 16 | //! Constructor |
17 | CBSPMeshFileLoader::CBSPMeshFileLoader(scene::ISceneManager* smgr, | 17 | CBSPMeshFileLoader::CBSPMeshFileLoader(scene::ISceneManager* smgr, |
18 | io::IFileSystem* fs) | 18 | io::IFileSystem* fs) |
19 | : FileSystem(fs), SceneManager(smgr) | 19 | : FileSystem(fs), SceneManager(smgr) |
20 | { | 20 | { |
21 | 21 | ||
22 | #ifdef _DEBUG | 22 | #ifdef _DEBUG |
23 | setDebugName("CBSPMeshFileLoader"); | 23 | setDebugName("CBSPMeshFileLoader"); |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | if (FileSystem) | 26 | if (FileSystem) |
27 | FileSystem->grab(); | 27 | FileSystem->grab(); |
28 | } | 28 | } |
29 | 29 | ||
30 | 30 | ||
31 | //! destructor | 31 | //! destructor |
32 | CBSPMeshFileLoader::~CBSPMeshFileLoader() | 32 | CBSPMeshFileLoader::~CBSPMeshFileLoader() |
33 | { | 33 | { |
34 | if (FileSystem) | 34 | if (FileSystem) |
35 | FileSystem->drop(); | 35 | FileSystem->drop(); |
36 | } | 36 | } |
37 | 37 | ||
38 | 38 | ||
39 | //! returns true if the file maybe is able to be loaded by this class | 39 | //! returns true if the file maybe is able to be loaded by this class |
40 | //! based on the file extension (e.g. ".bsp") | 40 | //! based on the file extension (e.g. ".bsp") |
41 | bool CBSPMeshFileLoader::isALoadableFileExtension(const io::path& filename) const | 41 | bool CBSPMeshFileLoader::isALoadableFileExtension(const io::path& filename) const |
42 | { | 42 | { |
43 | return core::hasFileExtension ( filename, "bsp", "shader", "cfg" ); | 43 | return core::hasFileExtension ( filename, "bsp", "shader", "cfg" ); |
44 | } | 44 | } |
45 | 45 | ||
46 | 46 | ||
47 | //! creates/loads an animated mesh from the file. | 47 | //! creates/loads an animated mesh from the file. |
48 | //! \return Pointer to the created mesh. Returns 0 if loading failed. | 48 | //! \return Pointer to the created mesh. Returns 0 if loading failed. |
49 | //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). | 49 | //! If you no longer need the mesh, you should call IAnimatedMesh::drop(). |
50 | //! See IReferenceCounted::drop() for more information. | 50 | //! See IReferenceCounted::drop() for more information. |
51 | IAnimatedMesh* CBSPMeshFileLoader::createMesh(io::IReadFile* file) | 51 | IAnimatedMesh* CBSPMeshFileLoader::createMesh(io::IReadFile* file) |
52 | { | 52 | { |
53 | s32 type = core::isFileExtension ( file->getFileName(), "bsp", "shader", "cfg" ); | 53 | s32 type = core::isFileExtension ( file->getFileName(), "bsp", "shader", "cfg" ); |
54 | CQ3LevelMesh* q = 0; | 54 | CQ3LevelMesh* q = 0; |
55 | 55 | ||
56 | switch ( type ) | 56 | switch ( type ) |
57 | { | 57 | { |
58 | case 1: | 58 | case 1: |
59 | q = new CQ3LevelMesh(FileSystem, SceneManager, LoadParam); | 59 | q = new CQ3LevelMesh(FileSystem, SceneManager, LoadParam); |
60 | 60 | ||
61 | // determine real shaders in LoadParam | 61 | // determine real shaders in LoadParam |
62 | if ( 0 == LoadParam.loadAllShaders ) | 62 | if ( 0 == LoadParam.loadAllShaders ) |
63 | { | 63 | { |
64 | q->getShader("scripts/common.shader"); | 64 | q->getShader("scripts/common.shader"); |
65 | q->getShader("scripts/sfx.shader"); | 65 | q->getShader("scripts/sfx.shader"); |
66 | q->getShader("scripts/gfx.shader"); | 66 | q->getShader("scripts/gfx.shader"); |
67 | q->getShader("scripts/liquid.shader"); | 67 | q->getShader("scripts/liquid.shader"); |
68 | q->getShader("scripts/models.shader"); | 68 | q->getShader("scripts/models.shader"); |
69 | q->getShader("scripts/walls.shader"); | 69 | q->getShader("scripts/walls.shader"); |
70 | //q->getShader("scripts/sky.shader"); | 70 | //q->getShader("scripts/sky.shader"); |
71 | } | 71 | } |
72 | 72 | ||
73 | if ( q->loadFile(file) ) | 73 | if ( q->loadFile(file) ) |
74 | return q; | 74 | return q; |
75 | 75 | ||
76 | q->drop(); | 76 | q->drop(); |
77 | break; | 77 | break; |
78 | 78 | ||
79 | case 2: | 79 | case 2: |
80 | q = new CQ3LevelMesh(FileSystem, SceneManager,LoadParam); | 80 | q = new CQ3LevelMesh(FileSystem, SceneManager,LoadParam); |
81 | q->getShader( file ); | 81 | q->getShader( file ); |
82 | return q; | 82 | return q; |
83 | break; | 83 | break; |
84 | 84 | ||
85 | case 3: | 85 | case 3: |
86 | // load quake 3 loading parameter | 86 | // load quake 3 loading parameter |
87 | if ( file->getFileName() == "levelparameter.cfg" ) | 87 | if ( file->getFileName() == "levelparameter.cfg" ) |
88 | { | 88 | { |
89 | file->read ( &LoadParam, sizeof ( LoadParam ) ); | 89 | file->read ( &LoadParam, sizeof ( LoadParam ) ); |
90 | } | 90 | } |
91 | else | 91 | else |
92 | { | 92 | { |
93 | q = new CQ3LevelMesh(FileSystem, SceneManager,LoadParam); | 93 | q = new CQ3LevelMesh(FileSystem, SceneManager,LoadParam); |
94 | q->getConfiguration( file ); | 94 | q->getConfiguration( file ); |
95 | return q; | 95 | return q; |
96 | } | 96 | } |
97 | break; | 97 | break; |
98 | } | 98 | } |
99 | 99 | ||
100 | return 0; | 100 | return 0; |
101 | } | 101 | } |
102 | 102 | ||
103 | } // end namespace scene | 103 | } // end namespace scene |
104 | } // end namespace irr | 104 | } // end namespace irr |
105 | 105 | ||
106 | #endif // _IRR_COMPILE_WITH_BSP_LOADER_ | 106 | #endif // _IRR_COMPILE_WITH_BSP_LOADER_ |
107 | 107 | ||