Skip to content

Commit

Permalink
Merge pull request #156 from treblereel/r102
Browse files Browse the repository at this point in the history
R102
  • Loading branch information
treblereel authored Oct 16, 2019
2 parents 913192a + c011fd1 commit 606d041
Show file tree
Hide file tree
Showing 10 changed files with 680 additions and 685 deletions.
4 changes: 2 additions & 2 deletions annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.treblereel.gwt</groupId>
<artifactId>three4g-parent</artifactId>
<version>0.103-SNAPSHOT</version>
<version>0.102</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -41,7 +41,7 @@
<url>https://github.com/treblereel/three4g</url>
<developerConnection>scm:git:git@github.com:treblereel/three4g.git</developerConnection>
<connection>scm:git:git://github.com/treblereel/three4g.git</connection>
<tag>HEAD</tag>
<tag>three4g-parent-0.102</tag>
</scm>
<build>
<resources>
Expand Down
4 changes: 2 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.treblereel.gwt</groupId>
<artifactId>three4g-parent</artifactId>
<version>0.103-SNAPSHOT</version>
<version>0.102</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -41,7 +41,7 @@
<url>https://github.com/treblereel/three4g</url>
<developerConnection>scm:git:git@github.com:treblereel/three4g.git</developerConnection>
<connection>scm:git:git://github.com/treblereel/three4g.git</connection>
<tag>HEAD</tag>
<tag>three4g-parent-0.102</tag>
</scm>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,78 @@

/**
* This helper displays the directional cone of a PositionalAudio.
*
* @author Dmitrii Tikhomirov Created by treblereel 5/6/19
* @author Dmitrii Tikhomirov
* Created by treblereel 10/16/19
*/
@JsType(isNative = true, namespace = "THREE")
public class PositionalAudioHelper extends Line {

/** @param audio -- The PositionalAudio to be visualized. */
public PositionalAudioHelper(PositionalAudio audio) {}

/**
* @param audio -- The PositionalAudio to be visualized.
* @param range -- The range of the directional cone.
*/
public PositionalAudioHelper(PositionalAudio audio, float range) {}

/**
* @param audio -- The PositionalAudio to be visualized.
* @param range -- The range of the directional cone.
* @param divisionsInnerAngle -- The amount of divisions of the inner part of the directional
* cone.
*/
public PositionalAudioHelper(PositionalAudio audio, float range, float divisionsInnerAngle) {}

/**
* @param audio -- The PositionalAudio to be visualized.
* @param range -- The range of the directional cone.
* @param divisionsInnerAngle -- The amount of divisions of the inner part of the directional
* cone.
* @param divisionsOuterAngle -- The amount of divisions of the outer part of the directional
* cone.
*/
public PositionalAudioHelper(
PositionalAudio audio, float range, float divisionsInnerAngle, float divisionsOuterAngle) {}

/** Disposes of the helper. */
public native void dispose();

/** Updates of the helper. */
public native void update();
/**
* PositionalAudio to be visualized.
*/
public PositionalAudio audio;

/**
* The range of the directional cone.
*/
public Number range;

/**
* The amount of divisions of the inner part of the directional cone.
*/
public Number divisionsInnerAngle;

/**
* The amount of divisions of the outer part of the directional cone.
*/
public Number divisionsOuterAngle;

/**
* @param audio -- The PositionalAudio to be visualized.
*/
public PositionalAudioHelper(PositionalAudio audio) {

}

/**
* @param audio -- The PositionalAudio to be visualized.
* @param range -- The range of the directional cone.
*
*/
public PositionalAudioHelper(PositionalAudio audio, Number range) {

}

/**
* @param audio -- The PositionalAudio to be visualized.
* @param range -- The range of the directional cone.
* @param divisionsInnerAngle -- The amount of divisions of the inner part of the directional cone.
*
*/
public PositionalAudioHelper(PositionalAudio audio, Number range, Number divisionsInnerAngle) {

}

/**
* @param audio -- The PositionalAudio to be visualized.
* @param range -- The range of the directional cone.
* @param divisionsInnerAngle -- The amount of divisions of the inner part of the directional cone.
* @param divisionsOuterAngle -- (optional) The amount of divisions of the outer part of the directional cone.
*
*/
public PositionalAudioHelper(PositionalAudio audio, Number range, Number divisionsInnerAngle, Number divisionsOuterAngle) {

}

/**
* Disposes of the helper.
*/
public native void dispose();

/**
* Updates the helper.
*/
public native void update();


}
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ public ImageLoader(LoadingManager manager){
/**
* Set the .crossOrigin attribute.
* @param origin crossOrigin attribute.
* @return ImageLoader
*/
public native ImageLoader setCrossOrigin(String origin);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,7 @@ public class Material extends EventDispatcher {
public int vertexColors;

/**
* Defines whether precomputed vertex tangents, which must be provided in a vec4 "tangent"
* attribute, are used. When disabled, tangents are derived automatically. Using precomputed
* tangents will give more accurate normal map details in some cases, such as with mirrored UVs.
* Default is false.
* Defines whether precomputed vertex tangents are used. Default is false.
*/
public boolean vertexTangents;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
@JsType(isNative = true, namespace = "THREE")
public class WebGLRenderTargetCube extends WebGLRenderTarget {

/**
* The activeCubeFace property corresponds to a cube side (PX 0, NX 1, PY 2, NY 3, PZ 4, NZ 5) and is used and set internally by the CubeCamera.
*/
public int activeCubeFace;

/**
*
* @param width - The width of the renderTarget.
Expand Down
Loading

0 comments on commit 606d041

Please sign in to comment.