fixes bug where meshbodies with less than 20 vertices caused a division by 0 in the progress dialog. fixes #3

Also adds new experimental dimension settings for value noise.

Author: lmueller27

Noise, Patterns and Textures.manifest

@@ -7,7 +7,7 @@
 		"":	""
 	},
 	"version":	"0.1",
-	"runOnStartup":	false,
+	"runOnStartup":	true,
 	"supportedOS":	"windows|mac",
 	"editEnabled":	true
 }

Noise, Patterns and Textures.py

@@ -148,6 +148,9 @@ def notify(self, args):
         resolutionYField = inputs.addIntegerSpinnerCommandInput('resolutionYField', 'ResolutionY', 2, 1000, 1, 10)
         resolutionYField.tooltip = "Sets the y-resolution of the applied noise function. \nThe higher the resolution, the more features are visible."
 
+        resolutionZField = inputs.addIntegerSpinnerCommandInput('resolutionZField', 'ResolutionZ', 2, 1000, 1, 10)
+        resolutionZField.tooltip = "Sets the z-resolution of the applied noise function. \nThe higher the resolution, the more features are visible."
+
         # Plane input for 2D noise
         #planeInput = inputs.addSelectionInput('planeInput', 'Plane', 'Select Plane to apply noise to.')
         #planeInput.addSelectionFilter('ConstructionPlanes')
@@ -249,6 +252,7 @@ def notify(self, args):
                 advancedGroup = inputs.itemById('advancedGroup')
                 resolutionField = inputs.itemById('resolutionField')
                 resolutionYField = inputs.itemById('resolutionYField')
+                resolutionZField = inputs.itemById('resolutionZField')
                 frequencyField = inputs.itemById('frequencyField')
                 imageField = inputs.itemById('imageField')
                 fileDialogButton = inputs.itemById('fileDialogButton')
@@ -271,6 +275,7 @@ def notify(self, args):
                     smoothBox.isVisible = True
                     resolutionField.isVisible = True
                     resolutionYField.isVisible = True
+                    resolutionZField.isVisible = True
                     #frequencyField.isVisible = True
                     algDescriptionBox.text = "Generates noise based on a continous function. The dimension of the function can be specified as well as the resolution."
                 elif changedInput.selectedItem.name == 'Perlin Noise':
@@ -370,7 +375,7 @@ def notify(self, args):
                 product = app.activeProduct #the fusion tab that is active
                 rootComp = product.rootComponent # the root component of the active product
                 meshBodies = rootComp.meshBodies
-                algorithm, seed, degree, dimension3, dimension2, signed, smooth, resolution, resolutionY, frequency, inverse, stepActive, stepPadding, planeString = getInputs(inputs)
+                algorithm, seed, degree, dimension3, dimension2, signed, smooth, resolution, resolutionY, resolutionZ, frequency, inverse, stepActive, stepPadding, planeString = getInputs(inputs)
 
                 currentPreview = []
                 currentPreviewMesh = []
@@ -382,13 +387,13 @@ def notify(self, args):
                     mesh = selection.mesh
                     body = meshHelper.fusionPolygonMeshToBody(mesh)
 
-                    computeNoise(progressDialog, algorithm, seed, degree, dimension3, dimension2, signed, smooth, resolution, resolutionY, frequency, inverse, stepActive, stepPadding, planeString, body)
+                    computeNoise(progressDialog, algorithm, seed, degree, dimension3, dimension2, signed, smooth, resolution, resolutionY, resolutionZ, frequency, inverse, stepActive, stepPadding, planeString, body)
 
                     selection.isLightBulbOn = False
                     currentPreview.append(body)
                     currentPreviewMesh.append(mesh)
                     showMeshPreview(body,mesh)
-                    #app.activeViewport.refresh()  
+                    app.activeViewport.refresh()  
         except ValueError as err:
             if 'CanceledProgress'in err.args:
                 currentPreview = []
@@ -421,7 +426,7 @@ def notify(self, args):
             eventArgs = adsk.core.CommandEventArgs.cast(args)
             # Get the values from the command inputs. 
             inputs = eventArgs.command.commandInputs
-            algorithm, seed, degree, dimension3, dimension2, signed, smooth, resolution, resolutionY, frequency, inverse, stepActive, stepPadding, planeString = getInputs(inputs)
+            algorithm, seed, degree, dimension3, dimension2, signed, smooth, resolution, resolutionY, resolutionZ, frequency, inverse, stepActive, stepPadding, planeString = getInputs(inputs)
 
             selectionList = []
             for i in range(inputs.itemById('body_input').selectionCount):
@@ -433,7 +438,7 @@ def notify(self, args):
                 if len(currentPreview) > 0:
                     body = currentPreview[i]
                 else:
-                    computeNoise(progressDialog, algorithm, seed, degree, dimension3, dimension2, signed, smooth, resolution, resolutionY, frequency, inverse, stepActive, stepPadding, planeString, body)
+                    computeNoise(progressDialog, algorithm, seed, degree, dimension3, dimension2, signed, smooth, resolution, resolutionY, resolutionZ, frequency, inverse, stepActive, stepPadding, planeString, body)
 
                 # Hide the original meshBody, add and name the new one
                 selection.isLightBulbOn = False    
@@ -459,6 +464,7 @@ def getInputs(inputs):
     smooth = inputs.itemById('smoothBox').value
     resolution = inputs.itemById('resolutionField').value
     resolutionY = inputs.itemById('resolutionYField').value
+    resolutionZ = inputs.itemById('resolutionZField').value
     frequency = inputs.itemById('frequencyField').value
     inverse = inputs.itemById('inverseBox').value
     stepActive = inputs.itemById('stepGroup').isEnabledCheckBoxChecked
@@ -473,9 +479,9 @@ def getInputs(inputs):
         planeString = 'xZ'
     elif planeInput.selectedItem.name == "yZ":
         planeString = 'yZ'
-    return algorithm,seed,degree,dimension3,dimension2,signed,smooth,resolution,resolutionY,frequency,inverse,stepActive,stepPadding,planeString
+    return algorithm,seed,degree,dimension3,dimension2,signed,smooth,resolution,resolutionY,resolutionZ,frequency,inverse,stepActive,stepPadding,planeString
 
-def computeNoise(progressDialog, algorithm, seed, degree, dimension3, dimension2, signed, smooth, resolution, resolutionY, frequency, inverse, stepActive, stepPadding, planeString, body):
+def computeNoise(progressDialog, algorithm, seed, degree, dimension3, dimension2, signed, smooth, resolution, resolutionY, resolutionZ, frequency, inverse, stepActive, stepPadding, planeString, body):
     progressDialog.show('Computing Noise...', 'Percentage: %p% - %v/%m steps completed',0,len(body.vertices),2)
     if algorithm == 'Adaptive Noise':   
         progressDialog.show('Computing Noise...', 'Percentage: %p% - %v/%m steps completed',0,len(body.facets),2)
@@ -488,7 +494,7 @@ def computeNoise(progressDialog, algorithm, seed, degree, dimension3, dimension2
         elif dimension3 == '2D':
             valueNoise2D(body,resolution,resolutionY,degree,frequency,signed,smooth,seed, progressDialog)
         elif dimension3 == '3D':
-            valueNoise3D(body,resolution,degree,frequency,signed,smooth,seed, progressDialog)
+            valueNoise3D(body,resolution,resolutionY,resolutionZ,degree,frequency,signed,smooth,seed, progressDialog)
     elif algorithm == 'Perlin Noise': 
         if dimension2 == '2D':
             perlinNoise2D(body,resolution,degree,frequency,signed,smooth,seed,progressDialog)

noises/grungeMapNoise.py

@@ -58,7 +58,7 @@ def getNoiseValue(x,y):
         if progressDialog:
             if progressDialog.wasCancelled:
                 raise ValueError('CanceledProgress')
-            if i%int(allSteps/20)==0:
+            if i%(int(allSteps/20)+1)==0:
                 progressDialog.progressValue = i+1
             elif i == 0:
                 progressDialog.progressValue = i+1

noises/perlinNoise.py

@@ -100,7 +100,7 @@ def getNoiseValue(x,y,z):
         if progressDialog:
             if progressDialog.wasCancelled:
                 raise ValueError('CanceledProgress')
-            if i%int(allSteps/20)==0:
+            if i%(int(allSteps/20)+1)==0:
                 progressDialog.progressValue = i+1
             elif i > maxSteps:
                 progressDialog.progressValue = progressDialog.maximumValue
@@ -188,7 +188,7 @@ def getNoiseValue(x,y):
         if progressDialog:
             if progressDialog.wasCancelled:
                 raise ValueError('CanceledProgress')
-            if i%int(allSteps/20)==0:
+            if i%(int(allSteps/20)+1)==0:
                 progressDialog.progressValue = i+1
             elif i > maxSteps:
                 progressDialog.progressValue = progressDialog.maximumValue

noises/randomNoise.py

@@ -76,7 +76,7 @@ def adaptiveVertexDistortion(body, degree:float, inverse=False, seed:int=None, p
         if progressDialog:
             if progressDialog.wasCancelled:
                 raise ValueError('CanceledProgress')
-            if i%int(allSteps/20)==0:
+            if i%(int(allSteps/20)+1)==0:
                 progressDialog.progressValue = i+1
             elif i > maxSteps:
                 progressDialog.progressValue = progressDialog.maximumValue

noises/valueNoise.py

@@ -3,28 +3,28 @@
 from ..helpers.mathHelper import *
 from adsk.core import ProgressDialog, Vector2D, Vector3D
 
-def valueNoise3D(body:Body, resolution:int, amplitude:float=1, frequency:float=1, signed:bool=True, smooth:bool=True, seed:int=None, progressDialog:ProgressDialog=None) -> Body:
+def valueNoise3D(body:Body, resolutionX:int, resolutionY:int, resolutionZ:int, amplitude:float=1, frequency:float=1, signed:bool=True, smooth:bool=True, seed:int=None, progressDialog:ProgressDialog=None) -> Body:
     if seed:
         random.seed(seed)
     xValues = [v[0] for v in body.vertices]
     yValues = [v[1] for v in body.vertices]
     zValues = [v[2] for v in body.vertices]
     #make a lattice grid
     lattice = []
-    for i in range(resolution): # This is the ugliest matrix init of all time
+    for i in range(resolutionX): # This is the ugliest matrix init of all time
         lattice.append([])
-        for j in range(resolution):
+        for j in range(resolutionY):
             lattice[i].append([])
-            for k in range(resolution):
+            for k in range(resolutionZ):
                 if signed:
                     lattice[i][j].append(random.uniform(-1,1))
                 else:
                     lattice[i][j].append(random.uniform(0,1))
 
     def getNoiseValue(x,y,z):
         xMin = min(int(x),len(lattice)-1)
-        yMin = min(int(y),len(lattice)-1)
-        zMin = min(int(z),len(lattice)-1)
+        yMin = min(int(y),len(lattice[0])-1)
+        zMin = min(int(z),len(lattice[0][0])-1)
         tx = x - xMin
         ty = y - yMin
         tz = z - zMin
@@ -36,9 +36,9 @@ def getNoiseValue(x,y,z):
         rx0 = xMin
         rx1 = min(xMin+1,len(lattice)-1)
         ry0 = yMin
-        ry1 = min(yMin+1,len(lattice)-1)
+        ry1 = min(yMin+1,len(lattice[0])-1)
         rz0 = zMin
-        rz1 = min(zMin+1,len(lattice)-1)
+        rz1 = min(zMin+1,len(lattice[0][0])-1)
 
         c000 = lattice[rx0][ry0][rz0]
         c100 = lattice[rx1][ry0][rz0]
@@ -66,10 +66,10 @@ def getNoiseValue(x,y,z):
     minZ = min(zValues)
     maxZ = max(zValues)
 
-    xValuesScaled = [(x- minX)/(maxX-minX) * (resolution-1) for x in xValues]
-    yValuesScaled = [(y- minY)/(maxY-minY) * (resolution-1) for y in yValues]
+    xValuesScaled = [(x- minX)/(maxX-minX) * (resolutionX-1) for x in xValues]
+    yValuesScaled = [(y- minY)/(maxY-minY) * (resolutionY-1) for y in yValues]
     if not maxZ == minZ:
-        zValuesScaled = [(z- minZ)/(maxZ-minZ) * (resolution-1) for z in zValues]
+        zValuesScaled = [(z- minZ)/(maxZ-minZ) * (resolutionZ-1) for z in zValues]
     else:
         zValuesScaled = zValues
     xyzValuesScaled = list(zip(xValuesScaled,yValuesScaled,zValuesScaled))
@@ -81,7 +81,7 @@ def getNoiseValue(x,y,z):
         if progressDialog:
             if progressDialog.wasCancelled:
                 raise ValueError('CanceledProgress')
-            if i%int(allSteps/20)==0:
+            if i%(int(allSteps/20)+1)==0:
                 progressDialog.progressValue = i+1
             elif i > maxSteps:
                 progressDialog.progressValue = progressDialog.maximumValue
@@ -106,7 +106,7 @@ def valueNoise2D(body:Body, resolutionX:int, resolutionY:int, amplitude:float=1,
         random.seed(seed)
     xValues = [v[0] for v in body.vertices]
     yValues = [v[1] for v in body.vertices]
-    zValues = [v[2] for v in body.vertices]
+    #zValues = [v[2] for v in body.vertices]
 
     #make a lattice grid
     lattice = []
@@ -157,7 +157,7 @@ def getNoiseValue(x,y):
         if progressDialog:
             if progressDialog.wasCancelled:
                 raise ValueError('CanceledProgress')
-            if i%int(allSteps/20)==0:
+            if i%(int(allSteps/20)+1)==0:
                 progressDialog.progressValue = i+1
             elif i > maxSteps:
                 progressDialog.progressValue = progressDialog.maximumValue
@@ -214,7 +214,7 @@ def getNoiseValue(x):
         if progressDialog:
             if progressDialog.wasCancelled:
                 raise ValueError('CanceledProgress')
-            if i%int(allSteps/20)==0:
+            if i%(int(allSteps/20)+1)==0:
                 progressDialog.progressValue = i+1
             elif i > maxSteps:
                 progressDialog.progressValue = progressDialog.maximumValue

noises/worleyNoise.py

@@ -40,7 +40,7 @@ def distance3D(a,b):
         if progressDialog:
             if progressDialog.wasCancelled:
                 raise ValueError('CanceledProgress')
-            if i%int(allSteps/20)==0:
+            if i%(int(allSteps/20)+1)==0:
                 progressDialog.progressValue = i+1
             elif i > maxSteps:
                 progressDialog.progressValue = progressDialog.maximumValue
@@ -107,7 +107,7 @@ def distance2D(a,b):
         if progressDialog:
             if progressDialog.wasCancelled:
                 raise ValueError('CanceledProgress')
-            if i%int(allSteps/20)==0:
+            if i%(int(allSteps/20)+1)==0:
                 progressDialog.progressValue = i+1
             elif i > maxSteps:
                 progressDialog.progressValue = progressDialog.maximumValue