Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
Niflib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Grant Kim
Niflib
Commits
bb1e8f61
Commit
bb1e8f61
authored
16 years ago
by
Tazpn
Browse files
Options
Downloads
Patches
Plain Diff
niflib: Update texture map index enumeration to reflect newer NIF versions
parent
3a8485ad
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/obj/NiTexturingProperty.cpp
+49
-17
49 additions, 17 deletions
src/obj/NiTexturingProperty.cpp
with
49 additions
and
17 deletions
src/obj/NiTexturingProperty.cpp
+
49
−
17
View file @
bb1e8f61
...
...
@@ -1528,10 +1528,18 @@ TexDesc NiTexturingProperty::GetTexture( int n ) const {
return
glowTexture
;
case
BUMP_MAP
:
return
bumpMapTexture
;
case
NORMAL_MAP
:
return
normalTexture
;
case
UNKNOWN2_MAP
:
return
unknown2Texture
;
case
DECAL_0_MAP
:
return
decal0Texture
;
case
DECAL_1_MAP
:
return
decal1Texture
;
case
DECAL_2_MAP
:
return
decal2Texture
;
case
DECAL_3_MAP
:
return
decal3Texture
;
};
//If we get here, an invalid texture was requested.
...
...
@@ -1573,7 +1581,7 @@ void NiTexturingProperty::SetTextureCount( int new_count ) {
ClearTexture
(
i
);
}
}
textureCount
=
new_count
;
textureCount
=
new_count
;
}
void
NiTexturingProperty
::
SetShaderTextureCount
(
int
new_count
)
{
...
...
@@ -1615,14 +1623,14 @@ void NiTexturingProperty::SetTexture( int n, TexDesc & new_val ) {
hasBumpMapTexture
=
true
;
bumpMapTexture
=
new_val
;
break
;
case
NORMAL_MAP
:
hasNormalTexture
=
true
;
normalTexture
=
new_val
;
break
;
case
UNKNOWN2_MAP
:
hasUnknown2Texture
=
true
;
unknown2Texture
=
new_val
;
break
;
case
NORMAL_MAP
:
hasNormalTexture
=
true
;
normalTexture
=
new_val
;
break
;
case
UNKNOWN2_MAP
:
hasUnknown2Texture
=
true
;
unknown2Texture
=
new_val
;
break
;
case
DECAL_0_MAP
:
hasDecal0Texture
=
true
;
decal0Texture
=
new_val
;
...
...
@@ -1631,14 +1639,14 @@ void NiTexturingProperty::SetTexture( int n, TexDesc & new_val ) {
hasDecal1Texture
=
true
;
decal1Texture
=
new_val
;
break
;
case
DECAL_2_MAP
:
hasDecal2Texture
=
true
;
decal2Texture
=
new_val
;
break
;
case
DECAL_3_MAP
:
hasDecal3Texture
=
true
;
decal3Texture
=
new_val
;
break
;
case
DECAL_2_MAP
:
hasDecal2Texture
=
true
;
decal2Texture
=
new_val
;
break
;
case
DECAL_3_MAP
:
hasDecal3Texture
=
true
;
decal3Texture
=
new_val
;
break
;
};
}
...
...
@@ -1666,10 +1674,18 @@ bool NiTexturingProperty::HasTexture( int n ) const {
return
hasGlowTexture
;
case
BUMP_MAP
:
return
hasBumpMapTexture
;
case
NORMAL_MAP
:
return
hasNormalTexture
;
case
UNKNOWN2_MAP
:
return
hasUnknown2Texture
;
case
DECAL_0_MAP
:
return
hasDecal0Texture
;
case
DECAL_1_MAP
:
return
hasDecal1Texture
;
case
DECAL_2_MAP
:
return
hasDecal2Texture
;
case
DECAL_3_MAP
:
return
hasDecal3Texture
;
default:
throw
runtime_error
(
"You have specified an invalid texture type."
);
};
...
...
@@ -1701,6 +1717,14 @@ void NiTexturingProperty::ClearTexture( int n ) {
hasBumpMapTexture
=
false
;
bumpMapTexture
.
source
=
NULL
;
break
;
case
NORMAL_MAP
:
hasNormalTexture
=
false
;
normalTexture
.
source
=
NULL
;
break
;
case
UNKNOWN2_MAP
:
hasUnknown2Texture
=
false
;
unknown2Texture
.
source
=
NULL
;
break
;
case
DECAL_0_MAP
:
hasDecal0Texture
=
false
;
decal0Texture
.
source
=
NULL
;
...
...
@@ -1709,6 +1733,14 @@ void NiTexturingProperty::ClearTexture( int n ) {
hasDecal1Texture
=
false
;
decal1Texture
.
source
=
NULL
;
break
;
case
DECAL_2_MAP
:
hasDecal2Texture
=
false
;
decal2Texture
.
source
=
NULL
;
break
;
case
DECAL_3_MAP
:
hasDecal3Texture
=
false
;
decal3Texture
.
source
=
NULL
;
break
;
};
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment