ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

ObjImporter: fix compilation on Android.

pull/55/merge
Vladimír Vondruš 12 years ago
parent
ee21b75b15
commit
87c411f841
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/MagnumPlugins/ObjImporter/ObjImporter.cpp

14
src/MagnumPlugins/ObjImporter/ObjImporter.cpp
Unescape View File

@ -38,7 +38,7 @@
#include "Magnum/Math/Vector3.h" #include "Magnum/Math/Vector3.h"
#include "Magnum/Trade/MeshData3D.h" #include "Magnum/Trade/MeshData3D.h"
#ifdef CORRADE_TARGET_NACL_NEWLIB #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID)
#include <sstream> #include <sstream>
#endif #endif
@ -66,12 +66,12 @@ template<std::size_t size> Math::Vector<size, Float> extractFloatData(std::strin
Math::Vector<size, Float> output; Math::Vector<size, Float> output;
#ifdef CORRADE_TARGET_NACL_NEWLIB #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID)
std::istringstream in; std::istringstream in;
#endif #endif
for(std::size_t i = 0; i != size; ++i) { for(std::size_t i = 0; i != size; ++i) {
#ifndef CORRADE_TARGET_NACL_NEWLIB #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
output[i] = std::stof(data[i]); output[i] = std::stof(data[i]);
#else #else
in.str(data[i]); in.str(data[i]);
@ -80,7 +80,7 @@ template<std::size_t size> Math::Vector<size, Float> extractFloatData(std::strin
} }
if(data.size() == size+1) { if(data.size() == size+1) {
#ifndef CORRADE_TARGET_NACL_NEWLIB #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
*extra = std::stof(data.back()); *extra = std::stof(data.back());
#else #else
in.str(data.back()); in.str(data.back());
@ -369,7 +369,7 @@ std::optional<MeshData3D> ObjImporter::doMesh3D(UnsignedInt id) {
} }
/* Position indices */ /* Position indices */
#ifndef CORRADE_TARGET_NACL_NEWLIB #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
positionIndices.push_back(std::stoul(indices[0]) - positionIndexOffset); positionIndices.push_back(std::stoul(indices[0]) - positionIndexOffset);
#else #else
std::istringstream in(indices[0]); std::istringstream in(indices[0]);
@ -380,7 +380,7 @@ std::optional<MeshData3D> ObjImporter::doMesh3D(UnsignedInt id) {
/* Texture coordinates */ /* Texture coordinates */
if(indices.size() == 2 || (indices.size() == 3 && !indices[1].empty())) { if(indices.size() == 2 || (indices.size() == 3 && !indices[1].empty())) {
#ifndef CORRADE_TARGET_NACL_NEWLIB #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
textureCoordinateIndices.push_back(std::stoul(indices[1]) - textureCoordinateIndexOffset); textureCoordinateIndices.push_back(std::stoul(indices[1]) - textureCoordinateIndexOffset);
#else #else
in.str(indices[1]); in.str(indices[1]);
@ -391,7 +391,7 @@ std::optional<MeshData3D> ObjImporter::doMesh3D(UnsignedInt id) {
/* Normal indices */ /* Normal indices */
if(indices.size() == 3) { if(indices.size() == 3) {
#ifndef CORRADE_TARGET_NACL_NEWLIB #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
normalIndices.push_back(std::stoul(indices[2]) - normalIndexOffset); normalIndices.push_back(std::stoul(indices[2]) - normalIndexOffset);
#else #else
in.str(indices[2]); in.str(indices[2]);

Write Preview
Loading…
Cancel
Save