History

hack a separate emissive information in the g-buffer

Sam Gateau committed 11 years ago

Commit 77077f41 parent cb1850e6 files · +58 −37Browse files

Showing the changes to interface/src/renderer/GeometryCache.cpp (1 of 6 files). Show all

Unified · Split

interface/src/renderer/GeometryCache.cpp+9−2
@@ -829,10 +829,17 @@ void GeometryReader::run() { · 828 unmodified lines
829829 return;
830830 }
831831 try {
832− QMetaObject::invokeMethod(geometry.data(), "setGeometry", Q_ARG(const FBXGeometry&,
832+ std::string urlname = _url.path().toLower().toStdString();
833+ FBXGeometry fbxgeo;
834+ if (_url.path().toLower().endsWith(".svo")) {
835+ fbxgeo = readSVO(_reply->readAll());
836+ } else {
837+ fbxgeo = readFBX(_reply->readAll(), _mapping);
838+ }
839+ QMetaObject::invokeMethod(geometry.data(), "setGeometry", Q_ARG(const FBXGeometry&, fbxgeo));
833840
834841
835− _url.path().toLower().endsWith(".svo") ? readSVO(_reply->readAll()) : readFBX(_reply->readAll(), _mapping)));
842+ // _url.path().toLower().endsWith(".svo") ? readSVO(_reply->readAll()) : readFBX(_reply->readAll(), _mapping)));
836843
837844 } catch (const QString& error) {
838845 qDebug() << "Error reading " << _url << ": " << error;