Merged visual-programming into main

cg-tuwien · Sep 22, 2024 · 2bb3a1c · 2bb3a1c
1 parent 5ba47c2
commit 2bb3a1c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/parametric-renderer-core/graphs/BasicGraphShader.graph.wgsl b/parametric-renderer-core/graphs/BasicGraphShader.graph.wgsl
@@ -1,6 +1,6 @@
 
 
-fn evaluateImage(input2: vec2f) -> vec3f {
+fn sampleObject(input2: vec2f) -> vec3f {
 	var PI = 3.14159265359;
 	var HALF_PI = 3.14159265359 / 2.0;
 	var TWO_PI = 3.14159265359 * 2.0;

diff --git a/parametric-renderer-core/graphs/Heart.graph.wgsl b/parametric-renderer-core/graphs/Heart.graph.wgsl
@@ -1,6 +1,6 @@
 
 
-fn evaluateImage(input2: vec2f) -> vec3f {
+fn sampleObject(input2: vec2f) -> vec3f {
 	var PI = 3.14159265359;
 	var HALF_PI = 3.14159265359 / 2.0;
 	var TWO_PI = 3.14159265359 * 2.0;

diff --git a/parametric-renderer-core/graphs/HeartSphere.graph.wgsl b/parametric-renderer-core/graphs/HeartSphere.graph.wgsl
@@ -55,7 +55,7 @@ fn Sphere(input2: vec2f) -> vec3f {
 }
 
 
-fn evaluateImage(input2: vec2f) -> vec3f {
+fn sampleObject(input2: vec2f) -> vec3f {
 	var PI = 3.14159265359;
 	var HALF_PI = 3.14159265359 / 2.0;
 	var TWO_PI = 3.14159265359 * 2.0;

diff --git a/parametric-renderer-core/graphs/Sphere.graph.wgsl b/parametric-renderer-core/graphs/Sphere.graph.wgsl
@@ -1,6 +1,6 @@
 
 
-fn evaluateImage(input2: vec2f) -> vec3f {
+fn sampleObject(input2: vec2f) -> vec3f {
 	var PI = 3.14159265359;
 	var HALF_PI = 3.14159265359 / 2.0;
 	var TWO_PI = 3.14159265359 * 2.0;

diff --git a/src/components/EditorAndOutput.vue b/src/components/EditorAndOutput.vue
@@ -74,7 +74,7 @@ watchEffect(() => {
 const openFile = useOpenFile(
   // Open the first .wgsl file if it exists
   props.fs.listFiles().find((v) => v.endsWith(".wgsl")) ?? null,
-  props.fs
+  props.fs,
 );
 
 const canvasContainer = ref<HTMLDivElement | null>(null);
@@ -87,7 +87,7 @@ watchEffect(() => {
 {
   // TODO: Make the Rust side pull files instead of this
   const referencedFiles = shallowRef(
-    new Map<FilePath, Readonly<Ref<string | null>>>()
+    new Map<FilePath, Readonly<Ref<string | null>>>(),
   );
   watchImmediate(
     () => scene.state.value.models,
@@ -108,7 +108,7 @@ watchEffect(() => {
       }
 
       referencedFiles.value = newReferencedFiles;
-    }
+    },
   );
 
   watchEffect(() => {
@@ -153,7 +153,7 @@ const shadersDropdown = computed<SelectMixedOption[]>(() => {
       (fileName): SelectMixedOption => ({
         label: fileName,
         value: fileName,
-      })
+      }),
     )
     .concat({
       label: "New Shader...",
@@ -469,7 +469,6 @@ function saveGraphWgsl(filePath: FilePath, content: string) {
       <template #2>
         <n-split
           direction="horizontal"
-          style="height: 80vh"
           :max="0.75"
           :min="0.15"
           :default-size="0.5"

diff --git a/src/components/visual-programming/CodeGraph.vue b/src/components/visual-programming/CodeGraph.vue
@@ -579,7 +579,7 @@ async function logCode() {
   let visited: string[] = [];
   let fullCode =
     (await orderedCode(customFunctionNodes, visited)) +
-    "\n\nfn evaluateImage(input2: vec2f) -> vec3f {\n" +
+    "\n\nfn sampleObject(input2: vec2f) -> vec3f {\n" +
     (await orderedCode(allNodes, visited, "\t"));
 
   // fullCode += (await getNodesCode(endNode, [], graph, "\t")) + "}";