Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 11:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code review feedback

Browse source
This commit is contained in:
Anthony J. Thibault 2018-06-08 16:22:00 -07:00
parent b5a3b25adc
commit c3da4e74de
3 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/shared/src/AvatarConstants.h
View file

@ -31,7 +31,6 @@ const float DEFAULT_AVATAR_HEAD_MASS = 20.0f;
const float DEFAULT_AVATAR_LEFTHAND_MASS = 2.0f; const float DEFAULT_AVATAR_LEFTHAND_MASS = 2.0f;
const float DEFAULT_AVATAR_RIGHTHAND_MASS = 2.0f; const float DEFAULT_AVATAR_RIGHTHAND_MASS = 2.0f;
// Used when avatar is missing joints... (avatar space) // Used when avatar is missing joints... (avatar space)
const glm::quat DEFAULT_AVATAR_MIDDLE_EYE_ROT { Quaternions::Y_180 }; const glm::quat DEFAULT_AVATAR_MIDDLE_EYE_ROT { Quaternions::Y_180 };
const glm::vec3 DEFAULT_AVATAR_MIDDLE_EYE_POS { 0.0f, 0.6f, 0.0f }; const glm::vec3 DEFAULT_AVATAR_MIDDLE_EYE_POS { 0.0f, 0.6f, 0.0f };

2
scripts/defaultScripts.js
View file

@ -33,8 +33,6 @@ var DEFAULT_SCRIPTS_COMBINED = [
]; ];
var DEFAULT_SCRIPTS_SEPARATE = [ var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js", "system/controllers/controllerScripts.js",
//"developer/step.js",
//"developer/cg_lean.js"
//"system/chat.js" //"system/chat.js"
]; ];

2
tests/animation/src/data/avatar.json
View file

@ -363,7 +363,7 @@
{ {
"id": "idle", "id": "idle",
"interpTarget": 6, "interpTarget": 6,
"interpDuration": 3, "interpDuration": 6,
"transitions": [ "transitions": [
{ "var": "isMovingForward", "state": "walkFwd" }, { "var": "isMovingForward", "state": "walkFwd" },
{ "var": "isMovingBackward", "state": "walkBwd" }, { "var": "isMovingBackward", "state": "walkBwd" },