Skip to content

Fix map splitting #121

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

Merged
merged 3 commits into from
Feb 17, 2024
Merged

Fix map splitting #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b1dfbb
Fix a qt type bug, and allow users to move combos between groups
tbttfox Nov 15, 2023
45ee413
Fix a quick bug
tbttfox Nov 16, 2023
aaf2039
Start working on making map splitting nicer
tbttfox Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion simplexui/falloffDialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ def loadSimplex(self):

print("Adding Mappings")
currentIndex = "currentIndex"
if six.PY3 and QtLib.IsPySide2:
if six.PY3 and (QtLib.IsPySide2 or QtLib.IsPyQt5):
currentIndex = QByteArray(bytes("Test", encoding="utf-8"))

self._falloffMapper.addMapping(self.uiFalloffTypeCBOX, 1, currentIndex)
Expand Down
161 changes: 93 additions & 68 deletions simplexui/items/falloff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ class Falloff(SimplexAccessor):
and the new items would be given names

::
"cornerPuller_{}".format(LEFTSIDE)
"cornerPuller_{}".format(RIGHTSIDE)
"cornerPuller_{}".format(LEFTSIDE)
"cornerPuller_{}".format(RIGHTSIDE)

VERTICAL_SPLIT, VERTICAL_AXIS, VERTICAL_AXISINDEX
HORIZONTAL_SPLIT, HORIZONTAL_AXIS, HORIZONTAL_AXISINDEX
Expand All @@ -71,12 +71,12 @@ class Falloff(SimplexAccessor):
Parameters
----------
name : str
The name of the falloff
The name of the falloff
simplex : Simplex
The Simplex system
The Simplex system
*data : list
The data used to build this falloff.
You should use one of the classmethod like Falloff.createPlanar or Falloff.createMap instead
The data used to build this falloff.
You should use one of the classmethod like Falloff.createPlanar or Falloff.createMap instead

Returns
-------
Expand Down Expand Up @@ -128,6 +128,7 @@ def __init__(self, name, simplex, *data):
self._search = None
self._rep = None
self._weights = None
self._verts = None
self._thing = None
self._thingRepr = None

Expand All @@ -139,6 +140,7 @@ def __init__(self, name, simplex, *data):
self._minVal = data[5]
elif self._splitType == "map":
self._mapName = data[1]
self._axis = data[2]

self._name = name
self.children = []
Expand Down Expand Up @@ -199,19 +201,19 @@ def createPlanar(cls, name, simplex, axis, maxVal, maxHandle, minHandle, minVal)
Parameters
----------
name : str
The name to give the falloff
The name to give the falloff
simplex : Simplex
The Simplex system
The Simplex system
axis : str
The axis to align the falloff to. X, Y, or Z
The axis to align the falloff to. X, Y, or Z
maxVal : float
The value past which the falloff is 1.0
The value past which the falloff is 1.0
maxHandle : float
The (0, 1) range of the max cubic falloff handle
The (0, 1) range of the max cubic falloff handle
minHandle : float
The (0, 1) range of the min cubic falloff handle
The (0, 1) range of the min cubic falloff handle
minVal : float
The value past which the falloff is 0.0
The value past which the falloff is 0.0

Returns
-------
Expand All @@ -220,23 +222,25 @@ def createPlanar(cls, name, simplex, axis, maxVal, maxHandle, minHandle, minVal)
return cls(name, simplex, "planar", axis, maxVal, maxHandle, minHandle, minVal)

@classmethod
def createMap(cls, name, simplex, mapName):
def createMap(cls, name, simplex, mapName, axis):
"""Create a weightmap falloff

Parameters
----------
name : str
The name to give the falloff
The name to give the falloff
simplex : Simplex
The Simplex system
The Simplex system
mapName : str
The name of the weightmap
The name of the weightmap
axis : str
The axis to align the falloff to. X, Y, or Z

Returns
-------

"""
return cls(name, simplex, "map", mapName)
return cls(name, simplex, "map", mapName, axis)

@classmethod
def loadV2(cls, simplex, data):
Expand All @@ -245,30 +249,30 @@ def loadV2(cls, simplex, data):
Parameters
----------
simplex : Simplex
The Simplex system
The Simplex system
data : dict
The data to load
The data to load

Returns
-------
: Falloff
The specified Falloff
The specified Falloff

"""

tpe = data["type"]
name = data["name"]
axis = data["axis"]
if tpe == "map":
return cls.createMap(name, simplex, data["mapName"])
return cls.createMap(name, simplex, data["mapName"], axis)
elif tpe == "planar":
axis = data["axis"]
maxVal = data["maxVal"]
maxHandle = data["maxHandle"]
minHandle = data["minHandle"]
minVal = data["minVal"]
return cls.createPlanar(
name, simplex, axis, maxVal, maxHandle, minHandle, minVal
)

raise ValueError("Bad data passed to Falloff creation")

def buildDefinition(self, simpDict, legacy):
Expand All @@ -277,9 +281,9 @@ def buildDefinition(self, simpDict, legacy):
Parameters
----------
simpDict : dict
The dictionary that is being built
The dictionary that is being built
legacy : bool
Whether to write out the legacy definition, or the newer one
Whether to write out the legacy definition, or the newer one

Returns
-------
Expand Down Expand Up @@ -337,12 +341,12 @@ def duplicate(self, newName):
Parameters
----------
newName : str
The name to give the new Falloff
The name to give the new Falloff

Returns
-------
: Falloff
The newly duplicated Falloff
The newly duplicated Falloff

"""
nf = copy.copy(self)
Expand Down Expand Up @@ -374,21 +378,20 @@ def setPlanarData(self, axis, minVal, minHandle, maxHandle, maxVal):
Parameters
----------
axis : str
The axis to align the falloff to. X, Y, or Z
The axis to align the falloff to. X, Y, or Z
maxVal : float
The value past which the falloff is 1.0
The value past which the falloff is 1.0
maxHandle : float
The (0, 1) range of the max cubic falloff handle
The (0, 1) range of the max cubic falloff handle
minHandle : float
The (0, 1) range of the min cubic falloff handle
The (0, 1) range of the min cubic falloff handle
minVal : float
The value past which the falloff is 0.0
The value past which the falloff is 0.0

Returns
-------

"""

self.splitType = "planar"
self.axis = axis
self.minVal = minVal
Expand All @@ -405,7 +408,7 @@ def setMapData(self, mapName):
Parameters
----------
mapName : str
The name of the weightmap
The name of the weightmap

Returns
-------
Expand Down Expand Up @@ -551,12 +554,12 @@ def getMultiplier(self, xVal):
Parameters
----------
xVal : float
The value to get the weight for
The value to get the weight for

Returns
-------
: float
The weight
The weight

"""
# Vertices are assumed to be at (0,0) and (1,1)
Expand Down Expand Up @@ -607,35 +610,62 @@ def rep(self):
self._setSearchRep()
return self._rep

def setVerts(self, verts):
@property
def verts(self):
"""Get the stored vertex values"""
return self._verts

@verts.setter
def verts(self, vals):
"""Input the vertices into this falloff and compute the weights

Parameters
----------
verts : np.array
A (Nx3) numpy array of vertices
vals : np.array
A (Nx3) numpy array of vertices

Returns
-------

"""
if self.axis.lower() == self.HORIZONTAL_AXIS.lower():
component = self.HORIZONTAL_AXISINDEX
elif self.axis.lower() == self.VERTICAL_AXIS.lower():
component = self.VERTICAL_AXISINDEX
elif self.axis.lower() == self.DEPTH_AXIS.lower():
component = self.DEPTH_AXISINDEX
elif self._weights is None:
raise ValueError("Non-Planar Falloff found with no weights set")
else:
return
self._weights = np.array([self.getMultiplier(v[component]) for v in verts])
if self.splitType != "map":
# Clear out any auto-computed weights
# when setting verts on a non-map falloff
self._weights = None
self._verts = vals

@property
def weights(self):
"""Get the per-vertex weight values"""

if self._weights is None:
raise RuntimeError("Must set verts before requesting weights")
if self.splitType == "map":
raise ValueError(
"Attempted to auto-compute weights of a map falloff: {}".format(
self.name
)
)

if self._verts is None:
raise ValueError(
"Attempted to auto-compute weights of a procedural falloff without setting verts: {0}".format(
self.name
)
)

if self.axis.lower() == self.HORIZONTAL_AXIS.lower():
component = self.HORIZONTAL_AXISINDEX
elif self.axis.lower() == self.VERTICAL_AXIS.lower():
component = self.VERTICAL_AXISINDEX
elif self.axis.lower() == self.DEPTH_AXIS.lower():
component = self.DEPTH_AXISINDEX
else:
raise ValueError("Falloff found with no axis set")

self._weights = np.array(
[self.getMultiplier(v[component]) for v in self._verts]
)

return self._weights

@weights.setter
Expand All @@ -644,14 +674,9 @@ def weights(self, val):

Parameters
----------
val :


Returns
-------

val : A list or numpy array of values between 0 and 1
"""
self._weights = val
self._weights = np.asarray(val)

def getSidedName(self, name, sIdx):
"""Take name to split along some axis, and replace the fields based on the index
Expand All @@ -660,14 +685,14 @@ def getSidedName(self, name, sIdx):
Parameters
----------
name : str
The name to "split" with this falloff
The name to "split" with this falloff
sIdx : int
The index of the replacement value
The index of the replacement value

Returns
-------
: str
The newly sided name
The newly sided name

"""
search = self.search
Expand Down Expand Up @@ -695,12 +720,12 @@ def canRename(self, item):
Parameters
----------
item : object
The named simplex object to check
The named simplex object to check

Returns
-------
: bool
Whether this object can be renamed
Whether this object can be renamed

"""
nn = self.getSidedName(item.name, 0)
Expand All @@ -712,9 +737,9 @@ def splitRename(self, item, sIdx):
Parameters
----------
item : object
The named Simplex Item
The named Simplex Item
sIdx : int
The replacement index
The replacement index

Returns
-------
Expand All @@ -734,9 +759,9 @@ def applyFalloff(self, shape, sIdx):
Parameters
----------
shape : Shape
The shape to apply to
The shape to apply to
sIdx : int
The replacement index
The replacement index

Returns
-------
Expand Down
5 changes: 5 additions & 0 deletions simplexui/menu/genericPlugins/_builtins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,11 @@ def registerComboTree(window, clickIdx, indexes, menu):
setValsACT = menu.addAction("Set Selected Values")
setValsACT.triggered.connect(self.setSliderVals)

setGroupMenu = menu.addMenu("Set Group")
for group in window.simplex.comboGroups:
gAct = setGroupMenu.addAction(group.name)
gAct.triggered.connect(partial(self.setSelectedComboGroups, group))

menu.addSeparator()

setSolveMenu = menu.addMenu("Set Solve Type")
Expand Down
2 changes: 1 addition & 1 deletion simplexui/menu/genericPlugins/exportSplit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ def exportSplitInterface(window):
split = window.simplex.split(pBar)
split.exportAbc(path, pBar)
except ValueError as e:
QMessageBox.warning(window, "Unsplittable", e.message)
QMessageBox.warning(window, "Unsplittable", str(e))
finally:
pBar.close()
Loading