History

Lasers and teleport scale with avatar

luiscuenca committed 9 years ago

Commit 332cb481 parent d5eb67018 files · +59 −18Browse files

Showing the changes to scripts/system/controllers/controllerModules (6 of 18 files). Show all

Unified · Split

6 files
  1. scripts/system/controllers/controllerModules/farActionGrabEntity.js +1 −0
  2. scripts/system/controllers/controllerModules/farTrigger.js +1 −0
  3. scripts/system/controllers/controllerModules/inEditMode.js +1 −0
  4. scripts/system/controllers/controllerModules/overlayLaserInput.js +1 −0
  5. scripts/system/controllers/controllerModules/teleport.js +4 −0
  6. scripts/system/controllers/controllerModules/webEntityLaserInput.js +1 −1
scripts/system/controllers/controllerModules/farActionGrabEntity.js+1−0
@@ -584,6 +584,7 @@ Script.include("/~/system/libraries/controllers.js"); · 583 unmodified lines
584 renderStates: renderStates,584 renderStates: renderStates,
585 faceAvatar: true,585 faceAvatar: true,
586 distanceScaleEnd: true,586 distanceScaleEnd: true,
587 scaleWithAvatar: true,
587 defaultRenderStates: defaultRenderStates588 defaultRenderStates: defaultRenderStates
588 });589 });
589 }590 }
scripts/system/controllers/controllerModules/farTrigger.js+1−0
@@ -190,6 +190,7 @@ Script.include("/~/system/libraries/controllers.js"); · 189 unmodified lines
190 renderStates: renderStates,190 renderStates: renderStates,
191 faceAvatar: true,191 faceAvatar: true,
192 distanceScaleEnd: true,192 distanceScaleEnd: true,
193 scaleWithAvatar: true,
193 defaultRenderStates: defaultRenderStates194 defaultRenderStates: defaultRenderStates
194 });195 });
195 196
scripts/system/controllers/controllerModules/inEditMode.js+1−0
@@ -237,6 +237,7 @@ Script.include("/~/system/libraries/utils.js"); · 236 unmodified lines
237 posOffset: getGrabPointSphereOffset(this.handToController(), true),237 posOffset: getGrabPointSphereOffset(this.handToController(), true),
238 renderStates: renderStates,238 renderStates: renderStates,
239 faceAvatar: true,239 faceAvatar: true,
240 scaleWithAvatar: true,
240 defaultRenderStates: defaultRenderStates241 defaultRenderStates: defaultRenderStates
241 });242 });
242 243
scripts/system/controllers/controllerModules/overlayLaserInput.js+1−0
@@ -371,6 +371,7 @@ Script.include("/~/system/libraries/controllers.js"); · 370 unmodified lines
371 posOffset: getGrabPointSphereOffset(this.handToController(), true),371 posOffset: getGrabPointSphereOffset(this.handToController(), true),
372 renderStates: renderStates,372 renderStates: renderStates,
373 faceAvatar: true,373 faceAvatar: true,
374 scaleWithAvatar: true,
374 defaultRenderStates: defaultRenderStates375 defaultRenderStates: defaultRenderStates
375 });376 });
376 377
scripts/system/controllers/controllerModules/teleport.js+4−0
@@ -153,6 +153,7 @@ Script.include("/~/system/libraries/controllers.js"); · 152 unmodified lines
153 joint: (_this.hand === RIGHT_HAND) ? "RightHand" : "LeftHand",153 joint: (_this.hand === RIGHT_HAND) ? "RightHand" : "LeftHand",
154 filter: RayPick.PICK_ENTITIES,154 filter: RayPick.PICK_ENTITIES,
155 faceAvatar: true,155 faceAvatar: true,
156 scaleWithAvatar: true,
156 centerEndY: false,157 centerEndY: false,
157 renderStates: teleportRenderStates,158 renderStates: teleportRenderStates,
158 defaultRenderStates: teleportDefaultRenderStates159 defaultRenderStates: teleportDefaultRenderStates
@@ -161,6 +162,7 @@ Script.include("/~/system/libraries/controllers.js"); · 2 unmodified lines
161 joint: (_this.hand === RIGHT_HAND) ? "RightHand" : "LeftHand",162 joint: (_this.hand === RIGHT_HAND) ? "RightHand" : "LeftHand",
162 filter: RayPick.PICK_ENTITIES | RayPick.PICK_INCLUDE_INVISIBLE,163 filter: RayPick.PICK_ENTITIES | RayPick.PICK_INCLUDE_INVISIBLE,
163 faceAvatar: true,164 faceAvatar: true,
165 scaleWithAvatar: true,
164 centerEndY: false,166 centerEndY: false,
165 renderStates: teleportRenderStates167 renderStates: teleportRenderStates
166 });168 });
@@ -168,6 +170,7 @@ Script.include("/~/system/libraries/controllers.js"); · 1 unmodified line
168 joint: "Avatar",170 joint: "Avatar",
169 filter: RayPick.PICK_ENTITIES,171 filter: RayPick.PICK_ENTITIES,
170 faceAvatar: true,172 faceAvatar: true,
173 scaleWithAvatar: true,
171 centerEndY: false,174 centerEndY: false,
172 renderStates: teleportRenderStates,175 renderStates: teleportRenderStates,
173 defaultRenderStates: teleportDefaultRenderStates176 defaultRenderStates: teleportDefaultRenderStates
@@ -176,6 +179,7 @@ Script.include("/~/system/libraries/controllers.js"); · 2 unmodified lines
176 joint: "Avatar",179 joint: "Avatar",
177 filter: RayPick.PICK_ENTITIES | RayPick.PICK_INCLUDE_INVISIBLE,180 filter: RayPick.PICK_ENTITIES | RayPick.PICK_INCLUDE_INVISIBLE,
178 faceAvatar: true,181 faceAvatar: true,
182 scaleWithAvatar: true,
179 centerEndY: false,183 centerEndY: false,
180 renderStates: teleportRenderStates184 renderStates: teleportRenderStates
181 });185 });
scripts/system/controllers/controllerModules/webEntityLaserInput.js+1−1
@@ -88,7 +88,6 @@ Script.include("/~/system/libraries/controllers.js"); · 87 unmodified lines
88 {name: "hold", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: holdPath}88 {name: "hold", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: holdPath}
89 ];89 ];
90 90
91
92 // triggered when stylus presses a web overlay/entity91 // triggered when stylus presses a web overlay/entity
93 var HAPTIC_STYLUS_STRENGTH = 1.0;92 var HAPTIC_STYLUS_STRENGTH = 1.0;
94 var HAPTIC_STYLUS_DURATION = 20.0;93 var HAPTIC_STYLUS_DURATION = 20.0;
@@ -452,6 +451,7 @@ Script.include("/~/system/libraries/controllers.js"); · 357 unmodified lines
452 posOffset: getGrabPointSphereOffset(this.handToController(), true),451 posOffset: getGrabPointSphereOffset(this.handToController(), true),
453 renderStates: renderStates,452 renderStates: renderStates,
454 faceAvatar: true,453 faceAvatar: true,
454 scaleWithAvatar: true,
455 defaultRenderStates: defaultRenderStates455 defaultRenderStates: defaultRenderStates
456 });456 });
457 }457 }