Skip to content

Commit fc666c1

Browse files
authored
Merge pull request #14306 from Mugen87/dev7
Examples: Relocate msgpack model data
2 parents 38076e8 + fe30aa9 commit fc666c1

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed
File renamed without changes.
File renamed without changes.

examples/webgl_loader_msgpack.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<script src='js/controls/OrbitControls.js'></script>
4040
<script src='js/Detector.js'></script>
4141
<script src='js/libs/msgpack-js.js'></script>
42-
<script src='js/libs/stats.min.js'></script>
4342
</head>
4443
<body>
4544
<div id='info'>
@@ -98,7 +97,7 @@
9897

9998
new THREE.FileLoader()
10099
.setResponseType( 'arraybuffer' )
101-
.load( 'scenes/robo_pigeon.pack', function ( data ) {
100+
.load( 'models/msgpack/robo_pigeon.pack', function ( data ) {
102101

103102
var decoded = msgpack.decode( data );
104103

@@ -112,7 +111,7 @@
112111

113112
function onWindowResize() {
114113

115-
camera.aspect = container.offsetWidth / container.offsetHeight;
114+
camera.aspect = window.innerWidth / window.innerHeight;
116115
camera.updateProjectionMatrix();
117116

118117
renderer.setSize( window.innerWidth, window.innerHeight );
@@ -124,15 +123,13 @@
124123

125124
container = document.getElementById( 'viewport' );
126125

127-
renderer = new THREE.WebGLRenderer( { antialias: true, alpha: true } );
126+
renderer = new THREE.WebGLRenderer( { antialias: true, alpha: true } );
128127
renderer.setClearColor( 0x000000, 0 );
129128
renderer.setPixelRatio( window.devicePixelRatio );
130129
renderer.setSize( window.innerWidth, window.innerHeight );
131130
container.appendChild( renderer.domElement );
132131

133-
var aspect = container.offsetWidth / container.offsetHeight;
134-
135-
camera = new THREE.PerspectiveCamera( 60, aspect, 0.01, 50 );
132+
camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 0.01, 50 );
136133
camera.position.set( 5, 5, 5 );
137134
camera.updateProjectionMatrix();
138135

0 commit comments

Comments
 (0)