Skip to content

Commit a543c81

Browse files
authored
Merge pull request #21321 from yomotsu/feature/remove-old-css-prefixes
CSS3DRenderer | CSS2DRenderer: Remove old css prefixes
2 parents 6200d5d + 39fc61d commit a543c81

File tree

4 files changed

+4
-42
lines changed

4 files changed

+4
-42
lines changed

examples/js/renderers/CSS2DRenderer.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,8 @@ THREE.CSS2DRenderer = function () {
9292
vector.applyMatrix4( viewProjectionMatrix );
9393

9494
var element = object.element;
95-
var style = 'translate(-50%,-50%) translate(' + ( vector.x * _widthHalf + _widthHalf ) + 'px,' + ( - vector.y * _heightHalf + _heightHalf ) + 'px)';
96-
97-
element.style.WebkitTransform = style;
98-
element.style.MozTransform = style;
99-
element.style.oTransform = style;
100-
element.style.transform = style;
10195

96+
element.style.transform = 'translate(-50%,-50%) translate(' + ( vector.x * _widthHalf + _widthHalf ) + 'px,' + ( - vector.y * _heightHalf + _heightHalf ) + 'px)';
10297
element.style.display = ( object.visible && vector.z >= - 1 && vector.z <= 1 ) ? '' : 'none';
10398

10499
var objectData = {

examples/js/renderers/CSS3DRenderer.js

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ THREE.CSS3DRenderer = function () {
7474

7575
var cameraElement = document.createElement( 'div' );
7676

77-
cameraElement.style.WebkitTransformStyle = 'preserve-3d';
7877
cameraElement.style.transformStyle = 'preserve-3d';
7978
cameraElement.style.pointerEvents = 'none';
8079

@@ -196,7 +195,6 @@ THREE.CSS3DRenderer = function () {
196195

197196
if ( cachedObject === undefined || cachedObject.style !== style ) {
198197

199-
element.style.WebkitTransform = style;
200198
element.style.transform = style;
201199

202200
var objectData = { style: style };
@@ -230,18 +228,7 @@ THREE.CSS3DRenderer = function () {
230228

231229
if ( cache.camera.fov !== fov ) {
232230

233-
if ( camera.isPerspectiveCamera ) {
234-
235-
domElement.style.WebkitPerspective = fov + 'px';
236-
domElement.style.perspective = fov + 'px';
237-
238-
} else {
239-
240-
domElement.style.WebkitPerspective = '';
241-
domElement.style.perspective = '';
242-
243-
}
244-
231+
domElement.style.perspective = camera.isPerspectiveCamera ? fov + 'px' : '';
245232
cache.camera.fov = fov;
246233

247234
}
@@ -265,7 +252,6 @@ THREE.CSS3DRenderer = function () {
265252

266253
if ( cache.camera.style !== style ) {
267254

268-
cameraElement.style.WebkitTransform = style;
269255
cameraElement.style.transform = style;
270256

271257
cache.camera.style = style;

examples/jsm/renderers/CSS2DRenderer.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,8 @@ var CSS2DRenderer = function () {
9898
vector.applyMatrix4( viewProjectionMatrix );
9999

100100
var element = object.element;
101-
var style = 'translate(-50%,-50%) translate(' + ( vector.x * _widthHalf + _widthHalf ) + 'px,' + ( - vector.y * _heightHalf + _heightHalf ) + 'px)';
102-
103-
element.style.WebkitTransform = style;
104-
element.style.MozTransform = style;
105-
element.style.oTransform = style;
106-
element.style.transform = style;
107101

102+
element.style.transform = 'translate(-50%,-50%) translate(' + ( vector.x * _widthHalf + _widthHalf ) + 'px,' + ( - vector.y * _heightHalf + _heightHalf ) + 'px)';
108103
element.style.display = ( object.visible && vector.z >= - 1 && vector.z <= 1 ) ? '' : 'none';
109104

110105
var objectData = {

examples/jsm/renderers/CSS3DRenderer.js

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ var CSS3DRenderer = function () {
7979

8080
var cameraElement = document.createElement( 'div' );
8181

82-
cameraElement.style.WebkitTransformStyle = 'preserve-3d';
8382
cameraElement.style.transformStyle = 'preserve-3d';
8483
cameraElement.style.pointerEvents = 'none';
8584

@@ -201,7 +200,6 @@ var CSS3DRenderer = function () {
201200

202201
if ( cachedObject === undefined || cachedObject.style !== style ) {
203202

204-
element.style.WebkitTransform = style;
205203
element.style.transform = style;
206204

207205
var objectData = { style: style };
@@ -235,18 +233,7 @@ var CSS3DRenderer = function () {
235233

236234
if ( cache.camera.fov !== fov ) {
237235

238-
if ( camera.isPerspectiveCamera ) {
239-
240-
domElement.style.WebkitPerspective = fov + 'px';
241-
domElement.style.perspective = fov + 'px';
242-
243-
} else {
244-
245-
domElement.style.WebkitPerspective = '';
246-
domElement.style.perspective = '';
247-
248-
}
249-
236+
domElement.style.perspective = camera.isPerspectiveCamera ? fov + 'px' : '';
250237
cache.camera.fov = fov;
251238

252239
}
@@ -270,7 +257,6 @@ var CSS3DRenderer = function () {
270257

271258
if ( cache.camera.style !== style ) {
272259

273-
cameraElement.style.WebkitTransform = style;
274260
cameraElement.style.transform = style;
275261

276262
cache.camera.style = style;

0 commit comments

Comments
 (0)