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

@@ -584,6 +584,7 @@ Script.include("/~/system/libraries/controllers.js"); · 583 unmodified lines
584	584	renderStates: renderStates,
585	585	faceAvatar: true,
586	586	distanceScaleEnd: true,
	587	+ scaleWithAvatar: true,
587	588	defaultRenderStates: defaultRenderStates
588	589	});
589	590	}

@@ -190,6 +190,7 @@ Script.include("/~/system/libraries/controllers.js"); · 189 unmodified lines
190	190	renderStates: renderStates,
191	191	faceAvatar: true,
192	192	distanceScaleEnd: true,
	193	+ scaleWithAvatar: true,
193	194	defaultRenderStates: defaultRenderStates
194	195	});
195	196

@@ -237,6 +237,7 @@ Script.include("/~/system/libraries/utils.js"); · 236 unmodified lines
237	237	posOffset: getGrabPointSphereOffset(this.handToController(), true),
238	238	renderStates: renderStates,
239	239	faceAvatar: true,
	240	+ scaleWithAvatar: true,
240	241	defaultRenderStates: defaultRenderStates
241	242	});
242	243

@@ -371,6 +371,7 @@ Script.include("/~/system/libraries/controllers.js"); · 370 unmodified lines
371	371	posOffset: getGrabPointSphereOffset(this.handToController(), true),
372	372	renderStates: renderStates,
373	373	faceAvatar: true,
	374	+ scaleWithAvatar: true,
374	375	defaultRenderStates: defaultRenderStates
375	376	});
376	377

@@ -153,6 +153,7 @@ Script.include("/~/system/libraries/controllers.js"); · 152 unmodified lines
153	153	joint: (_this.hand === RIGHT_HAND) ? "RightHand" : "LeftHand",
154	154	filter: RayPick.PICK_ENTITIES,
155	155	faceAvatar: true,
	156	+ scaleWithAvatar: true,
156	157	centerEndY: false,
157	158	renderStates: teleportRenderStates,
158	159	defaultRenderStates: teleportDefaultRenderStates
@@ -161,6 +162,7 @@ Script.include("/~/system/libraries/controllers.js"); · 2 unmodified lines
161	162	joint: (_this.hand === RIGHT_HAND) ? "RightHand" : "LeftHand",
162	163	filter: RayPick.PICK_ENTITIES \| RayPick.PICK_INCLUDE_INVISIBLE,
163	164	faceAvatar: true,
	165	+ scaleWithAvatar: true,
164	166	centerEndY: false,
165	167	renderStates: teleportRenderStates
166	168	});
@@ -168,6 +170,7 @@ Script.include("/~/system/libraries/controllers.js"); · 1 unmodified line
168	170	joint: "Avatar",
169	171	filter: RayPick.PICK_ENTITIES,
170	172	faceAvatar: true,
	173	+ scaleWithAvatar: true,
171	174	centerEndY: false,
172	175	renderStates: teleportRenderStates,
173	176	defaultRenderStates: teleportDefaultRenderStates
@@ -176,6 +179,7 @@ Script.include("/~/system/libraries/controllers.js"); · 2 unmodified lines
176	179	joint: "Avatar",
177	180	filter: RayPick.PICK_ENTITIES \| RayPick.PICK_INCLUDE_INVISIBLE,
178	181	faceAvatar: true,
	182	+ scaleWithAvatar: true,
179	183	centerEndY: false,
180	184	renderStates: teleportRenderStates
181	185	});

@@ -88,7 +88,6 @@ Script.include("/~/system/libraries/controllers.js"); · 87 unmodified lines
88	88	{name: "hold", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: holdPath}
89	89	];
90	90
91		−
92	91	// triggered when stylus presses a web overlay/entity
93	92	var HAPTIC_STYLUS_STRENGTH = 1.0;
94	93	var HAPTIC_STYLUS_DURATION = 20.0;
@@ -452,6 +451,7 @@ Script.include("/~/system/libraries/controllers.js"); · 357 unmodified lines
452	451	posOffset: getGrabPointSphereOffset(this.handToController(), true),
453	452	renderStates: renderStates,
454	453	faceAvatar: true,
	454	+ scaleWithAvatar: true,
455	455	defaultRenderStates: defaultRenderStates
456	456	});
457	457	}