Mercurial > fife-parpg
comparison engine/core/view/renderers/gridrenderer.cpp @ 661:e3140f01749d
* Merged the light branch back into trunk.
* Modified the demos so they work with the new loaders and setting.
author | helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 |
---|---|
date | Fri, 05 Nov 2010 15:21:10 +0000 |
parents | b2feacaed53c |
children |
comparison
equal
deleted
inserted
replaced
660:b0733d998d0f | 661:e3140f01749d |
---|---|
71 CellGrid* cg = layer->getCellGrid(); | 71 CellGrid* cg = layer->getCellGrid(); |
72 if (!cg) { | 72 if (!cg) { |
73 FL_WARN(_log, "No cellgrid assigned to layer, cannot draw grid"); | 73 FL_WARN(_log, "No cellgrid assigned to layer, cannot draw grid"); |
74 return; | 74 return; |
75 } | 75 } |
76 m_renderbackend->disableLighting(); | |
76 // | 77 // |
77 // | 78 // |
78 // //render elev_coord box | 79 // //render elev_coord box |
79 // //draw front quad | 80 // //draw front quad |
80 // // 1,1,1 | 81 // // 1,1,1 |
178 if ((firstpt.x >= cv.x) && (firstpt.x <= cvx2) && (firstpt.y >= cv.y) && (firstpt.y <= cvy2)) { | 179 if ((firstpt.x >= cv.x) && (firstpt.x <= cvx2) && (firstpt.y >= cv.y) && (firstpt.y <= cvy2)) { |
179 m_renderbackend->drawLine(pt2, Point(firstpt.x, firstpt.y), m_color.r, m_color.g, m_color.b); | 180 m_renderbackend->drawLine(pt2, Point(firstpt.x, firstpt.y), m_color.r, m_color.g, m_color.b); |
180 } | 181 } |
181 } | 182 } |
182 } | 183 } |
184 m_renderbackend->enableLighting(); | |
183 } | 185 } |
184 | 186 |
185 void GridRenderer::setColor(Uint8 r, Uint8 g, Uint8 b) { | 187 void GridRenderer::setColor(Uint8 r, Uint8 g, Uint8 b) { |
186 m_color.r = r; | 188 m_color.r = r; |
187 m_color.g = g; | 189 m_color.g = g; |