[Bf-extensions-cvs] [72c24a1] master: update archimesh to correct version: T37230
meta-androcto
noreply at git.blender.org
Mon Jun 13 16:03:18 CEST 2016
Commit: 72c24a1dbf158d4359cf1084981623edd4228282
Author: meta-androcto
Date: Tue Jun 14 00:02:42 2016 +1000
Branches: master
https://developer.blender.org/rBAC72c24a1dbf158d4359cf1084981623edd4228282
update archimesh to correct version: T37230
===================================================================
M archimesh/__init__.py
A archimesh/achm_books_maker.py
A archimesh/achm_column_maker.py
A archimesh/achm_curtain_maker.py
A archimesh/achm_door_maker.py
A archimesh/achm_gltools.py
A archimesh/achm_kitchen_maker.py
A archimesh/achm_lamp_maker.py
A archimesh/achm_main_panel.py
A archimesh/achm_roof_maker.py
A archimesh/achm_room_maker.py
A archimesh/achm_shelves_maker.py
A archimesh/achm_stairs_maker.py
A archimesh/achm_tools.py
A archimesh/achm_venetian_maker.py
A archimesh/achm_window_maker.py
A archimesh/achm_window_panel.py
D archimesh/books_maker.py
D archimesh/column_maker.py
D archimesh/curtain_maker.py
D archimesh/door_maker.py
D archimesh/kitchen_maker.py
D archimesh/lamp_maker.py
D archimesh/main_panel.py
D archimesh/roof_maker.py
D archimesh/room_maker.py
D archimesh/shelves_maker.py
D archimesh/stairs_maker.py
D archimesh/tools.py
D archimesh/window_maker.py
===================================================================
diff --git a/archimesh/__init__.py b/archimesh/__init__.py
index 5f146b2..b3ebc3e 100644
--- a/archimesh/__init__.py
+++ b/archimesh/__init__.py
@@ -17,161 +17,277 @@
#
# ***** END GPL LICENCE BLOCK *****
+# PEP8 compliant (https://www.python.org/dev/peps/pep-0008)
-#----------------------------------------------------------
+# ----------------------------------------------------------
# File: __init__.py
# Author: Antonio Vazquez (antonioya)
-#----------------------------------------------------------
+# ----------------------------------------------------------
-#----------------------------------------------
-# Define Addon info
-#----------------------------------------------
+# ----------------------------------------------
+# Define Addon info
+# ----------------------------------------------
bl_info = {
"name": "Archimesh",
"author": "Antonio Vazquez (antonioya)",
"location": "View3D > Add > Mesh > Archimesh",
- "version": (0, 8, 1),
- "blender": (2, 7, 7),
- "description": "Generate rooms, doors, windows, kitchen cabinets, shelves, roofs, stairs and other architecture stuff.",
+ "version": (1, 1, 2),
+ "blender": (2, 6, 8),
+ "description": "Generate rooms, doors, windows, kitchen cabinets, "
+ "shelves, roofs, stairs and other architecture stuff.",
"category": "Add Mesh"}
-import sys,os
+import sys
+import os
-#----------------------------------------------
+# ----------------------------------------------
# Add to Phyton path (once only)
-#----------------------------------------------
+# ----------------------------------------------
path = sys.path
flag = False
for item in path:
if "archimesh" in item:
flag = True
-if flag == False:
+if flag is False:
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'archimesh'))
print("archimesh: added to phytonpath")
-#----------------------------------------------
+# ----------------------------------------------
# Import modules
-#----------------------------------------------
+# ----------------------------------------------
if "bpy" in locals():
import imp
- imp.reload(room_maker)
- imp.reload(door_maker)
- imp.reload(window_maker)
- imp.reload(roof_maker)
- imp.reload(column_maker)
- imp.reload(stairs_maker)
- imp.reload(kitchen_maker)
- imp.reload(shelves_maker)
- imp.reload(books_maker)
- imp.reload(lamp_maker)
- imp.reload(curtain_maker)
- imp.reload(main_panel)
+ imp.reload(achm_room_maker)
+ imp.reload(achm_door_maker)
+ imp.reload(achm_window_maker)
+ imp.reload(achm_roof_maker)
+ imp.reload(achm_column_maker)
+ imp.reload(achm_stairs_maker)
+ imp.reload(achm_kitchen_maker)
+ imp.reload(achm_shelves_maker)
+ imp.reload(achm_books_maker)
+ imp.reload(achm_lamp_maker)
+ imp.reload(achm_curtain_maker)
+ imp.reload(achm_venetian_maker)
+ imp.reload(achm_main_panel)
+ imp.reload(achm_window_panel)
print("archimesh: Reloaded multifiles")
else:
- from . import room_maker, door_maker,roof_maker,column_maker,stairs_maker,kitchen_maker,shelves_maker
- from . import books_maker,curtain_maker,window_maker,lamp_maker,main_panel
+ import achm_books_maker
+ import achm_column_maker
+ import achm_curtain_maker
+ import achm_venetian_maker
+ import achm_door_maker
+ import achm_kitchen_maker
+ import achm_lamp_maker
+ import achm_main_panel
+ import achm_roof_maker
+ import achm_room_maker
+ import achm_shelves_maker
+ import achm_stairs_maker
+ import achm_window_maker
+ import achm_window_panel
+
print("archimesh: Imported multifiles")
-import bpy
+# noinspection PyUnresolvedReferences
+import bpy
+# noinspection PyUnresolvedReferences
from bpy.props import *
-#----------------------------------------------------------
+# ----------------------------------------------------------
# Decoration assets
-#----------------------------------------------------------
-class INFO_MT_mesh_decoration_add(bpy.types.Menu):
- # Define the "Math Function" menu
+# ----------------------------------------------------------
+
+
+class AchmInfoMtMeshDecorationAdd(bpy.types.Menu):
bl_idname = "INFO_MT_mesh_decoration_add"
bl_label = "Decoration assets"
+ # noinspection PyUnusedLocal
def draw(self, context):
- self.layout.operator("mesh.archimesh_books", text="Add Books",icon="PLUGIN")
- self.layout.operator("mesh.archimesh_lamp", text="Add Lamp",icon="PLUGIN")
- self.layout.operator("mesh.archimesh_roller", text="Add Roller curtains",icon="PLUGIN")
- self.layout.operator("mesh.archimesh_venetian", text="Add Venetian blind",icon="PLUGIN")
- self.layout.operator("mesh.archimesh_japan", text="Add Japanese curtains",icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_books", text="Add Books", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_lamp", text="Add Lamp", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_roller", text="Add Roller curtains", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_venetian", text="Add Venetian blind", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_japan", text="Add Japanese curtains", icon="PLUGIN")
-#----------------------------------------------------------
+# ----------------------------------------------------------
# Registration
-#----------------------------------------------------------
-class INFO_MT_mesh_custom_menu_add(bpy.types.Menu):
+# ----------------------------------------------------------
+
+
+class AchmInfoMtMeshCustomMenuAdd(bpy.types.Menu):
bl_idname = "INFO_MT_mesh_custom_menu_add"
bl_label = "Archimesh"
-
+
+ # noinspection PyUnusedLocal
def draw(self, context):
self.layout.operator_context = 'INVOKE_REGION_WIN'
- self.layout.operator("mesh.archimesh_room", text="Add Room",icon="PLUGIN");
- self.layout.operator("mesh.archimesh_door", text="Add Door",icon="PLUGIN")
- self.layout.operator("mesh.archimesh_window", text="Add Window",icon="PLUGIN")
- self.layout.operator("mesh.archimesh_kitchen", text="Add Cabinet",icon="PLUGIN")
- self.layout.operator("mesh.archimesh_shelves", text="Add Shelves",icon="PLUGIN")
- self.layout.operator("mesh.archimesh_column", text="Add Column",icon="PLUGIN")
- self.layout.operator("mesh.archimesh_stairs", text="Add Stairs",icon="PLUGIN")
- self.layout.operator("mesh.archimesh_roof", text="Add Roof",icon="PLUGIN")
- self.layout.menu("INFO_MT_mesh_decoration_add", text="Decoration props",icon="GROUP")
-
-#--------------------------------------------------------------
+ self.layout.operator("mesh.archimesh_room", text="Add Room", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_door", text="Add Door", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_window", text="Add Rail Window", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_winpanel", text="Add Panel Window", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_kitchen", text="Add Cabinet", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_shelves", text="Add Shelves", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_column", text="Add Column", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_stairs", text="Add Stairs", icon="PLUGIN")
+ self.layout.operator("mesh.archimesh_roof", text="Add Roof", icon="PLUGIN")
+ self.layout.menu("INFO_MT_mesh_decoration_add", text="Decoration props", icon="GROUP")
+
+# --------------------------------------------------------------
# Register all operators and panels
-#--------------------------------------------------------------
+# --------------------------------------------------------------
# Define menu
-def menu_func(self, context):
+
+
+# noinspection PyUnusedLocal
+def AchmMenu_func(self, context):
self.layout.menu("INFO_MT_mesh_custom_menu_add", icon="PLUGIN")
+
def register():
- bpy.utils.register_class(INFO_MT_mesh_custom_menu_add)
- bpy.utils.register_class(INFO_MT_mesh_decoration_add)
- bpy.utils.register_class(room_maker.ROOM)
- bpy.utils.register_class(room_maker.RoomGeneratorPanel)
- bpy.utils.register_class(room_maker.EXPORT_ROOM)
- bpy.utils.register_class(room_maker.IMPORT_ROOM)
- bpy.utils.register_class(door_maker.DOOR)
- bpy.utils.register_class(window_maker.WINDOWS)
- bpy.utils.register_class(roof_maker.ROOF)
- bpy.utils.register_class(column_maker.COLUMN)
- bpy.utils.register_class(stairs_maker.STAIRS)
- bpy.utils.register_class(kitchen_maker.KITCHEN)
- bpy.utils.register_class(kitchen_maker.EXPORT_INVENTORY)
- bpy.utils.register_class(shelves_maker.SHELVES)
- bpy.utils.register_class(books_maker.BOOKS)
- bpy.utils.register_class(lamp_maker.LAMP)
- bpy.utils.register_class(curtain_maker.ROLLER)
- bpy.utils.register_class(curtain_maker.VENETIAN)
- bpy.utils.register_class(curtain_maker.JAPAN)
- bpy.utils.register_class(main_panel.ArchimeshMainPanel)
- bpy.utils.register_class(main_panel.holeAction)
- bpy.types.INFO_MT_mesh_add.append(menu_func)
+ bpy.utils.register_class(AchmInfoMtMeshCustomMenuAdd)
+ bpy.utils.register_class(AchmInfoMtMeshDecorationAdd)
+ bpy.utils.register_class(achm_room_maker.AchmRoom)
+ bpy.utils.register_class(achm_room_maker.AchmRoomGeneratorPanel)
+ bpy.utils.register_class(achm_room_maker.AchmExportRoom)
+ bpy.utils.register_class(achm_room_maker.AchmImportRoom)
+ bpy.utils.register_class(achm_door_maker.AchmDoor)
+ bpy.utils.register_class(achm_door_maker.AchmDoorObjectgeneratorpanel)
+ bpy.utils.register_class(achm_window_maker.AchmWindows)
+ bpy.utils.register_class(achm_window_maker.AchmWindowObjectgeneratorpanel)
+ bpy.utils.register_class(achm_roof_maker.AchmRoof)
+ bpy.utils.register_class(achm_column_maker.AchmColumn)
+ bpy.utils.register_class(achm_stairs_maker.AchmStairs)
+ bpy.utils.register_class(achm_kitchen_maker.AchmKitchen)
+ bpy.utils.register_class(achm_kitchen_maker.AchmExportInventory)
+ bpy
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list