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
f30d95ee
Commit
f30d95ee
authored
6 years ago
by
Brad Payne (Vir Linden)
Browse files
Options
Downloads
Patches
Plain Diff
SL-915 - more on alignment for 32-bit
parent
430f9420
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llmath/llrigginginfo.cpp
+2
-1
2 additions, 1 deletion
indra/llmath/llrigginginfo.cpp
indra/llmath/llrigginginfo.h
+14
-0
14 additions, 0 deletions
indra/llmath/llrigginginfo.h
with
16 additions
and
1 deletion
indra/llmath/llrigginginfo.cpp
+
2
−
1
View file @
f30d95ee
...
@@ -86,7 +86,8 @@ void LLJointRiggingInfo::merge(const LLJointRiggingInfo& other)
...
@@ -86,7 +86,8 @@ void LLJointRiggingInfo::merge(const LLJointRiggingInfo& other)
LLJointRiggingInfoTab
::
LLJointRiggingInfoTab
()
:
LLJointRiggingInfoTab
::
LLJointRiggingInfoTab
()
:
mRigInfoPtr
(
NULL
),
mRigInfoPtr
(
NULL
),
mSize
(
0
)
mSize
(
0
),
mNeedsUpdate
(
true
)
{
{
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/llmath/llrigginginfo.h
+
14
−
0
View file @
f30d95ee
...
@@ -55,6 +55,17 @@ class LLJointRiggingInfo
...
@@ -55,6 +55,17 @@ class LLJointRiggingInfo
ll_aligned_free_16
(
ptr
);
ll_aligned_free_16
(
ptr
);
}
}
void
*
operator
new
[](
size_t
size
)
{
return
ll_aligned_malloc_16
(
size
);
}
void
operator
delete
[](
void
*
ptr
)
{
ll_aligned_free_16
(
ptr
);
}
private
:
private
:
LL_ALIGN_16
(
LLVector4a
mRiggedExtents
[
2
]);
LL_ALIGN_16
(
LLVector4a
mRiggedExtents
[
2
]);
bool
mIsRiggedTo
;
bool
mIsRiggedTo
;
...
@@ -74,6 +85,8 @@ class LLJointRiggingInfoTab
...
@@ -74,6 +85,8 @@ class LLJointRiggingInfoTab
void
merge
(
const
LLJointRiggingInfoTab
&
src
);
void
merge
(
const
LLJointRiggingInfoTab
&
src
);
LLJointRiggingInfo
&
operator
[](
S32
i
)
{
return
mRigInfoPtr
[
i
];
}
LLJointRiggingInfo
&
operator
[](
S32
i
)
{
return
mRigInfoPtr
[
i
];
}
const
LLJointRiggingInfo
&
operator
[](
S32
i
)
const
{
return
mRigInfoPtr
[
i
];
};
const
LLJointRiggingInfo
&
operator
[](
S32
i
)
const
{
return
mRigInfoPtr
[
i
];
};
bool
needsUpdate
()
{
return
mNeedsUpdate
;
}
void
setNeedsUpdate
(
bool
val
)
{
mNeedsUpdate
=
val
;
}
private
:
private
:
// Not implemented
// Not implemented
LLJointRiggingInfoTab
&
operator
=
(
const
LLJointRiggingInfoTab
&
src
);
LLJointRiggingInfoTab
&
operator
=
(
const
LLJointRiggingInfoTab
&
src
);
...
@@ -81,6 +94,7 @@ class LLJointRiggingInfoTab
...
@@ -81,6 +94,7 @@ class LLJointRiggingInfoTab
LLJointRiggingInfo
*
mRigInfoPtr
;
LLJointRiggingInfo
*
mRigInfoPtr
;
S32
mSize
;
S32
mSize
;
bool
mNeedsUpdate
;
};
};
#endif
#endif
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