Skip to content
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

Jump to bottom

get_rendering_string: don't use 'source.Proxy.type' attr to choose RenderHandler #193

Merged
merged 1 commit into from
Jun 11, 2022
Merged

get_rendering_string: don't use 'source.Proxy.type' attr to choose RenderHandler #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 18 additions & 13 deletions Render/rdrhandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@

from Render.utils import translate, debug, getproxyattr, clamp
from Render import renderables
from Render import camera, lights
import Render.rdrmaterials as materials


Expand Down Expand Up @@ -215,22 +216,26 @@ def get_rendering_string(self, view):
for the supplied 'view'
"""
try:
# determine the Render Handler to use for this object
# Camera and lighting objects use their own handlers
source = view.Source

objtype = getproxyattr(source, "type", "Object")

name = str(source.Name)

switcher = {
"Object": RendererHandler._render_object,
"PointLight": RendererHandler._render_pointlight,
"Camera": RendererHandler._render_camera,
"AreaLight": RendererHandler._render_arealight,
"SunskyLight": RendererHandler._render_sunskylight,
"ImageLight": RendererHandler._render_imagelight,
}

res = switcher[objtype](self, name, view)
handler = RendererHandler._render_object
if hasattr(source, "Proxy"):
objtype = type(source.Proxy)
if objtype == camera.Camera:
handler = RendererHandler._render_camera
elif objtype == lights.PointLight:
handler = RendererHandler._render_pointlight
elif objtype == lights.AreaLight:
handler = RendererHandler._render_arealight
elif objtype == lights.SunskyLight:
handler = RendererHandler._render_sunskylight
elif objtype == lights.ImageLight:
handler = RendererHandler._render_imagelight

res = handler(self, name, view)

except (AttributeError, TypeError, AssertionError) as err:
msg = (
Expand Down