Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
deprecated-irrlicht-mac
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
deprecated-irrlicht-mac
Commits
6ad288bf
Commit
6ad288bf
authored
Feb 11, 2009
by
engineer_apple
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
git-svn-id:
svn://svn.code.sf.net/p/irrlicht/code/trunk@2210
dfc29bdd-3216-0410-991c-e03cc46cb475
parent
bebda484
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
examples/21.Quake3Explorer/main.cpp
examples/21.Quake3Explorer/main.cpp
+9
-2
source/Irrlicht/CQ3LevelMesh.cpp
source/Irrlicht/CQ3LevelMesh.cpp
+0
-5
No files found.
examples/21.Quake3Explorer/main.cpp
View file @
6ad288bf
...
...
@@ -100,7 +100,7 @@ void GameData::setDefault ()
loadParam
.
defaultLightMapMaterial
=
EMT_LIGHTMAP
;
loadParam
.
defaultModulate
=
EMFN_MODULATE_1X
;
loadParam
.
defaultFilter
=
EMF_ANISOTROPIC_FILTER
;
loadParam
.
verbose
=
1
;
loadParam
.
verbose
=
2
;
loadParam
.
mergeShaderBuffer
=
1
;
// merge meshbuffers with same material
loadParam
.
cleanUnResolvedMeshes
=
1
;
// should unresolved meshes be cleaned. otherwise blue texture
loadParam
.
loadAllShaders
=
1
;
// load all scripts in the script directory
...
...
@@ -111,8 +111,15 @@ void GameData::setDefault ()
CurrentMapName
=
""
;
CurrentArchiveList
.
clear
();
//! Explorer Media directory
CurrentArchiveList
.
push_back
(
StartupDir
+
"../../media/"
);
//! Add the original quake3 files before you load your custom map
//! Most mods are using the original shaders, models&items&weapons
CurrentArchiveList
.
push_back
(
"/q/baseq3/"
);
CurrentArchiveList
.
push_back
(
StartupDir
+
"../../media/map-20kdm2.pk3"
);
}
...
...
@@ -1086,7 +1093,7 @@ void CQuake3EventHandler::LoadMap ( const stringw &mapName, s32 collision )
*/
Q3ShaderFactory
(
Game
->
loadParam
,
Game
->
Device
,
Mesh
,
E_Q3_MESH_ITEMS
,
ShaderParent
,
Meta
,
false
);
Q3ShaderFactory
(
Game
->
loadParam
,
Game
->
Device
,
Mesh
,
E_Q3_MESH_FOG
,
FogParent
,
0
,
false
);
Q3ShaderFactory
(
Game
->
loadParam
,
Game
->
Device
,
Mesh
,
E_Q3_MESH_UNRESOLVED
,
UnresolvedParent
,
0
,
true
);
Q3ShaderFactory
(
Game
->
loadParam
,
Game
->
Device
,
Mesh
,
E_Q3_MESH_UNRESOLVED
,
UnresolvedParent
,
Meta
,
true
);
/*
...
...
source/Irrlicht/CQ3LevelMesh.cpp
View file @
6ad288bf
...
...
@@ -1488,11 +1488,6 @@ const IShader* CQ3LevelMesh::getShader( const c8 * filename, bool fileNameIsVali
if
(
file
)
{
getShader
(
file
);
if
(
LoadParam
.
verbose
>
1
)
{
message
=
searchName
+
" found "
+
Shader
[
index
].
name
;
os
::
Printer
::
log
(
"quake3:getShader"
,
message
.
c_str
(),
ELL_INFORMATION
);
}
file
->
drop
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment