History

rename model:: -> graphics::

humbletim committed 8 years ago

Commit b91d5361 parent 08ccda971 files · +340 −340Browse files

Showing the changes to libraries/script-engine/src/ModelScriptingInterface.cpp (1 of 71 files). Show all

Unified · Split

libraries/script-engine/src/ModelScriptingInterface.cpp+15−15
@@ -102,7 +102,7 @@ QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) { · 101 unmodified lines
102102 indexStartOffset += numVertices;
103103 }
104104
105− model::MeshPointer result(new model::Mesh());
105+ graphics::MeshPointer result(new graphics::Mesh());
106106
107107 gpu::Element vertexElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
108108 gpu::Buffer* combinedVertexBuffer = new gpu::Buffer(combinedVertexSize, combinedVertexData.get());
@@ -130,12 +130,12 @@ QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) { · 21 unmodified lines
130130 gpu::BufferView combinedIndexesBufferView(combinedIndexesBufferPointer, indexElement);
131131 result->setIndexBuffer(combinedIndexesBufferView);
132132
133− std::vector<model::Mesh::Part> parts;
134− parts.emplace_back(model::Mesh::Part((model::Index)0, // startIndex
135− (model::Index)result->getNumIndices(), // numIndices
136− (model::Index)0, // baseVertex
137− model::Mesh::TRIANGLES)); // topology
138− result->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(model::Mesh::Part),
133+ std::vector<graphics::Mesh::Part> parts;
134+ parts.emplace_back(graphics::Mesh::Part((graphics::Index)0, // startIndex
135+ (graphics::Index)result->getNumIndices(), // numIndices
136+ (graphics::Index)0, // baseVertex
137+ graphics::Mesh::TRIANGLES)); // topology
138+ result->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
139139 (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
140140
141141
@@ -153,7 +153,7 @@ QScriptValue ModelScriptingInterface::transformMesh(glm::mat4 transform, MeshPro · 11 unmodified lines
153153 }
154154
155155 const auto inverseTransposeTransform = glm::inverse(glm::transpose(transform));
156− model::MeshPointer result = mesh->map([&](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
156+ graphics::MeshPointer result = mesh->map([&](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
157157 [&](glm::vec3 color){ return color; },
158158 [&](glm::vec3 normal){ return glm::vec3(inverseTransposeTransform * glm::vec4(normal, 0.0f)); },
159159 [&](uint32_t index){ return index; });
@@ -199,7 +199,7 @@ QScriptValue ModelScriptingInterface::getVertex(MeshProxy* meshProxy, int vertex · 39 unmodified lines
199199 QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices,
200200 const QVector<glm::vec3>& normals,
201201 const QVector<MeshFace>& faces) {
202− model::MeshPointer mesh(new model::Mesh());
202+ graphics::MeshPointer mesh(new graphics::Mesh());
203203
204204 // vertices
205205 auto vertexBuffer = std::make_shared<gpu::Buffer>(vertices.size() * sizeof(glm::vec3), (gpu::Byte*)vertices.data());
@@ -236,12 +236,12 @@ QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices · 30 unmodified lines
236236 mesh->setIndexBuffer(indexBufferView);
237237
238238 // parts
239− std::vector<model::Mesh::Part> parts;
240− parts.emplace_back(model::Mesh::Part((model::Index)0, // startIndex
241− (model::Index)faces.size() * 3, // numIndices
242− (model::Index)0, // baseVertex
243− model::Mesh::TRIANGLES)); // topology
244− mesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(model::Mesh::Part),
239+ std::vector<graphics::Mesh::Part> parts;
240+ parts.emplace_back(graphics::Mesh::Part((graphics::Index)0, // startIndex
241+ (graphics::Index)faces.size() * 3, // numIndices
242+ (graphics::Index)0, // baseVertex
243+ graphics::Mesh::TRIANGLES)); // topology
244+ mesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
245245 (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
246246
247247