Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
705181a5
Commit
705181a5
authored
9 months ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Whitespace fix
parent
2310b98c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llprimitive/llmodel.h
+3
-3
3 additions, 3 deletions
indra/llprimitive/llmodel.h
with
3 additions
and
3 deletions
indra/llprimitive/llmodel.h
+
3
−
3
View file @
705181a5
...
@@ -152,7 +152,7 @@ class LLModel final : public LLVolume
...
@@ -152,7 +152,7 @@ class LLModel final : public LLVolume
LLModel
::
PhysicsMesh
mPhysicsShapeMesh
;
LLModel
::
PhysicsMesh
mPhysicsShapeMesh
;
};
};
LLModel
(
const
LLVolumeParams
&
params
,
F32
detail
);
LLModel
(
const
LLVolumeParams
&
params
,
F32
detail
);
~
LLModel
();
~
LLModel
();
bool
loadModel
(
std
::
istream
&
is
);
bool
loadModel
(
std
::
istream
&
is
);
...
@@ -376,7 +376,7 @@ class LLModelInstanceBase
...
@@ -376,7 +376,7 @@ class LLModelInstanceBase
LLMatrix4
mTransform
;
LLMatrix4
mTransform
;
material_map
mMaterial
;
material_map
mMaterial
;
LLModelInstanceBase
(
LLModel
*
model
,
const
LLMatrix4
&
transform
,
const
material_map
&
materials
)
LLModelInstanceBase
(
LLModel
*
model
,
const
LLMatrix4
&
transform
,
const
material_map
&
materials
)
:
mModel
(
model
),
mTransform
(
transform
),
mMaterial
(
materials
)
:
mModel
(
model
),
mTransform
(
transform
),
mMaterial
(
materials
)
{
{
}
}
...
@@ -405,7 +405,7 @@ class LLModelInstance final : public LLModelInstanceBase
...
@@ -405,7 +405,7 @@ class LLModelInstance final : public LLModelInstanceBase
LLUUID
mMeshID
;
LLUUID
mMeshID
;
S32
mLocalMeshID
;
S32
mLocalMeshID
;
LLModelInstance
(
LLModel
*
model
,
const
std
::
string
&
label
,
const
LLMatrix4
&
transform
,
const
material_map
&
materials
)
LLModelInstance
(
LLModel
*
model
,
const
std
::
string
&
label
,
const
LLMatrix4
&
transform
,
const
material_map
&
materials
)
:
LLModelInstanceBase
(
model
,
transform
,
materials
),
mLabel
(
label
)
:
LLModelInstanceBase
(
model
,
transform
,
materials
),
mLabel
(
label
)
{
{
mLocalMeshID
=
-
1
;
mLocalMeshID
=
-
1
;
...
...
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