Skip to content

Commit ae4d619

Browse files
lkruellkruel
committed
Adding Sharpen Edges setting to VoxelMesh and updating the updater to work in Linux and OSX
1 parent c3207a0 commit ae4d619

File tree

6 files changed

+87
-35
lines changed

6 files changed

+87
-35
lines changed

‎otls/sop_voxelmesh.hda/INDEX__SECTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ Inputs: 1 to 1
1010
Subnet: true
1111
Python: false
1212
Empty: false
13-
Modified: Mon Nov 6 17:11:57 2017
13+
Modified: Mon Nov 27 13:56:41 2017
1414

‎otls/sop_voxelmesh.hda/gamedev_8_8Sop_1sop__voxelmesh/Contents.dir/.OPdummydefs‎

0 Bytes
Binary file not shown.

‎otls/sop_voxelmesh.hda/gamedev_8_8Sop_1sop__voxelmesh/Contents.dir/.OPfallbacks‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Sop/attribblur C:/PROGRA~1/SIDEEF~1/HOUDIN~1.10/houdini/otls/OPlibSop.hda
1+
Sop/attribblur C:/PROGRA~1/SIDEEF~1/HOUDIN~1.290/houdini/otls/OPlibSop.hda
22
Sop/attribblur otls/OPlibSop.hda
3-
Sop/attribdelete C:/PROGRA~1/SIDEEF~1/HOUDIN~1.10/houdini/otls/OPlibSop.hda
3+
Sop/attribdelete C:/PROGRA~1/SIDEEF~1/HOUDIN~1.290/houdini/otls/OPlibSop.hda
44
Sop/attribdelete otls/OPlibSop.hda
5-
Sop/attribwrangle C:/PROGRA~1/SIDEEF~1/HOUDIN~1.10/houdini/otls/OPlibSop.hda
5+
Sop/attribwrangle C:/PROGRA~1/SIDEEF~1/HOUDIN~1.290/houdini/otls/OPlibSop.hda
66
Sop/attribwrangle otls/OPlibSop.hda

‎otls/sop_voxelmesh.hda/gamedev_8_8Sop_1sop__voxelmesh/Contents.dir/Contents.mime‎

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,25 @@ Content-Type: text/plain
3232

3333
sopflags sopflags =
3434
comment ""
35-
position 0.475906 -1.21839
36-
connectornextid 0
37-
flags = lock off model off template off footprint off xray off bypass off display off render off highlight off unload off savedata off compress on colordefault on exposed on
35+
position 0.588235 -3.62559
36+
connectornextid 2
37+
flags = lock off model off template on footprint off xray off bypass off display on render on highlight off unload off savedata off compress on colordefault on exposed on
3838
outputsNamed3
3939
{
40+
1 "output1"
4041
}
4142
inputsNamed3
4243
{
44+
0 boolean1 2 1 "input1"
4345
}
4446
inputs
4547
{
48+
0 boolean1 0 1
4649
}
4750
stat
4851
{
49-
create 1510006253
50-
modify 1510006307
52+
create 1511808266
53+
modify 1511808995
5154
author MAINGEAR@DESKTOP-P98C1VA
5255
access 0777
5356
}
@@ -244,7 +247,7 @@ Content-Type: text/plain
244247
{
245248
"___Version___":{
246249
"type":"string",
247-
"value":"16.5.268.10"
250+
"value":"16.5.290"
248251
}
249252
}
250253

@@ -262,7 +265,7 @@ Content-Type: text/plain
262265
sopflags sopflags =
263266
comment ""
264267
position -1.2837e-16 0.702404
265-
connectornextid 2
268+
connectornextid 3
266269
flags = lock off model off template off footprint off xray off bypass off display off render off highlight off unload off savedata off compress on colordefault on exposed on
267270
outputsNamed3
268271
{
@@ -271,15 +274,17 @@ outputsNamed3
271274
inputsNamed3
272275
{
273276
0 switch2 1 1 "input1"
277+
2 (0) "" 1 "input2"
274278
}
275279
inputs
276280
{
277281
0 switch2 0 1
282+
1 (0) 0 1
278283
}
279284
stat
280285
{
281286
create 1508967233
282-
modify 1509043181
287+
modify 1511808727
283288
author MAINGEAR@DESKTOP-P98C1VA
284289
access 0777
285290
}
@@ -300,6 +305,20 @@ Content-Type: text/plain
300305
flags = 0
301306
segment { length = 0 value = 0.10000000000000001 0.10000000000000001 expr = ch(\"../adaptivity\") }
302307
}
308+
channel sharpenfeatures {
309+
lefttype = extend
310+
righttype = extend
311+
default = 1
312+
flags = 0
313+
segment { length = 0 value = 1 1 expr = ch(\"../sharpen_features\") }
314+
}
315+
channel edgetolerance {
316+
lefttype = extend
317+
righttype = extend
318+
default = 0.5
319+
flags = 0
320+
segment { length = 0 value = 0.5 0.5 expr = ch(\"../edge_tolerance\") }
321+
}
303322
}
304323

305324
--HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -314,12 +333,12 @@ vdbclass [ 0 locks=0 ] ( "none" )
314333
splitdisjointvolumes [ 0 locks=0 ] ( "off" )
315334
isovalue [ 0 locks=0 ] ( 0 )
316335
fogisovalue [ 0 locks=0 ] ( 0.5 )
317-
adaptivity [ 8 locks=0 ] ( [ adaptivity 0.01 ] )
336+
adaptivity [ 8 locks=0 ] ( [ adaptivity 0 ] )
318337
computenormals [ 0 locks=0 ] ( "off" )
319338
internaladaptivity [ 0 locks=0 ] ( 0 )
320339
transferattributes [ 0 locks=0 ] ( "off" )
321-
sharpenfeatures [ 0 locks=0 ] ( "off" )
322-
edgetolerance [ 0 locks=0 ] ( 0.5 )
340+
sharpenfeatures [ 8 locks=0 ] ( [ sharpenfeatures 0 ] )
341+
edgetolerance [ 8 locks=0 ] ( [ edgetolerance 0.5 ] )
323342
surfacegroup [ 0 locks=0 ] ( surface_polygons )
324343
interiorgroup [ 0 locks=0 ] ( interior_polygons )
325344
seamlinegroup [ 0 locks=0 ] ( seam_polygons )
@@ -343,7 +362,7 @@ Content-Type: text/plain
343362
{
344363
"___Version___":{
345364
"type":"string",
346-
"value":"16.5.268.10"
365+
"value":"16.5.290"
347366
}
348367
}
349368

@@ -429,7 +448,7 @@ Content-Type: text/plain
429448
{
430449
"___Version___":{
431450
"type":"string",
432-
"value":"16.5.268.10"
451+
"value":"16.5.290"
433452
}
434453
}
435454

@@ -504,7 +523,7 @@ Content-Type: text/plain
504523
{
505524
"___Version___":{
506525
"type":"string",
507-
"value":"16.5.268.10"
526+
"value":"16.5.290"
508527
}
509528
}
510529

@@ -590,7 +609,7 @@ Content-Type: text/plain
590609
{
591610
"___Version___":{
592611
"type":"string",
593-
"value":"16.5.268.10"
612+
"value":"16.5.290"
594613
}
595614
}
596615

@@ -665,7 +684,7 @@ Content-Type: text/plain
665684
{
666685
"___Version___":{
667686
"type":"string",
668-
"value":"16.5.268.10"
687+
"value":"16.5.290"
669688
}
670689
}
671690

@@ -785,7 +804,7 @@ Content-Type: text/plain
785804
{
786805
"___Version___":{
787806
"type":"string",
788-
"value":"16.5.268.10"
807+
"value":"16.5.290"
789808
}
790809
}
791810

@@ -850,7 +869,7 @@ Content-Type: text/plain
850869

851870
{
852871
version 0.8
853-
input [ 8 locks=0 ] ( [ input 1 ] )
872+
input [ 8 locks=0 ] ( [ input 0 ] )
854873
}
855874

856875
--HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -860,7 +879,7 @@ Content-Type: text/plain
860879
{
861880
"___Version___":{
862881
"type":"string",
863-
"value":"16.5.268.10"
882+
"value":"16.5.290"
864883
}
865884
}
866885

@@ -920,7 +939,7 @@ Content-Type: text/plain
920939
{
921940
"___Version___":{
922941
"type":"string",
923-
"value":"16.5.268.10"
942+
"value":"16.5.290"
924943
}
925944
}
926945

‎otls/sop_voxelmesh.hda/gamedev_8_8Sop_1sop__voxelmesh/DialogScript‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,18 @@
4949
disablewhen "{ project == 0 }"
5050
range { 0 10 }
5151
}
52+
parm {
53+
name "sharpen_features"
54+
label "Sharpen Features"
55+
type toggle
56+
default { "0" }
57+
}
58+
parm {
59+
name "edge_tolerance"
60+
label "Edge Tolerance"
61+
type float
62+
default { "0.5" }
63+
disablewhen "{ sharpen_features == 0 }"
64+
range { 0 1 }
65+
}
5266
}

‎toolbar/game_development_toolset.shelf‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
</toolshelf>
2626

2727
<tool name="update_toolset" label="Update Toolset" icon="CHOP_joystick">
28+
<helpURL>tool:update_toolset</helpURL>
2829
<script scriptType="python"><![CDATA[import os
2930
import urllib
3031
import json
@@ -36,14 +37,18 @@ from PySide2.QtGui import *
3637
from PySide2.QtWidgets import *
3738
import hou
3839
39-
REPO_URL = 'https://api.github.com/repos/sideeffects/GameDevelopmentToolset'
40+
REPO_URL = 'http://api.github.com/repos/sideeffects/GameDevelopmentToolset'
4041
BRANCHES = ["Stable", "Development"]
4142
4243
SETTINGS_FILE = os.path.join(os.getenv("HOUDINI_USER_PREF_DIR"), "gamedevtoolset.json")
4344
HOUDINI_ENV = os.path.join(os.getenv("HOUDINI_USER_PREF_DIR"), "houdini.env")
4445
45-
HOU_TEMP_PATH = os.path.join(os.getenv("APPDATA"), "SideFX", "GameDevToolset")
46-
HOU_TEMP_PATH_STR = "$APPDATA\\SideFX\\GameDevToolset"
46+
if platform.system() == "Windows":
47+
HOU_TEMP_PATH = os.path.join(os.getenv("APPDATA"), "SideFX", "GameDevToolset")
48+
HOU_TEMP_PATH_STR = "$APPDATA\\SideFX\\GameDevToolset"
49+
else:
50+
HOU_TEMP_PATH = os.path.join(os.getenv("HOUDINI_USER_PREF_DIR"), "GameDevToolset")
51+
HOU_TEMP_PATH_STR = HOU_TEMP_PATH
4752
4853
class UpdateDialog(QDialog):
4954
@@ -99,7 +104,7 @@ class UpdateDialog(QDialog):
99104
update_version_label = QLabel("Update to Release:")
100105
101106
self.version_combo = QComboBox(self)
102-
for release in self.updater_object.releases:
107+
for release in self.updater_object.releases[-10:]:
103108
self.version_combo.addItem(release)
104109
105110
version_layout.addWidget(update_version_label)
@@ -135,7 +140,7 @@ class UpdateDialog(QDialog):
135140
version = self.version_combo.currentText()
136141
branch = self.branch_combo.currentText()
137142
self.updater_object.on_dialog_close(version, branch)
138-
143+
139144
self.close()
140145
141146
@@ -145,11 +150,25 @@ class GameDevelopmentUpdater(object):
145150
self.releases = []
146151
self.desired_version = None
147152
self.desired_branch = None
148-
153+
154+
self.cleanup_old_installs()
149155
self.load_settings()
150156
self.get_releases()
151157
self.show_dialog()
152158
159+
def cleanup_old_installs(self):
160+
houdini_pref_dir = os.getenv("HOUDINI_USER_PREF_DIR")
161+
162+
otl = os.path.join(houdini_pref_dir, "otls", "SideFX_GameDevelopmentToolset.hda")
163+
desktop = os.path.join(houdini_pref_dir, "desktop", "Games_Minimal.desk")
164+
toolbar = os.path.join(houdini_pref_dir, "toolbar", "game_development_toolset.shelf")
165+
script = os.path.join(houdini_pref_dir, "scripts", "python", "hou_settings.py")
166+
167+
to_delete = [otl, desktop, toolbar, script]
168+
for filename in to_delete:
169+
if os.path.exists(filename):
170+
os.remove(filename)
171+
153172
def get_releases(self):
154173
response = urllib.urlopen(REPO_URL + "/releases")
155174
data = response.read()
@@ -176,9 +195,9 @@ class GameDevelopmentUpdater(object):
176195
for asset in j_data["assets"]:
177196
if branch in os.path.basename(asset["browser_download_url"]):
178197
return asset["browser_download_url"]
179-
180-
181-
198+
199+
200+
182201
def unzip_file(self, zip_file, destination_path):
183202
zipf = zipfile.ZipFile(zip_file, 'r', zipfile.ZIP_DEFLATED)
184203
zipf.extractall(destination_path)
@@ -216,8 +235,8 @@ class GameDevelopmentUpdater(object):
216235
download_url = self.get_download_path(version, branch)
217236
if not download_url:
218237
hou.ui.displayMessage("Package not Available for this branch", severity=hou.severityType.Error)
219-
return
220-
238+
return
239+
221240
local_path = self.download_url(download_url)
222241
self.unzip_file(local_path, os.path.join(HOU_TEMP_PATH, version, branch))
223242
os.remove(local_path)

0 commit comments

Comments
 (0)