Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

textures working

Browse source
This commit is contained in:
ericrius1 2015-07-21 09:56:09 -07:00
parent 9fc54a6040
commit b9affba93f
3 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
View file

@ -38,6 +38,7 @@ PolyLineEntityItem(entityItemID, properties) {
gpu::PipelinePointer RenderablePolyLineEntityItem::_pipeline;
gpu::Stream::FormatPointer RenderablePolyLineEntityItem::_format;
gpu::TexturePointer RenderablePolyLineEntityItem::_texture;
GLint RenderablePolyLineEntityItem::PAINTSTROKE_GPU_SLOT;
void RenderablePolyLineEntityItem::createPipeline() {
static const int NORMAL_OFFSET = 12;
@ -45,9 +46,11 @@ void RenderablePolyLineEntityItem::createPipeline() {
static const int TEXTURE_OFFSET = 24;
auto textureCache = DependencyManager::get<TextureCache>();
_texture = textureCache->getImageTexture(PathUtils::resourcesPath() + "images/paintStrokeTexture.jpeg");
QString path = PathUtils::resourcesPath() + "images/paintStroke.png";
// QString path = PathUtils::resourcesPath() + "images/arrow.png";
qDebug() << "IMAGE PATHHHH ******: " << path;
_texture = textureCache->getImageTexture(path);
// _texture = textureCache->getBlueTexture();
_format.reset(new gpu::Stream::Format());
_format->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
_format->setAttribute(gpu::Stream::NORMAL, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), NORMAL_OFFSET);
@ -59,8 +62,8 @@ void RenderablePolyLineEntityItem::createPipeline() {
gpu::ShaderPointer program = gpu::ShaderPointer(gpu::Shader::createProgram(VS, PS));
gpu::Shader::BindingSet slotBindings;
// const GLint PAINTSTROKE_GPU_SLOT = 0;
// slotBindings.insert(gpu::Shader::Binding(std::string("paintStrokeTextureBinding"), PAINTSTROKE_GPU_SLOT));
PAINTSTROKE_GPU_SLOT = 0;
slotBindings.insert(gpu::Shader::Binding(std::string("paintStrokeTextureBinding"), PAINTSTROKE_GPU_SLOT));
gpu::Shader::makeProgram(*program, slotBindings);
gpu::StatePointer state = gpu::StatePointer(new gpu::State());
@ -80,7 +83,7 @@ void RenderablePolyLineEntityItem::updateGeometry() {
if(i % 2 == 0){
uv = vec2(0.0, 1.0);
} else {
uv = vec2(1.0, 1.0);
uv = vec2(0.0, 0.0);
}
_verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_vertices.at(vertexIndex));
@ -90,9 +93,9 @@ void RenderablePolyLineEntityItem::updateGeometry() {
vertexIndex++;
if(i % 2 == 0){
uv = vec2(0.0, 0.0);
uv = vec2(1.0, 1.0);
} else {
uv = vec2(1, 1.0);
uv = vec2(1, 0);
}
_verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_vertices.at(vertexIndex));
_verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_normals.at(i));
@ -132,8 +135,9 @@ void RenderablePolyLineEntityItem::render(RenderArgs* args) {
transform.setRotation(getRotation());
batch.setModelTransform(transform);
batch.setResourceTexture(0, _texture);
batch.setPipeline(_pipeline);
batch.setResourceTexture(0, _texture);
batch.setInputFormat(_format);
batch.setInputBuffer(0, _verticesBuffer, 0, _format->getChannels().at(0)._stride);

1
libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
View file

@ -32,6 +32,7 @@ public:
static gpu::PipelinePointer _pipeline;
static gpu::Stream::FormatPointer _format;
static gpu::TexturePointer _texture;
static GLint PAINTSTROKE_GPU_SLOT;
protected:
void updateGeometry();

17
libraries/entities-renderer/src/paintStroke.slf
View file

@ -17,11 +17,10 @@
// the diffuse texture
uniform sampler2D originalTexture;
// the interpolated normal
varying vec4 interpolatedNormal;
varying vec4 modelPosition;
vec3 newNormal = normalize(interpolatedNormal.xyz);
varying vec2 varTexcoord;
float rand(vec2 point){
@ -31,13 +30,17 @@ float rand(vec2 point){
void main(void) {
vec3 newNormal = normalize(interpolatedNormal.xyz);
vec4 texel = texture2D(originalTexture, varTexcoord);
int frontCondition = 1 -int(gl_FrontFacing) * 2;
vec3 color = gl_Color.rgb;
// vec3 color = gl_Color.rgb;
packDeferredFragment(
newNormal * frontCondition,
glowIntensity * texel.a,
color * texel.rgb,
gl_FrontMaterial.specular.rgb,
gl_FrontMaterial.shininess);
glowIntensity,
texel.rgb,
//vec3(varTexcoord, 0.0),
vec3(0.01, 0.01, 0.01),
10.0);
}