xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Render buckets improvements

Browse Source
This commit is contained in:
Emux 2016-12-09 20:11:50 +02:00
parent 989e9c2ae8
commit e9bb7aaae4
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtm/src/org/oscim/renderer/bucket/CircleBucket.java
View File

@ -128,9 +128,10 @@ public class CircleBucket extends RenderBucket {
for (; b != null && b.type == CIRCLE; b = b.next) {
CircleBucket cb = (CircleBucket) b;
CircleStyle circle = cb.circle.current();
GLUtils.setColor(s.uColor, cb.circle.fillColor, 1);
gl.uniform1f(s.uScale, cb.circle.radius);
GLUtils.setColor(s.uColor, circle.fillColor, 1);
gl.uniform1f(s.uScale, circle.radius);
gl.vertexAttribPointer(s.aPos, 2, GL.SHORT,
false, 0, cb.vertexOffset);

20
vtm/src/org/oscim/renderer/bucket/HairLineBucket.java
View File

@ -1,3 +1,20 @@
/*
* Copyright 2013 Hannes Janetzek
* Copyright 2016 devemux86
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General License for more details.
*
* You should have received a copy of the GNU Lesser General License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.renderer.bucket;
import org.oscim.backend.GL;
@ -120,8 +137,9 @@ public class HairLineBucket extends RenderBucket {
for (; l != null && l.type == HAIRLINE; l = l.next) {
HairLineBucket ll = (HairLineBucket) l;
LineStyle line = ll.line.current();
GLUtils.setColor(s.uColor, ll.line.color, 1);
GLUtils.setColor(s.uColor, line.color, 1);
gl.vertexAttribPointer(s.aPos, 2, GL.SHORT,
false, 0, ll.vertexOffset);