History

removed some debug, fixed a type mismatch for vec2 vs vec3

ZappoMan committed 11 years ago

Commit ef82aac1 parent 283ab6d1 file · +13 −9Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 1 file). Show all

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+13−9
@@ -607,7 +607,7 @@ void GeometryCache::renderGrid(int x, int y, int width, int height, int rows, in · 606 unmodified lines
607607 }
608608
609609 void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, const glm::vec4& color) {
610− qDebug() << "GeometryCache::updateVertices(id=" << id <<")...";
610+ qDebug() << "GeometryCache::updateVertices(vec2.... id=" << id <<")...";
611611 BatchItemDetails& details = _registeredVertices[id];
612612
613613 if (details.isCreated) {
@@ -632,7 +632,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, con · 18 unmodified lines
632632 details.streamFormat = streamFormat;
633633 details.stream = stream;
634634
635− details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::POS_XYZ), 0);
635+ details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::POS_XYZ), 0);
636636 details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
637637
638638 details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
@@ -652,7 +652,11 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, con · 13 unmodified lines
652652 int* colorData = new int[details.vertices];
653653 int* colorDataAt = colorData;
654654
655+ //qDebug() << " details.vertices:" << details.vertices;
656+ //qDebug() << " points.size:" << points.size();
657+
655658 foreach (const glm::vec2& point, points) {
659+ //qDebug() << " point:" << point;
656660 *(vertex++) = point.x;
657661 *(vertex++) = point.y;
658662
@@ -670,7 +674,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, con · 11 unmodified lines
670674 }
671675
672676 void GeometryCache::updateVertices(int id, const QVector<glm::vec3>& points, const glm::vec4& color) {
673− qDebug() << "GeometryCache::updateVertices(id=" << id <<")...";
677+ //qDebug() << "GeometryCache::updateVertices(id=" << id <<")...";
674678 BatchItemDetails& details = _registeredVertices[id];
675679
676680 if (details.isCreated) {
@@ -965,7 +969,7 @@ void GeometryCache::renderWireCube(float size, const glm::vec4& color) { · 288 unmodified lines
965969 }
966970
967971 void GeometryCache::renderBevelCornersRect(int x, int y, int width, int height, int bevelDistance, const glm::vec4& color, int id) {
968− qDebug() << "GeometryCache::renderBevelCornersRect(id=" << id <<")...";
972+ //qDebug() << "GeometryCache::renderBevelCornersRect(id=" << id <<")...";
969973 bool registered = (id != UNKNOWN_ID);
970974 Vec3Pair key(glm::vec3(x, y, 0.0f), glm::vec3(width, height, bevelDistance));
971975 BatchItemDetails& details = registered ? _registeredBevelRects[id] : _bevelRects[key];
@@ -1073,7 +1077,7 @@ void GeometryCache::renderBevelCornersRect(int x, int y, int width, int height, · 101 unmodified lines
10731077 }
10741078
10751079 void GeometryCache::renderQuad(const glm::vec2& minCorner, const glm::vec2& maxCorner, const glm::vec4& color, int id) {
1076− qDebug() << "GeometryCache::renderQuad(vec2,id=" << id <<")...";
1080+ //qDebug() << "GeometryCache::renderQuad(vec2,id=" << id <<")...";
10771081 bool registered = (id != UNKNOWN_ID);
10781082 Vec2Pair key(minCorner, maxCorner);
10791083 BatchItemDetails& details = registered ? _registeredQuad2D[id] : _quad2D[key];
@@ -1157,7 +1161,7 @@ void GeometryCache::renderQuad(const glm::vec2& minCorner, const glm::vec2& maxC · 77 unmodified lines
11571161 const glm::vec2& texCoordMinCorner, const glm::vec2& texCoordMaxCorner,
11581162 const glm::vec4& color, int id) {
11591163
1160− qDebug() << "GeometryCache::renderQuad(vec2/texture,id=" << id <<")...";
1164+ //qDebug() << "GeometryCache::renderQuad(vec2/texture,id=" << id <<")...";
11611165 bool registered = (id != UNKNOWN_ID);
11621166 Vec2PairPair key(Vec2Pair(minCorner, maxCorner), Vec2Pair(texCoordMinCorner, texCoordMaxCorner));
11631167 BatchItemDetails& details = registered ? _registeredQuad2DTextures[id] : _quad2DTextures[key];
@@ -1248,7 +1252,7 @@ void GeometryCache::renderQuad(const glm::vec2& minCorner, const glm::vec2& maxC · 84 unmodified lines
12481252 }
12491253
12501254 void GeometryCache::renderQuad(const glm::vec3& minCorner, const glm::vec3& maxCorner, const glm::vec4& color, int id) {
1251− qDebug() << "GeometryCache::renderQuad(vec3,id=" << id <<")...";
1255+ //qDebug() << "GeometryCache::renderQuad(vec3,id=" << id <<")...";
12521256 bool registered = (id != UNKNOWN_ID);
12531257 Vec3Pair key(minCorner, maxCorner);
12541258 BatchItemDetails& details = registered ? _registeredQuad3D[id] : _quad3D[key];
@@ -1569,7 +1573,7 @@ void GeometryCache::BatchItemDetails::clear() { · 314 unmodified lines
15691573 void GeometryCache::renderLine(const glm::vec3& p1, const glm::vec3& p2,
15701574 const glm::vec4& color1, const glm::vec4& color2, int id) {
15711575
1572− qDebug() << "GeometryCache::renderLine(vec3)...";
1576+ //qDebug() << "GeometryCache::renderLine(vec3)...";
15731577 bool registered = (id != UNKNOWN_ID);
15741578 Vec3Pair key(p1, p2);
15751579
@@ -1662,7 +1666,7 @@ void GeometryCache::renderLine(const glm::vec3& p1, const glm::vec3& p2, · 86 unmodified lines
16621666 void GeometryCache::renderLine(const glm::vec2& p1, const glm::vec2& p2,
16631667 const glm::vec4& color1, const glm::vec4& color2, int id) {
16641668
1665− qDebug() << "GeometryCache::renderLine(vec2)...";
1669+ //qDebug() << "GeometryCache::renderLine(vec2)...";
16661670 bool registered = (id != UNKNOWN_ID);
16671671 Vec2Pair key(p1, p2);
16681672

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t