[Bf-extensions-cvs] [7b0831a7] master: sun position: base update
meta-androcto
noreply at git.blender.org
Mon Sep 16 05:25:17 CEST 2019
Commit: 7b0831a775286f4ea98b9b7eada204f4fb075f64
Author: meta-androcto
Date: Mon Sep 16 13:24:27 2019 +1000
Branches: master
https://developer.blender.org/rBAC7b0831a775286f4ea98b9b7eada204f4fb075f64
sun position: base update
===================================================================
M sun_position/__init__.py
M sun_position/hdr.py
M sun_position/map.py
M sun_position/north.py
M sun_position/operators.py
M sun_position/properties.py
M sun_position/sun_calc.py
M sun_position/ui_sun.py
===================================================================
diff --git a/sun_position/__init__.py b/sun_position/__init__.py
index 59e6a588..c8e03f77 100644
--- a/sun_position/__init__.py
+++ b/sun_position/__init__.py
@@ -32,19 +32,17 @@
# <pep8 compliant>
bl_info = {
- "name": "Sun Position",
- "author": "Michael Martin",
+ "name": "Sun Position 2.8",
+ "author": "Michael Martin, Kevan Cress",
"version": (3, 0, 1),
- "blender": (2, 65, 0),
- "api": 53207,
+ "blender": (2, 80, 0),
"location": "World > Sun Position",
"description": "Show sun position with objects and/or sky texture",
- "warning": "",
- "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
- "Scripts/3D_interaction/Sun_Position",
- "tracker_url": "https://projects.blender.org/tracker/"
- "index.php?func=detail&aid=29714",
- "category": "Lighting"}
+ "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/" \
+ "Scripts/3D_interaction/Sun_Position",
+ "tracker_url": "https://projects.blender.org/tracker/" \
+ "index.php?func=detail&aid=29714",
+ "category": "3D View"} # "Lighting"} ?
import bpy
from . properties import *
@@ -54,48 +52,42 @@ from . hdr import SunPos_HdrHelp
############################################################################
+classes = (
+ SunPos_OT_Controller,
+ SunPos_OT_Preferences,
+ SunPos_OT_PreferencesDone,
+ SunPos_OT_DayRange,
+ SunPos_OT_SetObjectGroup,
+ SunPos_OT_ClearObjectGroup,
+ SunPos_OT_TimePlace,
+ SunPos_OT_Map,
+ SunPos_OT_Hdr,
+ SPOS_PT_Panel,
+ SunPos_OT_MapChoice,
+ SunPos_Help,
+ SunPos_HdrHelp,
+)
def register():
bpy.utils.register_class(SunPosSettings)
bpy.types.Scene.SunPos_property = (
bpy.props.PointerProperty(type=SunPosSettings,
- name="Sun Position",
- description="Sun Position Settings"))
+ name="Sun Position",
+ description="Sun Position Settings"))
bpy.utils.register_class(SunPosPreferences)
bpy.types.Scene.SunPos_pref_property = (
bpy.props.PointerProperty(type=SunPosPreferences,
- name="Sun Position Preferences",
- description="SP Preferences"))
+ name="Sun Position Preferences",
+ description="SP Preferences"))
- bpy.utils.register_class(SunPos_OT_Controller)
- bpy.utils.register_class(SunPos_OT_Preferences)
- bpy.utils.register_class(SunPos_OT_PreferencesDone)
- bpy.utils.register_class(SunPos_OT_DayRange)
- bpy.utils.register_class(SunPos_OT_SetObjectGroup)
- bpy.utils.register_class(SunPos_OT_ClearObjectGroup)
- bpy.utils.register_class(SunPos_OT_TimePlace)
- bpy.utils.register_class(SunPos_OT_Map)
- bpy.utils.register_class(SunPos_OT_Hdr)
- bpy.utils.register_class(SunPos_Panel)
- bpy.utils.register_class(SunPos_OT_MapChoice)
- bpy.utils.register_class(SunPos_Help)
- bpy.utils.register_class(SunPos_HdrHelp)
+ for c in classes:
+ bpy.utils.register_class(c)
def unregister():
- bpy.utils.unregister_class(SunPos_HdrHelp)
- bpy.utils.unregister_class(SunPos_Help)
- bpy.utils.unregister_class(SunPos_OT_MapChoice)
- bpy.utils.unregister_class(SunPos_Panel)
- bpy.utils.unregister_class(SunPos_OT_Hdr)
- bpy.utils.unregister_class(SunPos_OT_Map)
- bpy.utils.unregister_class(SunPos_OT_TimePlace)
- bpy.utils.unregister_class(SunPos_OT_ClearObjectGroup)
- bpy.utils.unregister_class(SunPos_OT_SetObjectGroup)
- bpy.utils.unregister_class(SunPos_OT_DayRange)
- bpy.utils.unregister_class(SunPos_OT_PreferencesDone)
- bpy.utils.unregister_class(SunPos_OT_Preferences)
- bpy.utils.unregister_class(SunPos_OT_Controller)
+ for c in reversed(classes):
+ bpy.utils.unregister_class(c)
+
del bpy.types.Scene.SunPos_pref_property
bpy.utils.unregister_class(SunPosPreferences)
del bpy.types.Scene.SunPos_property
diff --git a/sun_position/hdr.py b/sun_position/hdr.py
index c7b36dd9..e7f908f6 100644
--- a/sun_position/hdr.py
+++ b/sun_position/hdr.py
@@ -192,8 +192,8 @@ class HdrClass:
self.set_view3d_area(self.view3d_area)
self.start = True
self.handler1 = bpy.types.SpaceView3D.draw_handler_add(
- Hdr_load_callback,
- (self, context), 'WINDOW', 'POST_PIXEL')
+ Hdr_load_callback,
+ (self, context), 'WINDOW', 'POST_PIXEL')
self.isActive = True
return True
else:
@@ -201,7 +201,7 @@ class HdrClass:
def activateBGLcallback(self, context):
self.handler2 = bpy.types.SpaceView3D.draw_handler_add(
- Draw_hdr_callback, (self, context), 'WINDOW', 'POST_PIXEL')
+ Draw_hdr_callback, (self, context), 'WINDOW', 'POST_PIXEL')
self.view3d_area = context.area
self.set_view3d_area(self.view3d_area)
bpy.ops.sunpos.hdr('INVOKE_DEFAULT')
@@ -222,9 +222,9 @@ class HdrClass:
self.glImage = None
self.image.bindcode = 0
self.isActive = False
- if Sun.SP:
- Sun.SP.ShowHdr = False
- Sun.SP.BindToSun = True
+ #if Sun.SP: # why removed?
+ Sun.SP.ShowHdr = False # indent?
+ Sun.SP.BindToSun = True # indent?
Sun.BindToSun = False
Display.refresh()
@@ -465,11 +465,11 @@ def hdr_G(event):
############################################################################
Key_function = dict([('LEFT_CTRL', key_Ctrl), ('LEFT_ALT', key_Alt),
- ('RIGHT_CTRL', key_Ctrl), ('RIGHT_ALT', key_Alt),
- ('MIDDLEMOUSE', key_MiddleMouse),
- ('LEFTMOUSE', key_LeftMouse),
- ('RIGHTMOUSE', key_Esc), ('ESC', key_Esc),
- ('G', key_G), ('H', key_H), ('F1', key_H)])
+ ('RIGHT_CTRL', key_Ctrl), ('RIGHT_ALT', key_Alt),
+ ('MIDDLEMOUSE', key_MiddleMouse),
+ ('LEFTMOUSE', key_LeftMouse),
+ ('RIGHTMOUSE', key_Esc), ('ESC', key_Esc),
+ ('G', key_G), ('H', key_H), ('F1', key_H)])
# ---------------------------------------------------------------------------
@@ -918,11 +918,11 @@ class SunPos_HdrHelp(bpy.types.Operator):
colL = split.column()
colR = split.column()
colL.label(text="Esc or Right Mouse ")
- colR.label("Close map or text.")
+ colR.label(text="Close map or text.")
colL.label(text="Left Mouse")
colR.label(text="Move crosshair.")
colL.label(text="G or MiddleMouse")
- colR.label("Pan mode. Grab and move map or text.")
+ colR.label(text="Pan mode. Grab and move map or text.")
colL.label(text="Ctrl Middlemouse")
colR.label(text="Mouse zoom to point.")
self.layout.label("--- The following are changed by moving " +
diff --git a/sun_position/map.py b/sun_position/map.py
index edb09268..9585ee4a 100644
--- a/sun_position/map.py
+++ b/sun_position/map.py
@@ -199,12 +199,12 @@ class MapClass:
self.start = True
if self.mapLocation == 'PANEL':
self.handler1 = bpy.types.SpaceProperties.draw_handler_add(
- Map_load_callback,
- (self, context), 'WINDOW', 'POST_PIXEL')
+ Map_load_callback,
+ (self, context), 'WINDOW', 'POST_PIXEL')
else:
self.handler1 = bpy.types.SpaceView3D.draw_handler_add(
- Map_load_callback,
- (self, context), 'WINDOW', 'POST_PIXEL')
+ Map_load_callback,
+ (self, context), 'WINDOW', 'POST_PIXEL')
self.isActive = True
return True
else:
@@ -213,12 +213,12 @@ class MapClass:
def activateBGLcallback(self, context):
if self.mapLocation == 'PANEL':
self.handler2 = bpy.types.SpaceProperties.draw_handler_add(
- Draw_map_callback,
- (self, context), 'WINDOW', 'POST_PIXEL')
+ Draw_map_callback,
+ (self, context), 'WINDOW', 'POST_PIXEL')
else:
self.handler2 = bpy.types.SpaceView3D.draw_handler_add(
- Draw_map_callback,
- (self, context), 'WINDOW', 'POST_PIXEL')
+ Draw_map_callback,
+ (self, context), 'WINDOW', 'POST_PIXEL')
self.view3d_area = context.area
self.set_view3d_area(self.view3d_area)
bpy.ops.sunpos.map('INVOKE_DEFAULT')
@@ -239,8 +239,8 @@ class MapClass:
self.glImage = None
self.image.bindcode = 0
self.isActive = False
- if Sun.SP:
- Sun.SP.ShowMap = False
+ #if Sun.SP: # why removed?
+ Sun.SP.ShowMap = False # indent?
def load_blender_image(self, file_name):
if file_name == "None":
@@ -249,23 +249,23 @@ class MapClass:
return True
else:
self.textureless = False
-
- # S.L. fix to use any relative path
- dir_path = os.path.dirname(os.path.realpath(__file__))
- self.image.name = dir_path + os.path.sep + file_name
- if os.path.exists(self.image.name):
- try:
- self.glImage = bpy.data.images.load(self.image.name)
- if self.glImage is not None:
- self.image.loaded = True
- self.glImage.user_clear()
- self.object[0].heightFactor = \
- self.glImage.size[1] / self.glImage.size[0]
- return True
- else:
- return False
- except:
- pass
+ for path in sys.path:
+ if path.endswith("addons"):
+ fn = path + "\\sun_position\\" + file_name
+ self.i
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list