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
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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
Testicular Slingshot
Alchemy Viewer
Commits
01c236df
Commit
01c236df
authored
13 years ago
by
Seraph Linden
Browse files
Options
Downloads
Patches
Plain Diff
Fix for butt gravity direction.
Added more displacement range for butt leftright.
parent
05e23c39
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llphysicsmotion.cpp
+11
-11
11 additions, 11 deletions
indra/newview/llphysicsmotion.cpp
indra/newview/llpolymesh.cpp
+1
-1
1 addition, 1 deletion
indra/newview/llpolymesh.cpp
with
12 additions
and
12 deletions
indra/newview/llphysicsmotion.cpp
+
11
−
11
View file @
01c236df
...
...
@@ -346,7 +346,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
""
,
"mPelvis"
,
character
,
LLVector3
(
0
,
1
,
0
),
LLVector3
(
0
,
-
1
,
0
),
controller
);
if
(
!
motion
->
initialize
())
{
...
...
@@ -420,7 +420,7 @@ F32 LLPhysicsMotion::calculateAcceleration_local(const F32 velocity_local,
const
F32
time_delta
)
{
// const F32 smoothing = getParamValue("Smoothing");
static
const
F32
smoothing
=
3.0
f
;
// Removed smoothing param since it's probably not necessary
static
const
F32
smoothing
=
3.0
f
;
// Removed smoothing param since it's probably not necessary
const
F32
acceleration_local
=
velocity_local
-
mVelocityJoint_local
;
const
F32
smoothed_acceleration_local
=
...
...
@@ -624,15 +624,15 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
llassert_always
(
driver_param
);
if
(
driver_param
)
{
// If this is one of our "hidden" driver params, then make sure it's
// the default value.
if
((
driver_param
->
getGroup
()
!=
VISUAL_PARAM_GROUP_TWEAKABLE
)
&&
(
driver_param
->
getGroup
()
!=
VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
))
{
mCharacter
->
setVisualParamWeight
(
driver_param
,
0
,
FALSE
);
}
// If this is one of our "hidden" driver params, then make sure it's
// the default value.
if
((
driver_param
->
getGroup
()
!=
VISUAL_PARAM_GROUP_TWEAKABLE
)
&&
(
driver_param
->
getGroup
()
!=
VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
))
{
mCharacter
->
setVisualParamWeight
(
driver_param
,
0
,
FALSE
);
}
for
(
LLDriverParam
::
entry_list_t
::
iterator
iter
=
driver_param
->
mDriven
.
begin
();
iter
!=
driver_param
->
mDriven
.
end
();
++
iter
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llpolymesh.cpp
+
1
−
1
View file @
01c236df
...
...
@@ -647,7 +647,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
if
(
!
strcmp
(
morphName
,
"Small_Butt"
))
{
mMorphData
.
insert
(
clone_morph_param
(
morph_data
,
LLVector3
(
0
,
0.0
2
f
,
0
),
LLVector3
(
0
,
0.0
3
f
,
0
),
"Butt_Physics_LeftRight_Driven"
));
}
}
...
...
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