From 346ffa33e7b5e054e1caeda54033da039b1689a2 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Fri, 11 Jan 2019 14:39:30 -0800
Subject: [PATCH] fixed marking for points & spheres; some cleanup
---
src/mol-gl/renderable/direct-volume.ts | 4 +---
src/mol-gl/renderable/points.ts | 4 +---
src/mol-gl/renderable/spheres.ts | 4 +---
src/mol-gl/shader/points.vert | 1 +
src/mol-gl/shader/spheres.vert | 1 +
5 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/mol-gl/renderable/direct-volume.ts b/src/mol-gl/renderable/direct-volume.ts
index b704e81ab..6010ff6fe 100644
--- a/src/mol-gl/renderable/direct-volume.ts
+++ b/src/mol-gl/renderable/direct-volume.ts
@@ -65,7 +65,5 @@ export function DirectVolumeRenderable(ctx: WebGLContext, id: number, values: Di
}
const shaderCode = DirectVolumeShaderCode
const renderItem = createRenderItem(ctx, 'triangles', shaderCode, schema, { ...values, ...internalValues })
- const renderable = createRenderable(renderItem, values, state);
-
- return renderable
+ return createRenderable(renderItem, values, state);
}
\ No newline at end of file
diff --git a/src/mol-gl/renderable/points.ts b/src/mol-gl/renderable/points.ts
index 05d3633e9..60f9f2436 100644
--- a/src/mol-gl/renderable/points.ts
+++ b/src/mol-gl/renderable/points.ts
@@ -30,7 +30,5 @@ export function PointsRenderable(ctx: WebGLContext, id: number, values: PointsVa
}
const shaderCode = PointsShaderCode
const renderItem = createRenderItem(ctx, 'points', shaderCode, schema, { ...values, ...internalValues })
- const renderable = createRenderable(renderItem, values, state);
-
- return renderable
+ return createRenderable(renderItem, values, state);
}
\ No newline at end of file
diff --git a/src/mol-gl/renderable/spheres.ts b/src/mol-gl/renderable/spheres.ts
index 4cb132301..0136658ab 100644
--- a/src/mol-gl/renderable/spheres.ts
+++ b/src/mol-gl/renderable/spheres.ts
@@ -32,7 +32,5 @@ export function SpheresRenderable(ctx: WebGLContext, id: number, values: Spheres
}
const shaderCode = SpheresShaderCode
const renderItem = createRenderItem(ctx, 'triangles', shaderCode, schema, { ...values, ...internalValues })
- const renderable = createRenderable(renderItem, values, state);
-
- return renderable
+ return createRenderable(renderItem, values, state);
}
\ No newline at end of file
diff --git a/src/mol-gl/shader/points.vert b/src/mol-gl/shader/points.vert
index 2504f1733..27fe6a387 100644
--- a/src/mol-gl/shader/points.vert
+++ b/src/mol-gl/shader/points.vert
@@ -21,6 +21,7 @@ attribute float aGroup;
void main(){
#pragma glslify: import('./chunks/assign-color-varying.glsl')
+ #pragma glslify: import('./chunks/assign-marker-varying.glsl')
#pragma glslify: import('./chunks/assign-position.glsl')
#pragma glslify: import('./chunks/assign-size.glsl')
diff --git a/src/mol-gl/shader/spheres.vert b/src/mol-gl/shader/spheres.vert
index 4c0740262..6203d8a3b 100644
--- a/src/mol-gl/shader/spheres.vert
+++ b/src/mol-gl/shader/spheres.vert
@@ -87,6 +87,7 @@ void quadraticProjection(const in float radius, const in vec3 position){
void main(void){
#pragma glslify: import('./chunks/assign-color-varying.glsl')
+ #pragma glslify: import('./chunks/assign-marker-varying.glsl')
#pragma glslify: import('./chunks/assign-size.glsl')
vRadius = size * matrixScale(uModelView);
--
GitLab