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
607}607}
608 608
609void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, const glm::vec4& color) {609void 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 <<")...";
611 BatchItemDetails& details = _registeredVertices[id];611 BatchItemDetails& details = _registeredVertices[id];
612 612
613 if (details.isCreated) {613 if (details.isCreated) {
@@ -632,7 +632,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, con · 18 unmodified lines
632 details.streamFormat = streamFormat;632 details.streamFormat = streamFormat;
633 details.stream = stream;633 details.stream = stream;
634 634
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);
636 details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));636 details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
637 637
638 details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);638 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
652 int* colorData = new int[details.vertices];652 int* colorData = new int[details.vertices];
653 int* colorDataAt = colorData;653 int* colorDataAt = colorData;
654 654
655 //qDebug() << " details.vertices:" << details.vertices;
656 //qDebug() << " points.size:" << points.size();
657
655 foreach (const glm::vec2& point, points) {658 foreach (const glm::vec2& point, points) {
659 //qDebug() << " point:" << point;
656 *(vertex++) = point.x;660 *(vertex++) = point.x;
657 *(vertex++) = point.y;661 *(vertex++) = point.y;
658 662
@@ -670,7 +674,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, con · 11 unmodified lines
670}674}
671 675
672void GeometryCache::updateVertices(int id, const QVector<glm::vec3>& points, const glm::vec4& color) {676void 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 <<")...";
674 BatchItemDetails& details = _registeredVertices[id];678 BatchItemDetails& details = _registeredVertices[id];
675 679
676 if (details.isCreated) {680 if (details.isCreated) {
@@ -965,7 +969,7 @@ void GeometryCache::renderWireCube(float size, const glm::vec4& color) { · 288 unmodified lines
965}969}
966 970
967void GeometryCache::renderBevelCornersRect(int x, int y, int width, int height, int bevelDistance, const glm::vec4& color, int id) {971void 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 <<")...";
969 bool registered = (id != UNKNOWN_ID);973 bool registered = (id != UNKNOWN_ID);
970 Vec3Pair key(glm::vec3(x, y, 0.0f), glm::vec3(width, height, bevelDistance));974 Vec3Pair key(glm::vec3(x, y, 0.0f), glm::vec3(width, height, bevelDistance));
971 BatchItemDetails& details = registered ? _registeredBevelRects[id] : _bevelRects[key];975 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
1073}1077}
1074 1078
1075void GeometryCache::renderQuad(const glm::vec2& minCorner, const glm::vec2& maxCorner, const glm::vec4& color, int id) {1079void 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 <<")...";
1077 bool registered = (id != UNKNOWN_ID);1081 bool registered = (id != UNKNOWN_ID);
1078 Vec2Pair key(minCorner, maxCorner);1082 Vec2Pair key(minCorner, maxCorner);
1079 BatchItemDetails& details = registered ? _registeredQuad2D[id] : _quad2D[key];1083 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
1157 const glm::vec2& texCoordMinCorner, const glm::vec2& texCoordMaxCorner, 1161 const glm::vec2& texCoordMinCorner, const glm::vec2& texCoordMaxCorner,
1158 const glm::vec4& color, int id) {1162 const glm::vec4& color, int id) {
1159 1163
1160 qDebug() << "GeometryCache::renderQuad(vec2/texture,id=" << id <<")...";1164 //qDebug() << "GeometryCache::renderQuad(vec2/texture,id=" << id <<")...";
1161 bool registered = (id != UNKNOWN_ID);1165 bool registered = (id != UNKNOWN_ID);
1162 Vec2PairPair key(Vec2Pair(minCorner, maxCorner), Vec2Pair(texCoordMinCorner, texCoordMaxCorner));1166 Vec2PairPair key(Vec2Pair(minCorner, maxCorner), Vec2Pair(texCoordMinCorner, texCoordMaxCorner));
1163 BatchItemDetails& details = registered ? _registeredQuad2DTextures[id] : _quad2DTextures[key];1167 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
1248}1252}
1249 1253
1250void GeometryCache::renderQuad(const glm::vec3& minCorner, const glm::vec3& maxCorner, const glm::vec4& color, int id) {1254void 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 <<")...";
1252 bool registered = (id != UNKNOWN_ID);1256 bool registered = (id != UNKNOWN_ID);
1253 Vec3Pair key(minCorner, maxCorner);1257 Vec3Pair key(minCorner, maxCorner);
1254 BatchItemDetails& details = registered ? _registeredQuad3D[id] : _quad3D[key];1258 BatchItemDetails& details = registered ? _registeredQuad3D[id] : _quad3D[key];
@@ -1569,7 +1573,7 @@ void GeometryCache::BatchItemDetails::clear() { · 314 unmodified lines
1569void GeometryCache::renderLine(const glm::vec3& p1, const glm::vec3& p2, 1573void GeometryCache::renderLine(const glm::vec3& p1, const glm::vec3& p2,
1570 const glm::vec4& color1, const glm::vec4& color2, int id) {1574 const glm::vec4& color1, const glm::vec4& color2, int id) {
1571 1575
1572 qDebug() << "GeometryCache::renderLine(vec3)...";1576 //qDebug() << "GeometryCache::renderLine(vec3)...";
1573 bool registered = (id != UNKNOWN_ID);1577 bool registered = (id != UNKNOWN_ID);
1574 Vec3Pair key(p1, p2);1578 Vec3Pair key(p1, p2);
1575 1579
@@ -1662,7 +1666,7 @@ void GeometryCache::renderLine(const glm::vec3& p1, const glm::vec3& p2, · 86 unmodified lines
1662void GeometryCache::renderLine(const glm::vec2& p1, const glm::vec2& p2, 1666void GeometryCache::renderLine(const glm::vec2& p1, const glm::vec2& p2,
1663 const glm::vec4& color1, const glm::vec4& color2, int id) {1667 const glm::vec4& color1, const glm::vec4& color2, int id) {
1664 1668
1665 qDebug() << "GeometryCache::renderLine(vec2)...";1669 //qDebug() << "GeometryCache::renderLine(vec2)...";
1666 bool registered = (id != UNKNOWN_ID);1670 bool registered = (id != UNKNOWN_ID);
1667 Vec2Pair key(p1, p2);1671 Vec2Pair key(p1, p2);
1668 1672

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