Skip to content

Examples: Removed usage of JSONLoader in misc_fps.html #15127

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 3 commits into from
Oct 24, 2018
Merged

Examples: Removed usage of JSONLoader in misc_fps.html #15127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74df0ce
Examples: Removed usage of JSONLoader in misc_fps.html
Mugen87 Oct 24, 2018
a563fd9
Examples: Restore platform.jpg
Mugen87 Oct 24, 2018
31153bc
Examples: Clean up
Mugen87 Oct 24, 2018
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
21 changes: 4 additions & 17 deletions examples/misc_fps.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,22 +262,12 @@

// init 3D stuff

function makePlatform( jsonUrl, textureUrl, textureQuality ) {
function makePlatform( url ) {

var placeholder = new THREE.Object3D();

var texture = new THREE.TextureLoader().load( textureUrl );
texture.minFilter = THREE.LinearFilter;
texture.anisotropy = textureQuality;

var loader = new THREE.JSONLoader();
loader.load( jsonUrl, function ( geometry ) {

geometry.computeFaceNormals();

var platform = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { map: texture } ) );

platform.name = "platform";
var loader = new THREE.ObjectLoader();
loader.load( url, function ( platform ) {

placeholder.add( platform );

Expand Down Expand Up @@ -308,12 +298,9 @@
scene.background = envMap;

scene.add( makePlatform(
'models/platform/platform.json',
'models/platform/platform.jpg',
renderer.capabilities.getMaxAnisotropy()
'models/json/platform/platform.json'
) );


// start the game

var start = function ( gameLoop, gameViewportSize ) {
Expand Down
0 examples/models/platform/platform.jpg → examples/models/json/platform/platform.jpg
View file
Open in desktop
File renamed without changes
1 change: 1 addition & 0 deletions examples/models/json/platform/platform.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading