Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 01:40:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix warnings that were bugging Xcode

Browse source
This commit is contained in:
Stephen Birarda 2014-10-28 15:39:25 -07:00
parent 33c247918e
commit 6ba0845767
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Menu.cpp
View file

@ -1266,7 +1266,6 @@ void Menu::changeVSync() {
} }
void Menu::changeRenderTargetFramerate(QAction* action) { void Menu::changeRenderTargetFramerate(QAction* action) {
bool vsynOn = Application::getInstance()->isVSyncOn(); bool vsynOn = Application::getInstance()->isVSyncOn();
unsigned int framerate = Application::getInstance()->getRenderTargetFramerate();
QString text = action->text(); QString text = action->text();
if (text == MenuOption::RenderTargetFramerateUnlimited) { if (text == MenuOption::RenderTargetFramerateUnlimited) {

2
interface/src/gpu/Batch.cpp
View file

@ -111,6 +111,8 @@ void Batch::runCommand(Command com, uint32 offset) {
CASE_COMMAND(glColor4f); CASE_COMMAND(glColor4f);
CASE_COMMAND(glMaterialf); CASE_COMMAND(glMaterialf);
CASE_COMMAND(glMaterialfv); CASE_COMMAND(glMaterialfv);
default:
break;
} }
} }

3
interface/src/renderer/Model.cpp
View file

@ -1737,7 +1737,8 @@ int Model::renderMeshes(gpu::Batch& batch, RenderMode mode, bool translucent, fl
mesh.texCoords.size() * sizeof(glm::vec2) + mesh.texCoords.size() * sizeof(glm::vec2) +
(mesh.blendshapes.isEmpty() ? vertexCount * 2 * sizeof(glm::vec3) : 0); (mesh.blendshapes.isEmpty() ? vertexCount * 2 * sizeof(glm::vec3) : 0);
//skinProgram->setAttributeBuffer(skinLocations->clusterIndices, GL_FLOAT, offset, 4); //skinProgram->setAttributeBuffer(skinLocations->clusterIndices, GL_FLOAT, offset, 4);
GLBATCH(glVertexAttribPointer)(skinLocations->clusterIndices, 4, GL_FLOAT, GL_TRUE, 0, (const void*) offset); GLBATCH(glVertexAttribPointer)(skinLocations->clusterIndices, 4, GL_FLOAT, GL_TRUE, 0,
reinterpret_cast<const void*>(offset));
//skinProgram->setAttributeBuffer(skinLocations->clusterWeights, GL_FLOAT, //skinProgram->setAttributeBuffer(skinLocations->clusterWeights, GL_FLOAT,
// offset + vertexCount * sizeof(glm::vec4), 4); // offset + vertexCount * sizeof(glm::vec4), 4);
GLBATCH(glVertexAttribPointer)(skinLocations->clusterWeights, 4, GL_FLOAT, GL_TRUE, 0, (const void*) (offset + vertexCount * sizeof(glm::vec4))); GLBATCH(glVertexAttribPointer)(skinLocations->clusterWeights, 4, GL_FLOAT, GL_TRUE, 0, (const void*) (offset + vertexCount * sizeof(glm::vec4)));