cli flags fixed

Author: EliCDavis

drawing/coloring/colors.go

@@ -0,0 +1,21 @@
+package coloring
+
+func Black() WebColor {
+	return WebColor{0, 0, 0, 255}
+}
+
+func White() WebColor {
+	return WebColor{255, 255, 255, 255}
+}
+
+func Red() WebColor {
+	return WebColor{255, 0, 0, 255}
+}
+
+func Green() WebColor {
+	return WebColor{0, 255, 0, 255}
+}
+
+func Blue() WebColor {
+	return WebColor{0, 0, 255, 255}
+}

drawing/coloring/colors_test.go

@@ -0,0 +1,33 @@
+package coloring_test
+
+import (
+	"testing"
+
+	"github.com/EliCDavis/polyform/drawing/coloring"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestColor(t *testing.T) {
+	tests := map[string]struct {
+		input coloring.WebColor
+		wantR byte
+		wantG byte
+		wantB byte
+		wantA byte
+	}{
+		"black": {input: coloring.Black(), wantR: 0, wantG: 0, wantB: 0, wantA: 255},
+		"white": {input: coloring.White(), wantR: 255, wantG: 255, wantB: 255, wantA: 255},
+		"red":   {input: coloring.Red(), wantR: 255, wantG: 0, wantB: 0, wantA: 255},
+		"green": {input: coloring.Green(), wantR: 0, wantG: 255, wantB: 0, wantA: 255},
+		"blue":  {input: coloring.Blue(), wantR: 0, wantG: 0, wantB: 255, wantA: 255},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			assert.Equal(t, tc.wantR, tc.input.R)
+			assert.Equal(t, tc.wantG, tc.input.G)
+			assert.Equal(t, tc.wantB, tc.input.B)
+			assert.Equal(t, tc.wantA, tc.input.A)
+		})
+	}
+}

examples/crop-pointcloud/main.go

@@ -152,27 +152,34 @@ func (bn BaloonNode) Process() (modeling.Mesh, error) {
 		Transform(meshops.CustomTransformer{
 			Func: func(m modeling.Mesh) (results modeling.Mesh, err error) {
 				posData := m.Float3Attribute(modeling.PositionAttribute)
+				scaleData := m.Float3Attribute(modeling.ScaleAttribute)
 				count := posData.Len()
 
 				newPos := make([]vector3.Float64, count)
+				newScale := make([]vector3.Float64, count)
 
 				baloonPos := bn.Position.Data()
 				baloonRadius := bn.Radius.Data()
 				baloonStrength := bn.Strength.Data()
 
 				for i := 0; i < count; i++ {
 					curPos := posData.At(i)
+					curScale := scaleData.At(i)
 					dir := curPos.Sub(baloonPos)
 					len := dir.Length()
 
 					if len <= baloonRadius {
 						newPos[i] = baloonPos.Add(dir.Scale(baloonStrength))
+						newScale[i] = curScale.Exp().Scale(baloonStrength).Log()
 					} else {
 						newPos[i] = curPos
+						newScale[i] = curScale
 					}
 				}
 
-				return m.SetFloat3Attribute(modeling.PositionAttribute, newPos), nil
+				return m.
+					SetFloat3Attribute(modeling.PositionAttribute, newPos).
+					SetFloat3Attribute(modeling.ScaleAttribute, newScale), nil
 			},
 		}), nil
 }
@@ -187,7 +194,11 @@ func main() {
 		Mesh: (&PointcloudNode{
 			Path: (&generator.ParameterNode[string]{
 				Name:         "Pointcloud Path",
-				DefaultValue: "C:/dev/projects/sfm/gaussian-splatting/output/84e0f0cd-f/point_cloud/iteration_30000/point_cloud.ply",
+				DefaultValue: "./point_cloud/iteration_30000/point_cloud.ply",
+				CLI: &generator.CliParameterNodeConfig[string]{
+					FlagName: "splat",
+					Usage:    "Path to the guassian splat to load (PLY file)",
+				},
 			}),
 			MinOpacity: &generator.ParameterNode[float64]{
 				Name:         "Minimum Opacity",
@@ -234,9 +245,9 @@ func main() {
 		Description: "Crop and Scale portions of Gaussian Splat data",
 		Authors:     []generator.Author{{Name: "Eli C Davis"}},
 		WebScene: &room.WebScene{
-			Background: coloring.WebColor{0, 0, 0, 255},
+			Background: coloring.Black(),
 			Fog: room.WebSceneFog{
-				Color: coloring.WebColor{0, 0, 0, 255},
+				Color: coloring.Black(),
 				Near:  5,
 				Far:   25,
 			},

formats/splat/write.go

@@ -4,7 +4,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"log"
 	"math"
 
 	"github.com/EliCDavis/bitlib"
@@ -36,7 +35,6 @@ func Write(out io.Writer, mesh modeling.Mesh) error {
 	}
 
 	count := mesh.PrimitiveCount()
-	log.Println(count)
 
 	posData := mesh.Float3Attribute(modeling.PositionAttribute)
 	scaleData := mesh.Float3Attribute(modeling.ScaleAttribute)

generator/app.go

@@ -8,6 +8,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"path"
 	"path/filepath"
@@ -17,20 +18,6 @@ import (
 	"github.com/EliCDavis/polyform/nodes"
 )
 
-type producerCache map[string]Artifact
-
-func (pc producerCache) Lookup(producer string) Artifact {
-	if pc == nil {
-		return nil
-	}
-
-	if artifact, ok := pc[producer]; ok {
-		return artifact
-	}
-
-	return nil
-}
-
 type App struct {
 	Name        string
 	Version     string
@@ -43,23 +30,6 @@ type App struct {
 	nodeIDs map[nodes.Node]string
 }
 
-func writeJSONError(out io.Writer, err error) error {
-	var d struct {
-		Error string `json:"error"`
-	} = struct {
-		Error string `json:"error"`
-	}{
-		Error: err.Error(),
-	}
-	data, err := json.Marshal(d)
-	if err != nil {
-		return err
-	}
-
-	_, err = out.Write(data)
-	return err
-}
-
 func writeProducersToZip(path string, producers map[string]nodes.NodeOutput[Artifact], zw *zip.Writer) error {
 	if producers == nil {
 		panic("can't write nil producers")
@@ -103,19 +73,19 @@ func (a App) getParameters() []Parameter {
 	for p := range parameterSet {
 		uniqueParams = append(uniqueParams, p)
 	}
+
+	log.Printf("Params found %v", uniqueParams)
 	return uniqueParams
 }
 
 func recurseDependenciesType[T any](dependent nodes.Dependent) []T {
 	allDependencies := make([]T, 0)
 	for _, dep := range dependent.Dependencies() {
-		subDependent, ok := dep.(nodes.Dependent)
-		if ok {
-			subDependencies := recurseDependenciesType[T](subDependent)
-			allDependencies = append(allDependencies, subDependencies...)
-		}
+		subDependent := dep.Dependency()
+		subDependencies := recurseDependenciesType[T](subDependent)
+		allDependencies = append(allDependencies, subDependencies...)
 
-		ofT, ok := dep.(T)
+		ofT, ok := subDependent.(T)
 		if ok {
 			allDependencies = append(allDependencies, ofT)
 		}
@@ -296,7 +266,7 @@ func (a *App) Run() error {
 			Aliases:     []string{"serve"},
 			Run: func() error {
 				serveCmd := flag.NewFlagSet("serve", flag.ExitOnError)
-				// a.initialize(serveCmd)
+				a.initialize(serveCmd)
 				hostFlag := serveCmd.String("host", "localhost", "interface to bind to")
 				portFlag := serveCmd.String("port", "8080", "port to serve over")
 

generator/app_server.go

@@ -17,6 +17,23 @@ import (
 	"github.com/EliCDavis/polyform/generator/room"
 )
 
+func writeJSONError(out io.Writer, err error) error {
+	var d struct {
+		Error string `json:"error"`
+	} = struct {
+		Error string `json:"error"`
+	}{
+		Error: err.Error(),
+	}
+	data, err := json.Marshal(d)
+	if err != nil {
+		return err
+	}
+
+	_, err = out.Write(data)
+	return err
+}
+
 type pageData struct {
 	Title       string
 	Version     string

generator/html/js/index.js

@@ -68,6 +68,8 @@ textureEquirec.colorSpace = THREE.SRGBColorSpace;
 // scene.background = textureEquirec;
 scene.fog = new THREE.Fog(viewportSettings.fog.color, viewportSettings.fog.near, viewportSettings.fog.far);
 
+const viewerContainer = new THREE.Group();
+scene.add(viewerContainer);
 
 const renderer = new THREE.WebGLRenderer({ antialias: RenderingConfiguration.AntiAlias });
 renderer.setPixelRatio(window.devicePixelRatio);
@@ -138,7 +140,8 @@ const App = {
     Renderer: renderer,
     MeshGenFolder: panel.addFolder("Mesh Generation"),
     Scene: scene,
-    OrbitControls: orbitControls
+    OrbitControls: orbitControls,
+    ViewerScene: viewerContainer
 }
 
 const requestManager = new RequestManager();
@@ -168,11 +171,11 @@ schemaManager.subscribe((schema) => {
     ErrorManager.ClearError();
 
     if (producerScene != null) {
-        scene.remove(producerScene)
+        viewerContainer.remove(producerScene)
     }
 
     producerScene = new THREE.Group();
-    scene.add(producerScene);
+    viewerContainer.add(producerScene);
     schema.producers.forEach(producer => {
         const fileExt = producer.split('.').pop().toLowerCase();
 
@@ -192,7 +195,7 @@ schemaManager.subscribe((schema) => {
 
                     // We have to do this weird thing because the pivot of the scene
                     // Isn't always the center of the AABB
-                    gltf.scene.position.set(0, - mid + aabbHalfHeight, 0)
+                    producerScene.position.set(0, - mid + aabbHalfHeight, 0)
 
                     const objects = [];
 
@@ -299,7 +302,7 @@ schemaManager.subscribe((schema) => {
                     // We have to do this weird thing because the pivot of the scene
                     // Isn't always the center of the AABB
                     guassianSplatViewer.splatMesh.position.set(0, - mid + aabbHalfHeight, 0)
-
+                    producerScene.position.set(0, - mid + aabbHalfHeight, 0)
                     // let v = new THREE.Vector3()
                     // guassianSplatViewer.splatMesh.getSplatCenter(0, v)
                     // console.log(v);

generator/html/js/node.js

@@ -43,11 +43,10 @@ class NodeVector3Parameter {
     constructor(nodeManager, id, parameterData, app) {
         const control = new TransformControls(app.Camera, app.Renderer.domElement);
         control.setMode('translate');
+        control.setSpace("local");
 
         this.mesh = new THREE.Group();
-        this.mesh.position.x = parameterData.currentValue.x;
-        this.mesh.position.y = parameterData.currentValue.y;
-        this.mesh.position.z = parameterData.currentValue.z;
+      
 
         // control.addEventListener('change', () => {
         // });
@@ -69,9 +68,13 @@ class NodeVector3Parameter {
             }
         });
 
-        app.Scene.add(this.mesh);
+        app.ViewerScene.add(this.mesh);
         control.attach(this.mesh);
-        app.Scene.add(control)
+        app.ViewerScene.add(control)
+
+        this.mesh.position.x = parameterData.currentValue.x;
+        this.mesh.position.y = parameterData.currentValue.y;
+        this.mesh.position.z = parameterData.currentValue.z;
     }
 
     update(parameterData) {
@@ -88,7 +91,7 @@ class NodeVector3ArryParameter {
         this.guiFolder = app.MeshGenFolder;
         this.guiFolderData = guiFolderData;
         this.app = app;
-        this.scene = app.Scene;
+        this.scene = app.ViewerScene;
         this.allPositionControls = [];
         this.allPositionControlsMeshes = [];
 
@@ -138,6 +141,7 @@ class NodeVector3ArryParameter {
     newPositionControl(pos) {
         const control = new TransformControls(this.app.Camera, this.app.Renderer.domElement);
         control.setMode('translate');
+        control.space = "local";
 
         const mesh = new THREE.Group();
         mesh.position.x = pos.x;

generator/parameter_node.go

@@ -105,6 +105,24 @@ func (pn ParameterNode[T]) initializeForCLI(set *flag.FlagSet) {
 	if pn.CLI == nil {
 		return
 	}
+	switch cli := any(pn.CLI).(type) {
+	case *CliParameterNodeConfig[string]:
+		cli.value = set.String(cli.FlagName, (any(pn.DefaultValue)).(string), cli.Usage)
+
+	case *CliParameterNodeConfig[float64]:
+		cli.value = set.Float64(cli.FlagName, (any(pn.DefaultValue)).(float64), cli.Usage)
+
+	case *CliParameterNodeConfig[bool]:
+		cli.value = set.Bool(cli.FlagName, (any(pn.DefaultValue)).(bool), cli.Usage)
+
+	case *CliParameterNodeConfig[int]:
+		cli.value = set.Int(cli.FlagName, (any(pn.DefaultValue)).(int), cli.Usage)
+
+	case *CliParameterNodeConfig[int64]:
+		cli.value = set.Int64(cli.FlagName, (any(pn.DefaultValue)).(int64), cli.Usage)
+	default:
+		panic(fmt.Errorf("parameter node %s has a type that can not be initialized on the command line. Please up a issue on github.com/EliCDavis/polyform", pn.DisplayName()))
+
+	}
 
-	panic("parameter node initializeForCLI is unimplemented")
 }