Skip to content

Commit 00436de

Browse files
Merge pull request #9 from ShaderFrog/parser-bump
GLSL Parser bump
2 parents d6a89b9 + aac8cbc commit 00436de

4 files changed

Lines changed: 13 additions & 14 deletions

File tree

package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shaderfrog/core",
3-
"version": "3.1.1",
3+
"version": "3.2.0",
44
"description": "Shaderfrog core",
55
"type": "module",
66
"files": [
@@ -34,7 +34,7 @@
3434
"@babel/core": "^7.21.8",
3535
"@babel/preset-env": "^7.21.5",
3636
"@babel/preset-typescript": "^7.21.5",
37-
"@shaderfrog/glsl-parser": "^7.0.0",
37+
"@shaderfrog/glsl-parser": "^7.0.1",
3838
"@swc/core": "^1.6.7",
3939
"@types/lodash.groupby": "^4.6.7",
4040
"@types/three": "^0.169.0",

src/graph/graph.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { expect, describe, it } from 'vitest';
33
import util from 'util';
44

55
import { generate, parse } from '@shaderfrog/glsl-parser';
6+
import { Program } from '@shaderfrog/glsl-parser/ast';
67

78
import { Graph, ShaderStage } from './graph-types';
89
import { addNode, outputNode, sourceNode } from './graph-node';
@@ -15,7 +16,6 @@ import {
1516
filterUniformNames,
1617
filterQualifiedStatements,
1718
} from './shader-sections';
18-
import { Program } from '@shaderfrog/glsl-parser/ast';
1919
import { numberNode } from './data-nodes';
2020
import { linkFromVertToFrag, makeEdge } from './edge';
2121
import { Engine, EngineContext, PhysicalNodeConstructor } from '../engine';

src/graph/parsers.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { generate, parse } from '@shaderfrog/glsl-parser';
1+
import { parse } from '@shaderfrog/glsl-parser';
22

33
import {
44
visit,
@@ -11,7 +11,6 @@ import { Engine, EngineContext } from '../engine';
1111
import preprocess from '@shaderfrog/glsl-parser/preprocessor';
1212
import {
1313
convert300MainToReturn,
14-
findMain,
1514
findMainOrThrow,
1615
from2To3,
1716
makeExpression,

0 commit comments

Comments
 (0)