Skip to content

Commit

Permalink
New: added support for compressed (DDS) textures to 3D preview (#244)
Browse files Browse the repository at this point in the history
This change adds support for downloading and using compressed textures (DDS files) in 3D preview, reducing the amount of GPU memory needed for textures, and improving 3D preview performance.
  • Loading branch information
ikerr authored Jul 25, 2017
1 parent 3960927 commit 4b5e203
Show file tree
Hide file tree
Showing 31 changed files with 11,270 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const webpackConfig = require('./webpack.karma.config');

const DOC_STATIC_ASSETS_VERSION = '0.130.0';
const MEDIA_STATIC_ASSETS_VERSION = '0.127.0';
const MODEL3D_STATIC_ASSETS_VERSION = '0.125.0';
const MODEL3D_STATIC_ASSETS_VERSION = '1.1.1';
const SWF_STATIC_ASSETS_VERSION = '0.112.0';
const TEXT_STATIC_ASSETS_VERSION = '0.114.0';

Expand Down
2 changes: 1 addition & 1 deletion src/lib/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const X_REP_HINT_VIDEO_MP4 = '[mp4]';
// whenever a file in that third party directory is updated
export const DOC_STATIC_ASSETS_VERSION = '0.130.0';
export const MEDIA_STATIC_ASSETS_VERSION = '0.127.0';
export const MODEL3D_STATIC_ASSETS_VERSION = '0.125.0';
export const MODEL3D_STATIC_ASSETS_VERSION = '1.1.1';
export const SWF_STATIC_ASSETS_VERSION = '0.112.0';
export const TEXT_STATIC_ASSETS_VERSION = '0.114.0';

Expand Down
49 changes: 49 additions & 0 deletions src/third-party/model3d/1.1.1/WebVR/VRConfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
window.WebVRConfig = {
// Forces availability of VR mode, even for non-mobile devices.
FORCE_ENABLE_VR: false,

// Complementary filter coefficient. 0 for accelerometer, 1 for gyro.
K_FILTER: 0.98,

// How far into the future to predict during fast motion (in seconds).
PREDICTION_TIME_S: 0.040,

// Flag to disable touch panner. In case you have your own touch controls.
TOUCH_PANNER_DISABLED: false,

// Flag to disabled the UI in VR Mode.
CARDBOARD_UI_DISABLED: false, // Default: false

// Flag to disable the instructions to rotate your device.
ROTATE_INSTRUCTIONS_DISABLED: false, // Default: false.

// Enable yaw panning only, disabling roll and pitch. This can be useful
// for panoramas with nothing interesting above or below.
YAW_ONLY: false,

// To disable keyboard and mouse controls, if you want to use your own
// implementation.
MOUSE_KEYBOARD_CONTROLS_DISABLED: true,

// Prevent the polyfill from initializing immediately. Requires the app
// to call InitializeWebVRPolyfill() before it can be used.
DEFER_INITIALIZATION: false,

// Enable the deprecated version of the API (navigator.getVRDevices).
ENABLE_DEPRECATED_API: false,

// Scales the recommended buffer size reported by WebVR, which can improve
// performance.
// UPDATE(2016-05-03): Setting this to 0.5 by default since 1.0 does not
// perform well on many mobile devices.
BUFFER_SCALE: 0.5,

// Allow VRDisplay.submitFrame to change gl bindings, which is more
// efficient if the application code will re-bind its resources on the
// next frame anyway. This has been seen to cause rendering glitches with
// THREE.js.
// Dirty bindings include: gl.FRAMEBUFFER_BINDING, gl.CURRENT_PROGRAM,
// gl.ARRAY_BUFFER_BINDING, gl.ELEMENT_ARRAY_BUFFER_BINDING,
// and gl.TEXTURE_BINDING_2D for texture unit 0.
DIRTY_SUBMIT_FRAME_BINDINGS: false
};
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4b5e203

Please sign in to comment.