Skip to content

Commit

Permalink
v1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@nguyendinhat
nguyendinhat committed Oct 30, 2023
1 parent 3a8aa98 commit 1cdc056
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 101 deletions.
2 changes: 1 addition & 1 deletion RUV/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
bl_info = {
"name": "RUV Blender MacOS",
"author": "nguyendinhat",
"version": (1, 6),
"version": (1, 7),
"blender": (3, 6, 3),
"location": "View3D > Sidebar",
"description": "Addon Connect Blender with RizomUV MaOS",
Expand Down
5 changes: 0 additions & 5 deletions RUV/context/context.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,3 @@ class RUV_Context(PropertyGroup):
update=items.uv_map_update,
description="activemap",
)
shortcut: bpy.props.EnumProperty(
name="Short",
items=(items.shortcut),
default=0
)
20 changes: 2 additions & 18 deletions RUV/context/items.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,28 +93,12 @@ def script_check(self, context): # pylint:

def opt_AutoIMP(self,context):
return [
('N_AutoIMP','Manual','Manually imported UVs','MODIFIER',0),
('Y_AutoIMP','Auto','Automatically imported after closing RizomUV','CONSTRAINT',1),
('Y_AutoIMP','Auto','Automatically imported after closing RizomUV','CONSTRAINT',0)
('N_AutoIMP','Manual','Manually imported UVs','MODIFIER',1),
]

def preference_save(self, context): # pylint: disable=unused-argument
bpy.ops.wm.save_userpref()

def shortcut(self, context):
return [
("11",'Blender mix 3DsMax',""),
("0",'Rizom',""),
("1",'Rizom Legacy',""),
("2",'Maya',""),
("3",'3DsMax',""),
("4",'Softimage',""),
("5",'Rhino',""),
("6",'Cinemar4D',""),
("7",'Blender',""),
("8",'ZBrush',""),
("9",'Modo',""),
("10",'RMB Orbit',""),
]

def panel_width_update(self, context):
bpy.context.area.tag_redraw()
11 changes: 0 additions & 11 deletions RUV/interface/View3D.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,6 @@ def draw(self, context):
row.scale_y = 1.25
row.prop(prefs, "image_path")

# --------------------------------------#
box = layout.box()
row = box.row(align=True)
row.label(text="Shortcut:", icon="HAND")
row = box.row(align=True)
row.scale_y = 1.25
row.prop(props, "shortcut")
# --------------------------------------#

box = layout.box()

row = box.row(align=True)
Expand All @@ -177,8 +168,6 @@ def draw(self, context):

row.prop(prefs, "tex_units", text="")

# --------------------------------------#
# --------------------------------------#

box = layout.box()
row = box.row(align=True)
Expand Down
2 changes: 1 addition & 1 deletion RUV/operators/fixuvmap.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def execute(self, context):
act_obj_map_names = [uvmap.name for uvmap in act_obj.data.uv_layers]

if not act_obj_map_names:
act_obj.data.uv_layers.new("UVMap",'UVMap','fix UV Map','FAKE_USER_ON')
act_obj.data.uv_layers.new(name=act_obj.name, do_init=True)

for uvmap in act_obj.data.uv_layers:
uvmap.name = uvmap.name.replace(".", "_")
Expand Down
7 changes: 5 additions & 2 deletions RUV/operators/utility.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

import bpy, os, json
from ..scripts import setup
from ..operators import fixuvmap

def get_json(dictionary, key, **kwargs):

Expand Down Expand Up @@ -77,8 +78,10 @@ def verify_objects(self, act_obj, objs):
actobj_uvmap_names = [uvmap.name for uvmap in act_obj.data.uv_layers]
# Check if any UV maps exist.
if not actobj_uvmap_names:
self.report({"ERROR"}, f'{act_obj.name} {("errors", "nomap")}')
return valid
self.report({"WARNING"}, f'{act_obj.name}: No UV maps exist')
bpy.ops.ruv.fix_uvmaps()
actobj_uvmap_names = [uvmap.name for uvmap in act_obj.data.uv_layers]
# return valid
# Check that all selected objects have the same UV maps.
for obj in objs:
obj_uvmap_names = [uvmap.name for uvmap in obj.data.uv_layers]
Expand Down
64 changes: 1 addition & 63 deletions RUV/scripts/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,6 @@ def convert_td(tex_den, unit):

return output

def get_Shortcut(type):
match type:
case "0":
return """ZomSet({Path="Prefs.MousePresetMode", Value=0})"""
case "1":
return """ZomSet({Path="Prefs.MousePresetMode", Value=1})"""
case "2":
return """ZomSet({Path="Prefs.MousePresetMode", Value=2})"""
case "3":
return """ZomSet({Path="Prefs.MousePresetMode", Value=3})"""
case "4":
return """ZomSet({Path="Prefs.MousePresetMode", Value=4})"""
case "5":
return """ZomSet({Path="Prefs.MousePresetMode", Value=5})"""
case "6":
return """ZomSet({Path="Prefs.MousePresetMode", Value=6})"""
case "7":
return """ZomSet({Path="Prefs.MousePresetMode", Value=7})"""
case "8":
return """ZomSet({Path="Prefs.MousePresetMode", Value=8})"""
case "9":
return """ZomSet({Path="Prefs.MousePresetMode", Value=9})"""
case "10":
return """ZomSet({Path="Prefs.MousePresetMode", Value=10})"""
case "11":
return """ZomSet({Path="Prefs.CustomMousePreset", Value={ORBIT={MB="MMB", MODS="", KEYCODE=0}, ZOOM={MB="MMB", MODS="Alt-Ctrl", KEYCODE=0}, PAN={MB="MMB", MODS="Shift", KEYCODE=0}, DENSITY_PAINT={MB="LMB", MODS="", KEYCODE=0}, OPTIMIZE_PAINT={MB="LMB", MODS="", KEYCODE=0}, PIN_PAINT={MB="LMB", MODS="", KEYCODE=0}, PROTECT_PAINT={MB="LMB", MODS="", KEYCODE=0}, UNFOLD_PAINT={MB="LMB", MODS="", KEYCODE=0}, SPREAD={MB="LMB", MODS="", KEYCODE=0}, PINCH={MB="LMB", MODS="", KEYCODE=0}, DRAG={MB="LMB", MODS="", KEYCODE=0}, SELECT={MB="LMB", MODS="", KEYCODE=0}, ADD_SELECT={MB="LMB", MODS="Ctrl", KEYCODE=0}, DESELECT={MB="LMB", MODS="Alt", KEYCODE=0}, ADD_SELECT_SHORT_PATH={MB="LMB", MODS="Shift", KEYCODE=0}, SELECT_LOOP_PATH={MB="DLMB", MODS="", KEYCODE=0}, ADD_SELECT_LOOP_PATH={MB="DLMB", MODS="Ctrl", KEYCODE=0}, DESELECT_PATH={MB="DLMB", MODS="Alt", KEYCODE=0}, SELECT_TRANSLATE={MB="MMB", MODS="", KEYCODE=32}, SELECT_ROTATE={MB="RMB", MODS="", KEYCODE=32}, SELECT_SCALE={MB="LMB", MODS="", KEYCODE=32}, ADD_SELECT_TRANSLATE={MB="MMB", MODS="Ctrl", KEYCODE=32}, ADD_SELECT_ROTATE={MB="RMB", MODS="Ctrl", KEYCODE=32}, ADD_SELECT_SCALE={MB="LMB", MODS="Ctrl", KEYCODE=32}, TRANSLATE_ISLAND={MB="MMB", MODS="", KEYCODE=68}, ROTATE_ISLAND={MB="RMB", MODS="", KEYCODE=68}, SCALE_ISLAND={MB="LMB", MODS="", KEYCODE=68}, PREVIEW_SHORT_PATH={MB="", MODS="Shift", KEYCODE=0}}})ZomSet({Path="Prefs.MousePresetMode", Value=11})"""
case default:
return """ZomSet({Path="Prefs.CustomMousePreset", Value={ORBIT={MB="MMB", MODS="", KEYCODE=0}, ZOOM={MB="MMB", MODS="Alt-Ctrl", KEYCODE=0}, PAN={MB="MMB", MODS="Shift", KEYCODE=0}, DENSITY_PAINT={MB="LMB", MODS="", KEYCODE=0}, OPTIMIZE_PAINT={MB="LMB", MODS="", KEYCODE=0}, PIN_PAINT={MB="LMB", MODS="", KEYCODE=0}, PROTECT_PAINT={MB="LMB", MODS="", KEYCODE=0}, UNFOLD_PAINT={MB="LMB", MODS="", KEYCODE=0}, SPREAD={MB="LMB", MODS="", KEYCODE=0}, PINCH={MB="LMB", MODS="", KEYCODE=0}, DRAG={MB="LMB", MODS="", KEYCODE=0}, SELECT={MB="LMB", MODS="", KEYCODE=0}, ADD_SELECT={MB="LMB", MODS="Ctrl", KEYCODE=0}, DESELECT={MB="LMB", MODS="Alt", KEYCODE=0}, ADD_SELECT_SHORT_PATH={MB="LMB", MODS="Shift", KEYCODE=0}, SELECT_LOOP_PATH={MB="DLMB", MODS="", KEYCODE=0}, ADD_SELECT_LOOP_PATH={MB="DLMB", MODS="Ctrl", KEYCODE=0}, DESELECT_PATH={MB="DLMB", MODS="Alt", KEYCODE=0}, SELECT_TRANSLATE={MB="MMB", MODS="", KEYCODE=32}, SELECT_ROTATE={MB="RMB", MODS="", KEYCODE=32}, SELECT_SCALE={MB="LMB", MODS="", KEYCODE=32}, ADD_SELECT_TRANSLATE={MB="MMB", MODS="Ctrl", KEYCODE=32}, ADD_SELECT_ROTATE={MB="RMB", MODS="Ctrl", KEYCODE=32}, ADD_SELECT_SCALE={MB="LMB", MODS="Ctrl", KEYCODE=32}, TRANSLATE_ISLAND={MB="MMB", MODS="", KEYCODE=68}, ROTATE_ISLAND={MB="RMB", MODS="", KEYCODE=68}, SCALE_ISLAND={MB="LMB", MODS="", KEYCODE=68}, PREVIEW_SHORT_PATH={MB="", MODS="Shift", KEYCODE=0}}})ZomSet({Path="Prefs.MousePresetMode", Value=11})"""


class ScriptSetup:
def __init__(self, context, target_map, map_list=[]):
Expand Down Expand Up @@ -97,39 +68,6 @@ def base_script(self, script):
ZomSet({Path="Prefs.Default.Packing.MaxScaling", Value=1e+06})
ZomSet({Path="Prefs.PackOptions.MixScales", Value=true})
"""
shortcutMode = """
ZomSet({Path="Prefs.MousePresetMode", Value=11})
ZomSet({Path="Prefs.CustomMousePreset",
Value={ORBIT={MB="MMB", MODS="", KEYCODE=0},
ZOOM={MB="MMB", MODS="Alt-Ctrl", KEYCODE=0},
PAN={MB="MMB", MODS="Shift", KEYCODE=0},
DENSITY_PAINT={MB="LMB", MODS="", KEYCODE=0},
OPTIMIZE_PAINT={MB="LMB", MODS="", KEYCODE=0},
PIN_PAINT={MB="LMB", MODS="", KEYCODE=0},
PROTECT_PAINT={MB="LMB", MODS="", KEYCODE=0},
UNFOLD_PAINT={MB="LMB", MODS="", KEYCODE=0},
SPREAD={MB="LMB", MODS="", KEYCODE=0},
PINCH={MB="LMB", MODS="", KEYCODE=0},
DRAG={MB="LMB", MODS="", KEYCODE=0},
SELECT={MB="LMB", MODS="", KEYCODE=0},
ADD_SELECT={MB="LMB", MODS="Ctrl", KEYCODE=0},
DESELECT={MB="LMB", MODS="Alt", KEYCODE=0},
ADD_SELECT_SHORT_PATH={MB="LMB", MODS="Shift", KEYCODE=0},
SELECT_LOOP_PATH={MB="DLMB", MODS="", KEYCODE=0},
ADD_SELECT_LOOP_PATH={MB="DLMB", MODS="Ctrl", KEYCODE=0},
DESELECT_PATH={MB="DLMB", MODS="Alt", KEYCODE=0},
SELECT_TRANSLATE={MB="MMB", MODS="", KEYCODE=32},
SELECT_ROTATE={MB="RMB", MODS="", KEYCODE=32},
SELECT_SCALE={MB="LMB", MODS="", KEYCODE=32},
ADD_SELECT_TRANSLATE={MB="MMB", MODS="Ctrl", KEYCODE=32},
ADD_SELECT_ROTATE={MB="RMB", MODS="Ctrl", KEYCODE=32},
ADD_SELECT_SCALE={MB="LMB", MODS="Ctrl", KEYCODE=32},
TRANSLATE_ISLAND={MB="MMB", MODS="", KEYCODE=68},
ROTATE_ISLAND={MB="RMB", MODS="", KEYCODE=68},
SCALE_ISLAND={MB="LMB", MODS="", KEYCODE=68},
PREVIEW_SHORT_PATH={MB="", MODS="Shift", KEYCODE=0}}})
ZomSavePreferences(none)
"""


if self.prefs.script == "FLATTEN":
Expand All @@ -138,7 +76,7 @@ def base_script(self, script):
else:
mesh_load = f'ZomLoad({{File={{Path="{self.file_path}", ImportGroups=true, XYZUVW=true, UVWProps=true}}, __UpdateGUIFilePath=true, __Focus=true}})'

script.write("\n" + suffix + "\n" + uv_order + "\n" + "\n" +colorMap + "\n" +displayMode + "\n" +packingMode + "\n" + get_Shortcut(self.props.shortcut) + "\n" + mesh_load)
script.write("\n" + suffix + "\n" + uv_order + "\n" + "\n" +colorMap + "\n" +displayMode + "\n" +packingMode + "\n" + "\n" + mesh_load)

def set_variables(self, script):

Expand Down

0 comments on commit 1cdc056

Please sign in to comment.