AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VertexArrayBuffer correctly computes its element offsets instead of using the weird guesses in rendering.slices

Browse Source
This commit is contained in:
David Vierra 2015-01-10 11:18:49 -10:00
parent b743217870
commit 78ae05608f
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mcedit2/rendering/rendergraph.py
View File

@ -260,11 +260,11 @@ class VertexRenderNode(RenderNode):
GL.glVertexPointer(3, GL.GL_FLOAT, stride, buf) GL.glVertexPointer(3, GL.GL_FLOAT, stride, buf)
if textures: if textures:
GL.glClientActiveTexture(GL.GL_TEXTURE0) GL.glClientActiveTexture(GL.GL_TEXTURE0)
GL.glTexCoordPointer(2, GL.GL_FLOAT, stride, (buf[3:])) GL.glTexCoordPointer(2, GL.GL_FLOAT, stride, (buf[array.texOffset:]))
if lights: if lights:
GL.glClientActiveTexture(GL.GL_TEXTURE1) GL.glClientActiveTexture(GL.GL_TEXTURE1)
GL.glTexCoordPointer(2, GL.GL_FLOAT, stride, (buf[5:])) GL.glTexCoordPointer(2, GL.GL_FLOAT, stride, (buf[array.lightOffset:]))
GL.glColorPointer(4, GL.GL_UNSIGNED_BYTE, stride, (buf.view(dtype=numpy.uint8)[(stride - 4):])) GL.glColorPointer(4, GL.GL_UNSIGNED_BYTE, stride, (buf.view(dtype=numpy.uint8)[array.rgbaOffset*4:]))
vertexCount = int(array.buffer.size / array.elements) vertexCount = int(array.buffer.size / array.elements)
GL.glDrawArrays(array.gl_type, 0, vertexCount) GL.glDrawArrays(array.gl_type, 0, vertexCount)

31
src/mcedit2/rendering/vertexarraybuffer.py
View File

@ -5,13 +5,14 @@ from __future__ import absolute_import, division, print_function, unicode_litera
import logging import logging
from OpenGL import GL from OpenGL import GL
import numpy import numpy
from mcedit2.rendering.slices import _XYZ, _ST, _SLBL, _RGBA, _RGB, _A from mcedit2.rendering.blockmeshes import standardCubeTemplates
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class VertexArrayBuffer(object): class VertexArrayBuffer(object):
texOffset = None
lightOffset = None
def __init__(self, count, textures=True, lights=True): def __init__(self, count, textures=True, lights=True):
""" """
Vertex buffer, stores an array of `count` quad vertexes with a number of elements determined by textures and Vertex buffer, stores an array of `count` quad vertexes with a number of elements determined by textures and
@ -26,9 +27,12 @@ class VertexArrayBuffer(object):
""" """
self.elements = 4 self.elements = 4
if textures: if textures:
self.texOffset = self.elements - 1
self.elements += 2 self.elements += 2
if lights: if lights:
self.lightOffset = self.elements - 1
self.elements += 2 self.elements += 2
self.rgbaOffset = self.elements - 1
self.buffer = numpy.zeros((count, 4, self.elements), dtype='f4') self.buffer = numpy.zeros((count, 4, self.elements), dtype='f4')
self.gl_type = GL.GL_QUADS self.gl_type = GL.GL_QUADS
@ -37,11 +41,11 @@ class VertexArrayBuffer(object):
self.rgba[:] = 0xff self.rgba[:] = 0xff
@classmethod @classmethod
def fromIndices(cls, direction, blockIndices, textures=True, lights=True): def fromIndices(cls, face, blockIndices, textures=True, lights=True):
""" """
:param direction: :param face:
:type direction: :type face:
:param blockIndices: :param blockIndices:
:type blockIndices: :type blockIndices:
:param textures: :param textures:
@ -59,9 +63,8 @@ class VertexArrayBuffer(object):
vertexBuffer.vertex[..., 0] = x[..., None] vertexBuffer.vertex[..., 0] = x[..., None]
vertexBuffer.vertex[..., 1] = y[..., None] vertexBuffer.vertex[..., 1] = y[..., None]
vertexBuffer.vertex[..., 2] = z[..., None] vertexBuffer.vertex[..., 2] = z[..., None]
#vertexBuffer.vertex[:] += standardCubeTemplates[direction, ..., 0:3] vertexBuffer.vertex[:] += standardCubeTemplates[face, ..., 0:3]
#if textures:
# vertexBuffer.texcoord[:] = standardCubeTemplates[direction, ..., 3:5]
if lights: if lights:
vertexBuffer.lightcoord[:] = [[[0.5, 0.5]]] vertexBuffer.lightcoord[:] = [[[0.5, 0.5]]]
@ -84,27 +87,27 @@ class VertexArrayBuffer(object):
@property @property
def vertex(self): def vertex(self):
return self.buffer[_XYZ] return self.buffer[..., :3]
@property @property
def texcoord(self): def texcoord(self):
return self.buffer[_ST] return self.buffer[..., self.texOffset:self.texOffset+2]
@property @property
def lightcoord(self): def lightcoord(self):
return self.buffer[_SLBL] return self.buffer[..., self.lightOffset:self.lightOffset+2]
@property @property
def rgba(self): def rgba(self):
return self.buffer.view('uint8')[_RGBA] return self.buffer.view('uint8')[..., self.rgbaOffset*4:self.rgbaOffset*4+4]
@property @property
def rgb(self): def rgb(self):
return self.buffer.view('uint8')[_RGB] return self.buffer.view('uint8')[..., self.rgbaOffset*4:self.rgbaOffset*4+3]
@property @property
def alpha(self): def alpha(self):
return self.buffer.view('uint8')[_A] return self.buffer.view('uint8')[..., self.rgbaOffset*4+3:self.rgbaOffset*4+4]
def __len__(self): def __len__(self):
return len(self.buffer) return len(self.buffer)