From 5e3e1e4567ad280793ec7d5f060bf8ec2d2d646c Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Fri, 17 Jul 2015 15:00:10 -0700 Subject: [PATCH] adding texture --- .../entities-renderer/src/RenderablePolyLineEntityItem.cpp | 4 +++- .../entities-renderer/src/RenderablePolyLineEntityItem.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp index fcacbcd458..b44be2acf2 100644 --- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp @@ -37,13 +37,15 @@ PolyLineEntityItem(entityItemID, properties) { gpu::PipelinePointer RenderablePolyLineEntityItem::_pipeline; gpu::Stream::FormatPointer RenderablePolyLineEntityItem::_format; +gpu::TexturePointer RenderablePolyLineEntityItem::_texture; void RenderablePolyLineEntityItem::createPipeline() { static const int NORMAL_OFFSET = 12; static const int COLOR_OFFSET = 24; auto textureCache = DependencyManager::get(); - textureCache->getImageTexture(PathUtils::resourcesPath() + "images/paintStrokeTexture.png"); + _texture = textureCache->getImageTexture(PathUtils::resourcesPath() + "images/paintStrokeTexture.png"); + _format.reset(new gpu::Stream::Format()); _format->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0); diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h index f057f2e785..9bd9a8e973 100644 --- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h +++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h @@ -31,12 +31,12 @@ public: static gpu::PipelinePointer _pipeline; static gpu::Stream::FormatPointer _format; + static gpu::TexturePointer _texture; protected: void updateGeometry(); gpu::BufferPointer _verticesBuffer; unsigned int _numVertices; - gpu::TexturePointer _texture; };