AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-09-20 06:40:11 +00:00
Code Issues Releases Wiki Activity

Fix Win build

Browse Source
This commit is contained in:
manuelk 2015-02-27 15:52:12 -08:00
parent d0a624f373
commit 9e25b193ff
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/common/hud.h
View File

@ -26,9 +26,10 @@
#define HUD_H
#include <algorithm>
#include <vector>
#include <string>
#include <cstdarg>
#include <math.h>
#include <string>
#include <vector>
#include "hud.h"
@ -128,7 +129,8 @@ protected:
void SetValue(float v) {
value = std::max(std::min(v, max), min);
if (intStep) {
value = (int)value;
// MSVC 2010 does not have std::round() or roundf()
value = v>0.0f ? floor(v+0.5f) : ceil(v-0.5f);
}
}
};

8
opensubdiv/far/patchTables.cpp
View File

@ -436,7 +436,7 @@ Vtr::Array<PatchDescriptor::Type>
PatchTables::getFVarPatchTypes(int channel) {
FVarPatchChannel & c = getFVarPatchChannel(channel);
return Vtr::Array<PatchDescriptor::Type>(&c.patchTypes[0],
c.patchTypes.size());
(int)c.patchTypes.size());
}
Vtr::ConstArray<PatchDescriptor::Type>
PatchTables::GetFVarPatchTypes(int channel) const {
@ -445,18 +445,18 @@ PatchTables::GetFVarPatchTypes(int channel) const {
return Vtr::ConstArray<PatchDescriptor::Type>(&c.patchesType, 1);
} else {
return Vtr::ConstArray<PatchDescriptor::Type>(&c.patchTypes[0],
c.patchTypes.size());
(int)c.patchTypes.size());
}
}
ConstIndexArray
PatchTables::GetFVarPatchesValues(int channel) const {
FVarPatchChannel const & c = getFVarPatchChannel(channel);
return ConstIndexArray(&c.patchValues[0], c.patchValues.size());
return ConstIndexArray(&c.patchValues[0], (int)c.patchValues.size());
}
IndexArray
PatchTables::getFVarPatchesValues(int channel) {
FVarPatchChannel & c = getFVarPatchChannel(channel);
return IndexArray(&c.patchValues[0], c.patchValues.size());
return IndexArray(&c.patchValues[0], (int)c.patchValues.size());
}
PatchDescriptor::Type
PatchTables::getFVarPatchType(int channel, int patch) const {