mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 04:53:25 +02:00
more warnings fixes
This commit is contained in:
parent
6f7e13b3c1
commit
e99ad75a28
3 changed files with 12 additions and 2 deletions
|
@ -425,6 +425,7 @@ bool ConnexionClient::InitializeRawInput(HWND hwndTarget) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FIXME - http://www.codeproject.com/Articles/678606/Part-Overcoming-Windows-s-deprecation-of-GetVe
|
||||||
// Get OS version.
|
// Get OS version.
|
||||||
OSVERSIONINFO osvi = { sizeof(OSVERSIONINFO), 0 };
|
OSVERSIONINFO osvi = { sizeof(OSVERSIONINFO), 0 };
|
||||||
::GetVersionEx(&osvi);
|
::GetVersionEx(&osvi);
|
||||||
|
|
|
@ -934,8 +934,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
|
||||||
_textureContent.insert(filename, content);
|
_textureContent.insert(filename, content);
|
||||||
}
|
}
|
||||||
} else if (object.name == "Material") {
|
} else if (object.name == "Material") {
|
||||||
FBXMaterial material = { glm::vec3(1.0f, 1.0f, 1.0f), glm::vec3(1.0f, 1.0f, 1.0f), glm::vec3(),
|
FBXMaterial material(glm::vec3(1.0f, 1.0f, 1.0f), glm::vec3(1.0f), glm::vec3(), glm::vec2(0.f, 1.0f), 96.0f, 1.0f);
|
||||||
glm::vec2(0.f, 1.0f), 96.0f, 1.0f, QString(""), nullptr };
|
|
||||||
foreach (const FBXNode& subobject, object.children) {
|
foreach (const FBXNode& subobject, object.children) {
|
||||||
bool properties = false;
|
bool properties = false;
|
||||||
QByteArray propertyName;
|
QByteArray propertyName;
|
||||||
|
|
|
@ -136,6 +136,16 @@ public:
|
||||||
|
|
||||||
class FBXMaterial {
|
class FBXMaterial {
|
||||||
public:
|
public:
|
||||||
|
FBXMaterial() {};
|
||||||
|
FBXMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
|
||||||
|
const glm::vec2& emissiveParams, float shininess, float opacity) :
|
||||||
|
diffuseColor(diffuseColor),
|
||||||
|
specularColor(specularColor),
|
||||||
|
emissiveColor(emissiveColor),
|
||||||
|
emissiveParams(emissiveParams),
|
||||||
|
shininess(shininess),
|
||||||
|
opacity(opacity) {}
|
||||||
|
|
||||||
glm::vec3 diffuseColor;
|
glm::vec3 diffuseColor;
|
||||||
glm::vec3 specularColor;
|
glm::vec3 specularColor;
|
||||||
glm::vec3 emissiveColor;
|
glm::vec3 emissiveColor;
|
||||||
|
|
Loading…
Reference in a new issue