Changeset 3513 for trunk/engine/core/view/renderers/lightrenderer.cpp

Timestamp:

11/21/10 15:58:14 (3 years ago)

Author:

helios2000

Message:

• Fixed the image/animation functions in GenericRenderer? and LightRenderer?. The functions now consider the camera zoom level.
• Added the forgotten LightEdit? plugin for the editor.

File:

• trunk/engine/core/view/renderers/lightrenderer.cpp (modified) (4 diffs)

trunk/engine/core/view/renderers/lightrenderer.cpp

@@ -248 +248 @@
                         Rect r;
                         Rect viewport = cam->getViewPort();
-                        r.x = p.x-img->getWidth()/2;
-                        r.y = p.y-img->getHeight()/2;
-                        r.w = img->getWidth();
-                        r.h = img->getHeight();
+                        unsigned int widtht = round(img->getWidth() * cam->getZoom());
+                        unsigned int height = round(img->getHeight() * cam->getZoom());
+                        r.x = p.x-widtht/2;
+                        r.y = p.y-height/2;
+                        r.w = widtht;
+                        r.h = height;
                         renderbackend->changeBlending(m_src, m_dst);
                         if(r.intersects(viewport))
@@ -297 +299 @@
                         Rect r;
                         Rect viewport = cam->getViewPort();
-                        r.x = p.x-img->getWidth()/2;
-                        r.y = p.y-img->getHeight()/2;
-                        r.w = img->getWidth();
-                        r.h = img->getHeight();
+                        unsigned int widtht = round(img->getWidth() * cam->getZoom());
+                        unsigned int height = round(img->getHeight() * cam->getZoom());
+                        r.x = p.x-widtht/2;
+                        r.y = p.y-height/2;
+                        r.w = widtht;
+                        r.h = height;
                         renderbackend->changeBlending(m_src, m_dst);
                         if(r.intersects(viewport))
@@ -344 +348 @@
                         Rect r;
                         Rect viewport = cam->getViewPort();
-                        r.x = p.x-m_width/2;
-                        r.y = p.y-m_height/2;
-                        r.w = m_width;
-                        r.h = m_height;
+                        unsigned int widtht = round(m_width * cam->getZoom());
+                        unsigned int height = round(m_height * cam->getZoom());
+                        r.x = p.x-widtht/2;
+                        r.y = p.y-height/2;
+                        r.w = widtht;
+                        r.h = height;
                         renderbackend->changeBlending(m_src, m_dst);
                         if(r.intersects(viewport))
@@ -393 +399 @@
                 Point p = m_anchor.getCalculatedPoint(cam, layer);
                 if(m_anchor.getLayer() == layer) {
+                        double zoom = cam->getZoom();
                         renderbackend->changeBlending(m_src, m_dst);
-                        renderbackend->drawLightPrimitive(p, m_intensity, m_radius, m_subdivisions, m_xstretch, m_ystretch, m_red, m_green, m_blue);
+                        renderbackend->drawLightPrimitive(p, m_intensity, m_radius, m_subdivisions, m_xstretch * zoom, m_ystretch * zoom, m_red, m_green, m_blue);
                 }
         }