Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 21:17:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bring GeometryCache render*Instance up to standard

Browse source
This commit is contained in:
Zach Pomerantz 2016-02-08 13:28:14 -08:00
parent d9132f3973
commit 1d2acbe47e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/render-utils/src/GeometryCache.h
View file

@ -166,28 +166,28 @@ public:
const render::ShapePipelinePointer& pipeline = _simplePipeline); const render::ShapePipelinePointer& pipeline = _simplePipeline);
void renderSolidSphereInstance(gpu::Batch& batch, const glm::vec3& color, void renderSolidSphereInstance(gpu::Batch& batch, const glm::vec3& color,
const render::ShapePipelinePointer& pipeline = _simplePipeline) { const render::ShapePipelinePointer& pipeline = _simplePipeline) {
renderSolidSphereInstance(batch, glm::vec4(color, 1.0), pipeline); renderSolidSphereInstance(batch, glm::vec4(color, 1.0f), pipeline);
} }
void renderWireSphereInstance(gpu::Batch& batch, const glm::vec4& color, void renderWireSphereInstance(gpu::Batch& batch, const glm::vec4& color,
const render::ShapePipelinePointer& pipeline = _simplePipeline); const render::ShapePipelinePointer& pipeline = _simplePipeline);
void renderWireSphereInstance(gpu::Batch& batch, const glm::vec3& color, void renderWireSphereInstance(gpu::Batch& batch, const glm::vec3& color,
const render::ShapePipelinePointer& pipeline = _simplePipeline) { const render::ShapePipelinePointer& pipeline = _simplePipeline) {
renderWireSphereInstance(batch, glm::vec4(color, 1.0), pipeline); renderWireSphereInstance(batch, glm::vec4(color, 1.0f), pipeline);
} }
void renderSolidCubeInstance(gpu::Batch& batch, const glm::vec4& color, void renderSolidCubeInstance(gpu::Batch& batch, const glm::vec4& color,
const render::ShapePipelinePointer& pipeline = _simplePipeline); const render::ShapePipelinePointer& pipeline = _simplePipeline);
void renderSolidCubeInstance(gpu::Batch& batch, const glm::vec3& color, void renderSolidCubeInstance(gpu::Batch& batch, const glm::vec3& color,
const render::ShapePipelinePointer& pipeline = _simplePipeline) { const render::ShapePipelinePointer& pipeline = _simplePipeline) {
renderSolidCubeInstance(batch, glm::vec4(color, 1.0), pipeline); renderSolidCubeInstance(batch, glm::vec4(color, 1.0f), pipeline);
} }
void renderWireCubeInstance(gpu::Batch& batch, const glm::vec4& color, void renderWireCubeInstance(gpu::Batch& batch, const glm::vec4& color,
const render::ShapePipelinePointer& pipeline = _simplePipeline); const render::ShapePipelinePointer& pipeline = _simplePipeline);
void renderWireCubeInstance(gpu::Batch& batch, const glm::vec3& color, void renderWireCubeInstance(gpu::Batch& batch, const glm::vec3& color,
const render::ShapePipelinePointer& pipeline = _simplePipeline) { const render::ShapePipelinePointer& pipeline = _simplePipeline) {
renderWireCubeInstance(batch, glm::vec4(color, 1.0), pipeline); renderWireCubeInstance(batch, glm::vec4(color, 1.0f), pipeline);
} }
// Dynamic geometry // Dynamic geometry