configuration modes
parent
ae5d71a80a
commit
96ea8c1f6a
|
@ -14,6 +14,7 @@
|
||||||
* @param activeRenderer
|
* @param activeRenderer
|
||||||
* @param enableComposer
|
* @param enableComposer
|
||||||
* @param enableEffect
|
* @param enableEffect
|
||||||
|
* @param defaultMode
|
||||||
* @constructor
|
* @constructor
|
||||||
*/
|
*/
|
||||||
R3.API.RenderConfiguration = function (
|
R3.API.RenderConfiguration = function (
|
||||||
|
@ -30,7 +31,8 @@ R3.API.RenderConfiguration = function (
|
||||||
activeComposer,
|
activeComposer,
|
||||||
activeEffect,
|
activeEffect,
|
||||||
enableComposer,
|
enableComposer,
|
||||||
enableEffect
|
enableEffect,
|
||||||
|
defaultMode
|
||||||
) {
|
) {
|
||||||
if (R3.Utils.UndefinedOrNull(id)) {
|
if (R3.Utils.UndefinedOrNull(id)) {
|
||||||
id = R3.Utils.RandomId();
|
id = R3.Utils.RandomId();
|
||||||
|
@ -100,6 +102,11 @@ R3.API.RenderConfiguration = function (
|
||||||
}
|
}
|
||||||
this.enableEffect = enableEffect;
|
this.enableEffect = enableEffect;
|
||||||
|
|
||||||
|
if (R3.Utils.UndefinedOrNull(defaultMode)) {
|
||||||
|
defaultMode = R3.API.RenderConfiguration.DEFAULT_MODE_IN_GAME;
|
||||||
|
}
|
||||||
|
this.defaultMode = defaultMode;
|
||||||
|
|
||||||
R3.API.Component.call(
|
R3.API.Component.call(
|
||||||
this,
|
this,
|
||||||
R3.Component.RENDER_CONFIGURATION,
|
R3.Component.RENDER_CONFIGURATION,
|
||||||
|
@ -122,3 +129,6 @@ R3.API.RenderConfiguration.SCALE_MODE_NONE = 0x1;
|
||||||
R3.API.RenderConfiguration.SCALE_MODE_LETTERBOX = 0x2;
|
R3.API.RenderConfiguration.SCALE_MODE_LETTERBOX = 0x2;
|
||||||
R3.API.RenderConfiguration.SCALE_MODE_ZOOM_TO_BIGGER = 0x3;
|
R3.API.RenderConfiguration.SCALE_MODE_ZOOM_TO_BIGGER = 0x3;
|
||||||
R3.API.RenderConfiguration.SCALE_MODE_NON_UNIFORM = 0x4;
|
R3.API.RenderConfiguration.SCALE_MODE_NON_UNIFORM = 0x4;
|
||||||
|
|
||||||
|
R3.API.RenderConfiguration.DEFAULT_MODE_IN_GAME = 0x1;
|
||||||
|
R3.API.RenderConfiguration.DEFAULT_MODE_EDIT = 0x2;
|
||||||
|
|
15
src/r3-ar.js
15
src/r3-ar.js
|
@ -152,6 +152,19 @@ R3.AR.prototype.createInstance = function() {
|
||||||
|
|
||||||
arComponent.camera.instance.projectionMatrix.copy(projectionMatrix);
|
arComponent.camera.instance.projectionMatrix.copy(projectionMatrix);
|
||||||
|
|
||||||
|
arComponent.camera.updateFromInstance();
|
||||||
|
|
||||||
|
arComponent.camera.instance.fov = arComponent.camera.fov;
|
||||||
|
arComponent.camera.instance.near = arComponent.camera.near;
|
||||||
|
arComponent.camera.instance.far = arComponent.camera.far;
|
||||||
|
arComponent.camera.instance.filmGauge = arComponent.camera.filmGauge;
|
||||||
|
arComponent.camera.instance.filmOffset = arComponent.camera.filmOffset;
|
||||||
|
arComponent.camera.instance.focus = arComponent.camera.focus;
|
||||||
|
arComponent.camera.instance.zoom = arComponent.camera.zoom;
|
||||||
|
arComponent.camera.instance.aspect = arComponent.camera.aspect;
|
||||||
|
arComponent.camera.instance.updateProjectionMatrix();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -219,6 +232,8 @@ R3.AR.prototype.createInstance = function() {
|
||||||
|
|
||||||
this.videoScene.camera = this.videoCamera;
|
this.videoScene.camera = this.videoCamera;
|
||||||
|
|
||||||
|
arScene.videoScene.children[0].material.map.flipY = true;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Also update the video texture before render
|
* Also update the video texture before render
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -31,7 +31,8 @@ R3.RenderConfiguration = function (
|
||||||
apiRenderConfiguration.activeComposer,
|
apiRenderConfiguration.activeComposer,
|
||||||
apiRenderConfiguration.activeEffect,
|
apiRenderConfiguration.activeEffect,
|
||||||
apiRenderConfiguration.enableComposer,
|
apiRenderConfiguration.enableComposer,
|
||||||
apiRenderConfiguration.enableEffect
|
apiRenderConfiguration.enableEffect,
|
||||||
|
apiRenderConfiguration.defaultMode
|
||||||
);
|
);
|
||||||
|
|
||||||
this.logicalSize = new R3.Vector2(
|
this.logicalSize = new R3.Vector2(
|
||||||
|
@ -226,6 +227,15 @@ R3.RenderConfiguration.prototype.updateInstance = function(property) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
property === 'defaultMode'
|
||||||
|
) {
|
||||||
|
console.log('todo: defaultMode change');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
R3.Component.prototype.updateInstance.call(this, property);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -252,7 +262,8 @@ R3.RenderConfiguration.prototype.toApiObject = function() {
|
||||||
R3.Utils.IdOrNull(this.activeComposer),
|
R3.Utils.IdOrNull(this.activeComposer),
|
||||||
R3.Utils.IdOrNull(this.activeEffect),
|
R3.Utils.IdOrNull(this.activeEffect),
|
||||||
this.enableComposer,
|
this.enableComposer,
|
||||||
this.enableEffect
|
this.enableEffect,
|
||||||
|
this.defaultMode
|
||||||
);
|
);
|
||||||
|
|
||||||
return apiRenderConfiguration;
|
return apiRenderConfiguration;
|
||||||
|
|
|
@ -940,6 +940,17 @@ R3.System.GUI.prototype.buildControl = function(folder, componentTemplate, prope
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
} else if (property === 'defaultMode') {
|
||||||
|
controllers.push(
|
||||||
|
folder.add(
|
||||||
|
object,
|
||||||
|
property,
|
||||||
|
{
|
||||||
|
'in game' : R3.API.RenderConfiguration.DEFAULT_MODE_IN_GAME,
|
||||||
|
'edit' : R3.API.RenderConfiguration.DEFAULT_MODE_EDIT
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
} else if (property === 'aspectRatioMode') {
|
} else if (property === 'aspectRatioMode') {
|
||||||
controllers.push(
|
controllers.push(
|
||||||
folder.add(
|
folder.add(
|
||||||
|
|
Loading…
Reference in New Issue