Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GRL - instancing support #14460

Merged
merged 8 commits into from Oct 25, 2023
Merged

GRL - instancing support #14460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
93a54f6
GRL - instancing support
RolandCsibrei Oct 25, 2023
432e2e3
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js
RolandCsibrei Oct 25, 2023
34311f9
fixed view projection
RolandCsibrei Oct 25, 2023
8278d6d
fixed uniform decalaration in shader as well
RolandCsibrei Oct 25, 2023
3713766
removed unused uniforms
RolandCsibrei Oct 25, 2023
7897e7d
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js
RolandCsibrei Oct 25, 2023
b37f127
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js
RolandCsibrei Oct 25, 2023
f1e3f51
w instances/wo instances fix
RolandCsibrei Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/dev/core/src/Materials/GreasedLine/greasedLinePluginMaterial.ts
View file
Open in desktop
Expand Up @@ -372,7 +372,7 @@ export class GreasedLinePluginMaterial extends MaterialPluginBase implements IGr
grlCounters = grl_nextAndCounters.w;
mat4 grlMatrix = viewProjection * world;
mat4 grlMatrix = viewProjection * finalWorld;
vec4 grlFinalPosition = grlMatrix * vec4( positionUpdated , 1.0 );
vec4 grlPrevPos = grlMatrix * vec4( grlPrevious + grlPositionOffset, 1.0 );
vec4 grlNextPos = grlMatrix * vec4( grlNext + grlPositionOffset, 1.0 );
Expand Down
4 changes: 3 additions & 1 deletion packages/dev/core/src/Materials/GreasedLine/greasedLineSimpleMaterial.ts
View file
Open in desktop
Expand Up @@ -71,7 +71,9 @@ export class GreasedLineSimpleMaterial extends ShaderMaterial implements IGrease
{
attributes,
uniforms: [
"worldViewProjection",
"world",
"viewProjection",
"view",
"projection",
"grlColorsWidth",
"grlUseColors",
Expand Down
12 changes: 10 additions & 2 deletions packages/dev/core/src/Shaders/greasedLine.vertex.fx
View file
Open in desktop
@@ -1,10 +1,11 @@
precision highp float;
#include<instancesDeclaration>

attribute float grl_widths;
attribute vec3 grl_offsets;
attribute float grl_colorPointers;
attribute vec3 position;
uniform mat4 worldViewProjection;
uniform mat4 viewProjection;
uniform mat4 projection;
varying float grlCounters;
varying float grlColorPointer;
Expand All @@ -28,6 +29,8 @@ varying float grlColorPointer;
#endif

void main() {
#include<instancesVertex>

grlColorPointer = grl_colorPointers;

#ifdef GREASED_LINE_CAMERA_FACING
Expand All @@ -39,7 +42,12 @@ void main() {
vec3 grlNext = grl_nextAndCounters.xyz;
grlCounters = grl_nextAndCounters.w;

mat4 grlMatrix = worldViewProjection;
#ifdef INSTANCES
mat4 grlMatrix = viewProjection * finalWorld ;
#else
mat4 grlMatrix = viewProjection * world ;
#endif

vec3 grlPositionOffset = grl_offsets;
vec4 grlFinalPosition = grlMatrix * vec4( position + grlPositionOffset , 1.0 );
vec4 grlPrevPos = grlMatrix * vec4( grlPrevious + grlPositionOffset, 1.0 );
Expand Down