Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-05 03:19:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

points being updated at correct time;

Browse source
This commit is contained in:
ericrius1 2015-06-25 09:30:32 -07:00
parent 2c395b8fb4
commit c6baca35b9
3 changed files with 47 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libraries/entities-renderer/src/RenderableQuadEntityItem.cpp
View file

@ -12,7 +12,6 @@
#include <glm/gtx/quaternion.hpp>
#include <gpu/GPUConfig.h>
#include <gpu/Batch.h>
#include <GeometryCache.h>
#include <DeferredLightingEffect.h>
@ -20,28 +19,49 @@
#include "RenderableQuadEntityItem.h"
EntityItemPointer RenderableQuadEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
return EntityItemPointer(new RenderableQuadEntityItem(entityID, properties));
}
RenderableQuadEntityItem::RenderableQuadEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) :
QuadEntityItem(entityItemID, properties) {
_format.reset(new gpu::Stream::Format());
_format->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
_numVertices = 0;
}
void RenderableQuadEntityItem::updateGeometry() {
auto geometryCache = DependencyManager::get<GeometryCache>();
if (_lineVerticesID == GeometryCache::UNKNOWN_ID) {
_lineVerticesID = geometryCache ->allocateID();
if(_quadVertices.size() < 4) {
return;
}
// qDebug() << "num points: " << _points.size();
// qDebug() << "num quad vertices" << _quadVertices.size();
if (_pointsChanged) {
glm::vec4 lineColor(toGlm(getXColor()), getLocalRenderAlpha());
geometryCache->updateVertices(_lineVerticesID, getQuadVertices(), lineColor);
_verticesBuffer.reset(new gpu::Buffer());
_numVertices = 0;
for (int i = 0; i < _quadVertices.size(); i+=4) {
_verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_quadVertices.at(i));
_verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_quadVertices.at(i + 1));
_verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_quadVertices.at(i + 2));
_verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_quadVertices.at(i + 3));
_numVertices += 4;
}
_pointsChanged = false;
}
}
void RenderableQuadEntityItem::render(RenderArgs* args) {
if (_quadVertices.size() < 4 ) {
return;
}
PerformanceTimer perfTimer("RenderableQuadEntityItem::render");
Q_ASSERT(getType() == EntityTypes::Quad);
updateGeometry();
Q_ASSERT(args->_batch);
updateGeometry();
gpu::Batch& batch = *args->_batch;
Transform transform = Transform();
transform.setTranslation(getPosition());
@ -49,7 +69,10 @@ void RenderableQuadEntityItem::render(RenderArgs* args) {
DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(batch);
DependencyManager::get<GeometryCache>()->renderVertices(batch, gpu::TRIANGLE_STRIP, _lineVerticesID);
batch.setInputFormat(_format);
batch.setInputBuffer(0, _verticesBuffer, 0, _format->getChannels().at(0)._stride);
batch.draw(gpu::TRIANGLE_STRIP, _numVertices, 0);
RenderableDebugableEntityItem::render(this, args);

11
libraries/entities-renderer/src/RenderableQuadEntityItem.h
View file

@ -12,6 +12,7 @@
#ifndef hifi_RenderableQuadEntityItem_h
#define hifi_RenderableQuadEntityItem_h
#include <gpu/Batch.h>
#include <QuadEntityItem.h>
#include "RenderableDebugableEntityItem.h"
#include "RenderableEntityItem.h"
@ -21,10 +22,7 @@ class RenderableQuadEntityItem : public QuadEntityItem {
public:
static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
RenderableQuadEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) :
QuadEntityItem(entityItemID, properties),
_lineVerticesID(GeometryCache::UNKNOWN_ID)
{ }
RenderableQuadEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties);
virtual void render(RenderArgs* args);
@ -32,8 +30,9 @@ public:
protected:
void updateGeometry();
int _lineVerticesID;
gpu::Stream::FormatPointer _format;
gpu::BufferPointer _verticesBuffer;
unsigned int _numVertices;
};

16
libraries/entities/src/QuadEntityItem.cpp
View file

@ -106,8 +106,11 @@ bool QuadEntityItem::setLinePoints(const QVector<glm::vec3>& points) {
if (points.size() > MAX_POINTS_PER_LINE) {
return false;
}
if (points.size() != _points.size()) {
_pointsChanged = true;
}
//Check to see if points actually changed. If they haven't, return before doing anything else
if (points.size() == _points.size()) {
else if (points.size() == _points.size()) {
//same number of points, so now compare every point
for (int i = 0; i < points.size(); i++ ) {
if (points.at(i) != _points.at(i)){
@ -119,6 +122,8 @@ bool QuadEntityItem::setLinePoints(const QVector<glm::vec3>& points) {
if (!_pointsChanged) {
return false;
}
qDebug() << "POINTS CHANGED";
for (int i = 0; i < points.size(); i++) {
glm::vec3 point = points.at(i);
@ -136,10 +141,11 @@ bool QuadEntityItem::setLinePoints(const QVector<glm::vec3>& points) {
for (int i = 0; i < points.size(); i++) {
glm::vec3 point = points.at(i);
glm::vec3 p1 = glm::vec3(point.x - _lineWidth, point.y - _lineWidth, point.z);
glm::vec3 p2 = glm::vec3(point.x - _lineWidth, point.y + _lineWidth, point.z);
glm::vec3 p3 = glm::vec3(point.x + _lineWidth, point.y - _lineWidth, point.z);
glm::vec3 p4 = glm::vec3(point.x + _lineWidth, point.y + _lineWidth, point.z);
glm::vec3 p1 = glm::vec3(point.x - _lineWidth, point.y + _lineWidth, point.z);
glm::vec3 p2 = glm::vec3(point.x - _lineWidth, point.y - _lineWidth, point.z);
glm::vec3 p3 = glm::vec3(point.x + _lineWidth, point.y + _lineWidth, point.z);
glm::vec3 p4 = glm::vec3(point.x + _lineWidth, point.y - _lineWidth, point.z);
_quadVertices << p1 << p2 << p3 << p4;