Changeset 3513 for trunk/engine/core/view/renderers/genericrenderer.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/genericrenderer.cpp (modified) (3 diffs)

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

@@ -329 +329 @@
                         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;
                         if(r.intersects(viewport))
                                 img->render(r);
@@ -353 +355 @@
                         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;
                         if(r.intersects(viewport))
                                 img->render(r);
@@ -398 +402 @@
                         Image* img = &imagepool->getImage(m_image);
                         Rect r;
-                        r.x = p.x-m_width/2;
-                        r.y = p.y-m_height/2;
-                        r.w = m_width;
-                        r.h = m_height;
-                        renderbackend->disableLighting();
-                        img->render(r);
-                        renderbackend->enableLighting();
+                        Rect viewport = cam->getViewPort();
+                        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;
+                        if(r.intersects(viewport)) {
+                                img->render(r);
+                        }
                 }
         }