Skip to content

JSM: Added more modules and TS files. #16661

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 2 commits into from
Jun 3, 2019
Merged

JSM: Added more modules and TS files. #16661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e85447f
JSM: Added module and TS file for HDRCubeTextureLoader.
Mugen87 Jun 3, 2019
a7e2ca7
JSM: Added module and TS file for Fire.
Mugen87 Jun 3, 2019
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
2 changes: 2 additions & 0 deletions docs/manual/en/introduction/Import-via-modules.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ <h2>Importable Examples</h2>
<li>FBXLoader</li>
<li>GCodeLoader</li>
<li>GLTFLoader</li>
<li>HDRCubeTextureLoader</li>
<li>KMZLoader</li>
<li>KTXLoader</li>
<li>MTLLoader</li>
Expand Down Expand Up @@ -202,6 +203,7 @@ <h2>Importable Examples</h2>
</li>
<li>objects
<ul>
<li>Fire</li>
<li>Lensflare</li>
<li>Reflector</li>
<li>Refractor</li>
Expand Down
36 changes: 0 additions & 36 deletions examples/js/objects/Fire.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,11 +498,9 @@ THREE.Fire.SourceShader = {

uniforms: {
'sourceMap': {
type: 't',
value: null
},
'densityMap': {
type: 't',
value: null
}
},
Expand Down Expand Up @@ -557,39 +555,30 @@ THREE.Fire.DiffuseShader = {

uniforms: {
'oneOverWidth': {
type: 'f',
value: null
},
'oneOverHeight': {
type: 'f',
value: null
},
'diffuse': {
type: 'f',
value: null
},
'viscosity': {
type: 'f',
value: null
},
'expansion': {
type: 'f',
value: null
},
'swirl': {
type: 'f',
value: null
},
'drag': {
type: 'f',
value: null
},
'burnRate': {
type: 'f',
value: null
},
'densityMap': {
type: 't',
value: null
}
},
Expand Down Expand Up @@ -674,23 +663,18 @@ THREE.Fire.DriftShader = {

uniforms: {
'oneOverWidth': {
type: 'f',
value: null
},
'oneOverHeight': {
type: 'f',
value: null
},
'windVector': {
type: 'v2',
value: new THREE.Vector2( 0.0, 0.0 )
},
'airSpeed': {
type: 'f',
value: null
},
'densityMap': {
type: 't',
value: null
}
},
Expand Down Expand Up @@ -759,15 +743,12 @@ THREE.Fire.ProjectionShader1 = {

uniforms: {
'oneOverWidth': {
type: 'f',
value: null
},
'oneOverHeight': {
type: 'f',
value: null
},
'densityMap': {
type: 't',
value: null
}
},
Expand Down Expand Up @@ -819,15 +800,12 @@ THREE.Fire.ProjectionShader2 = {

uniforms: {
'oneOverWidth': {
type: 'f',
value: null
},
'oneOverHeight': {
type: 'f',
value: null
},
'densityMap': {
type: 't',
value: null
}
},
Expand Down Expand Up @@ -880,19 +858,15 @@ THREE.Fire.ProjectionShader3 = {

uniforms: {
'oneOverWidth': {
type: 'f',
value: null
},
'oneOverHeight': {
type: 'f',
value: null
},
'densityMap': {
type: 't',
value: null
},
'projMap': {
type: 't',
value: null
}
},
Expand Down Expand Up @@ -950,23 +924,18 @@ THREE.Fire.ColorShader = {

uniforms: {
'color1': {
type: 'c',
value: null
},
'color2': {
type: 'c',
value: null
},
'color3': {
type: 'c',
value: null
},
'colorBias': {
type: 'f',
value: null
},
'densityMap': {
type: 't',
value: null
}
},
Expand Down Expand Up @@ -1014,23 +983,18 @@ THREE.Fire.DebugShader = {

uniforms: {
'color1': {
type: 'c',
value: null
},
'color2': {
type: 'c',
value: null
},
'color3': {
type: 'c',
value: null
},
'colorBias': {
type: 'f',
value: null
},
'densityMap': {
type: 't',
value: null
}
},
Expand Down
17 changes: 17 additions & 0 deletions examples/jsm/loaders/HDRCubeTextureLoader.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import {
CubeTexture,
LoadingManager,
TextureDataType
} from '../../../src/Three';

import { RGBELoader } from './RGBELoader';

export class HDRCubeTextureLoader {
constructor(manager?: LoadingManager);
manager: LoadingManager;
hdrLoader: RGBELoader;
path: string;

load(type: TextureDataType, url: string, onLoad: (texture: CubeTexture) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): void;
setPath(value: string): this;
}
Loading