Lasers and teleport scale with avatar

luiscuenca committed 9 years ago

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

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 18 files). Show all

Unified · Split

@@ -1868,7 +1868,7 @@ void GeometryCache::renderLine(gpu::Batch& batch, const glm::vec2& p1, const glm · 1867 unmodified lines
1868	1868
1869	1869
1870	1870	void GeometryCache::renderGlowLine(gpu::Batch& batch, const glm::vec3& p1, const glm::vec3& p2,
1871		− const glm::vec4& color, float glowIntensity, float glowWidth, int id) {
	1871	+ const glm::vec4& color, float glowIntensity, float glowWidth, float glowScale, int id) {
1872	1872
1873	1873	// Disable glow lines on OSX
1874	1874	#ifndef Q_OS_WIN
@@ -1931,9 +1931,10 @@ void GeometryCache::renderGlowLine(gpu::Batch& batch, const glm::vec3& p1, const · 56 unmodified lines
1931	1931	vec4 p1;
1932	1932	vec4 p2;
1933	1933	vec4 color;
	1934	+ float scale;
1934	1935	};
1935	1936
1936		− LineData lineData { vec4(p1, 1.0f), vec4(p2, 1.0f), color };
	1937	+ LineData lineData { vec4(p1, 1.0f), vec4(p2, 1.0f), color, glowScale };
1937	1938	details.uniformBuffer->resize(sizeof(LineData));
1938	1939	details.uniformBuffer->setSubData(0, lineData);
1939	1940	}