Skip to content

Hmmmmm.... #2509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2017
Merged

Hmmmmm.... #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Tools/babylon.dds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@
dataLength = width * height * 4;
var floatArray: ArrayBufferView;

if (engine.badOS || (!engine.getCaps().textureHalfFloat && !engine.getCaps().textureFloat)) { // Required because iOS has many issues with float and half float generation
if (engine.badOS || engine.badDesktopOS || (!engine.getCaps().textureHalfFloat && !engine.getCaps().textureFloat)) { // Required because iOS has many issues with float and half float generation
if (bpp === 128) {
floatArray = DDSTools._GetFloatAsUIntRGBAArrayBuffer(width, height, dataOffset, dataLength, arrayBuffer, i);
}
Expand All @@ -476,7 +476,7 @@
else {
if (bpp === 128) {
floatArray = DDSTools._GetFloatRGBAArrayBuffer(width, height, dataOffset, dataLength, arrayBuffer, i);
} else if (bpp === 64 && (!engine.getCaps().textureHalfFloat || engine.badDesktopOS)) { // Let's fallback to full float if not half float or false report of it...
} else if (bpp === 64 && !engine.getCaps().textureHalfFloat) {
floatArray = DDSTools._GetHalfFloatAsFloatRGBAArrayBuffer(width, height, dataOffset, dataLength, arrayBuffer, i);

info.textureType = Engine.TEXTURETYPE_FLOAT;
Expand Down
2 changes: 1 addition & 1 deletion src/babylon.engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@
this._badOS = regexpBadOs.test(navigator.userAgent);

//Detect if we are running on a faulty buggy OS.
var regexpBadDesktopOS = /AppleWebKit.*10.[\d] /
var regexpBadDesktopOS = /AppleWebKit.*10.[\d]/
//ua sniffing is the tool of the devil.
this._badDesktopOS = regexpBadDesktopOS.test(navigator.userAgent);

Expand Down