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
3a8485ad
Commit
3a8485ad
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
f035b68b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/gen/enums.h
+6
-2
6 additions, 2 deletions
include/gen/enums.h
src/gen/enums.cpp
+4
-0
4 additions, 0 deletions
src/gen/enums.cpp
src/obj/NiTexturingProperty.cpp
+17
-0
17 additions, 0 deletions
src/obj/NiTexturingProperty.cpp
with
27 additions
and
2 deletions
include/gen/enums.h
+
6
−
2
View file @
3a8485ad
...
...
@@ -497,8 +497,12 @@ enum TexType {
GLOSS_MAP
=
3
,
/*!< Allows the specularity (glossyness) of an object to differ across its surface. */
GLOW_MAP
=
4
,
/*!< Creates a glowing effect. Basically an incandescence map. */
BUMP_MAP
=
5
,
/*!< Used to make the object appear to have more detail than it really does. */
DECAL_0_MAP
=
6
,
/*!< For placing images on the object like stickers. */
DECAL_1_MAP
=
7
,
/*!< For placing images on the object like stickers. */
NORMAL_MAP
=
6
,
/*!< Used to make the object appear to have more detail than it really does. */
UNKNOWN2_MAP
=
7
,
/*!< Unknown map. */
DECAL_0_MAP
=
8
,
/*!< For placing images on the object like stickers. */
DECAL_1_MAP
=
9
,
/*!< For placing images on the object like stickers. */
DECAL_2_MAP
=
10
,
/*!< For placing images on the object like stickers. */
DECAL_3_MAP
=
11
,
/*!< For placing images on the object like stickers. */
};
ostream
&
operator
<<
(
ostream
&
out
,
TexType
const
&
val
);
...
...
This diff is collapsed.
Click to expand it.
src/gen/enums.cpp
+
4
−
0
View file @
3a8485ad
...
...
@@ -879,8 +879,12 @@ ostream & operator<<( ostream & out, TexType const & val ) {
case
GLOSS_MAP
:
return
out
<<
"GLOSS_MAP"
;
case
GLOW_MAP
:
return
out
<<
"GLOW_MAP"
;
case
BUMP_MAP
:
return
out
<<
"BUMP_MAP"
;
case
NORMAL_MAP
:
return
out
<<
"NORMAL_MAP"
;
case
UNKNOWN2_MAP
:
return
out
<<
"UNKNOWN2_MAP"
;
case
DECAL_0_MAP
:
return
out
<<
"DECAL_0_MAP"
;
case
DECAL_1_MAP
:
return
out
<<
"DECAL_1_MAP"
;
case
DECAL_2_MAP
:
return
out
<<
"DECAL_2_MAP"
;
case
DECAL_3_MAP
:
return
out
<<
"DECAL_3_MAP"
;
default:
return
out
<<
"Invalid Value! - "
<<
(
unsigned
int
)(
val
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/obj/NiTexturingProperty.cpp
+
17
−
0
View file @
3a8485ad
...
...
@@ -1573,6 +1573,7 @@ void NiTexturingProperty::SetTextureCount( int new_count ) {
ClearTexture
(
i
);
}
}
textureCount
=
new_count
;
}
void
NiTexturingProperty
::
SetShaderTextureCount
(
int
new_count
)
{
...
...
@@ -1614,6 +1615,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
DECAL_0_MAP
:
hasDecal0Texture
=
true
;
decal0Texture
=
new_val
;
...
...
@@ -1622,6 +1631,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
;
};
}
...
...
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