From 55c4ea9b6fd002f71bfa0f606ffa8d5f83063527 Mon Sep 17 00:00:00 2001 From: Shubham Kamthania Date: Thu, 19 May 2016 07:30:40 +0530 Subject: [PATCH 01/12] Three js version bump. --- project/Dependencies.scala | 6 +++--- project/Versions.scala | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d49dafb..ea6e15d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,12 +2,12 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ import sbt._ object Dependencies { - + // scalastyle:off //libs for testing lazy val testing: Def.Initialize[Seq[ModuleID]] = Def.setting(Seq( - "org.scalatest" %%% "scalatest" % Versions.scalaTest % Test, + "org.scalatest" %%% "scalatest" % Versions.scalaTest % Test/*, - "org.scalatest" %%% "scalatest-matchers" % Versions.scalaTest % Test)) + "org.scalatest" %%% "scalatest-matchers" % Versions.scalaTest % Test*/)) //akka-related libs lazy val akka = Def.setting(Seq( diff --git a/project/Versions.scala b/project/Versions.scala index 34fd891..b785b07 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -19,7 +19,7 @@ trait ScalaJSVersions { val binding = "0.8.6" - val scalaTest = "3.0.0-SNAP13" + val scalaTest = "3.0.0-M15" } @@ -42,7 +42,7 @@ trait WebJarsVersions{ val semanticUI = "2.1.8" - val threeJs = "r74" + val threeJs = "r76" val codemirror = "5.13.2" } From 543ab96a08f2e8970a3bcf24f9e6946e955c51cb Mon Sep 17 00:00:00 2001 From: Shubham Kamthania Date: Sat, 21 May 2016 12:05:03 +0530 Subject: [PATCH 02/12] Three js version bump and removing update to scalatest. --- project/Dependencies.scala | 4 ++-- project/Versions.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ea6e15d..0da4ac1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,9 +5,9 @@ object Dependencies { // scalastyle:off //libs for testing lazy val testing: Def.Initialize[Seq[ModuleID]] = Def.setting(Seq( - "org.scalatest" %%% "scalatest" % Versions.scalaTest % Test/*, + "org.scalatest" %%% "scalatest" % Versions.scalaTest % Test, - "org.scalatest" %%% "scalatest-matchers" % Versions.scalaTest % Test*/)) + "org.scalatest" %%% "scalatest-matchers" % Versions.scalaTest % Test)) //akka-related libs lazy val akka = Def.setting(Seq( diff --git a/project/Versions.scala b/project/Versions.scala index b785b07..cbe2b3e 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -19,7 +19,7 @@ trait ScalaJSVersions { val binding = "0.8.6" - val scalaTest = "3.0.0-M15" + val scalaTest = "3.0.0-SNAP13" } @@ -42,7 +42,7 @@ trait WebJarsVersions{ val semanticUI = "2.1.8" - val threeJs = "r76" + val threeJs = "r77" val codemirror = "5.13.2" } From 7902c268ea15f72bcaa0d9a98d486efea328d47a Mon Sep 17 00:00:00 2001 From: Franco Ponticelli Date: Sat, 11 Jun 2016 18:06:33 -0600 Subject: [PATCH 03/12] updated device pixel ratio --- facade/src/main/scala/org/denigma/threejs/threejs.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/facade/src/main/scala/org/denigma/threejs/threejs.scala b/facade/src/main/scala/org/denigma/threejs/threejs.scala index cff3b48..23a5ed9 100644 --- a/facade/src/main/scala/org/denigma/threejs/threejs.scala +++ b/facade/src/main/scala/org/denigma/threejs/threejs.scala @@ -784,7 +784,6 @@ class Loader extends js.Object { def addStatusElement(): HTMLElement = js.native def updateProgress(progress: Progress): Unit = js.native def extractUrlBase(url: String): String = js.native - def initMaterials(materials: js.Array[Material], texturePath: String): js.Array[Material] = js.native def needsTangents(materials: js.Array[Material]): Boolean = js.native def createMaterial(m: Material, texturePath: String): Boolean = js.native } @@ -2221,12 +2220,15 @@ trait Renderer extends js.Object { def render(scene: Scene, camera: Camera): Unit = js.native def setSize(width: Double, height: Double, updateStyle: Boolean = js.native): Unit = js.native var domElement: HTMLCanvasElement = js.native + var pixelRatio: Double = js.native + def setPixelRatio(value: Double): Unit = js.native + def getPixelRatio(): Double = js.native } @js.native trait CanvasRendererParameters extends js.Object { var canvas: HTMLCanvasElement = js.native - var devicePixelRatio: Double = js.native + var pixelRatio: Double = js.native } @js.native @@ -2234,7 +2236,6 @@ trait CanvasRendererParameters extends js.Object { class CanvasRenderer extends Renderer { def this(parameters: CanvasRendererParameters = js.native) = this() - var devicePixelRatio: Double = js.native var autoClear: Boolean = js.native var sortObjects: Boolean = js.native var sortElements: Boolean = js.native @@ -2274,7 +2275,6 @@ trait WebGLRendererParameters extends js.Object { var preserveDrawingBuffer: Boolean = js.native var clearColor: Double = js.native var clearAlpha: Double = js.native - var devicePixelRatio: Double = js.native } @js.native @@ -2283,7 +2283,6 @@ class WebGLRenderer extends Renderer { def this(parameters: WebGLRendererParameters = js.native) = this() var context: js.Any = js.native - var devicePixelRatio: Double = js.native var autoClear: Boolean = js.native var autoClearColor: Boolean = js.native var autoClearDepth: Boolean = js.native From 5e507f4c20caed9d68e6a7d4eff54b1431de4b58 Mon Sep 17 00:00:00 2001 From: Franco Ponticelli Date: Sat, 11 Jun 2016 18:07:46 -0600 Subject: [PATCH 04/12] =?UTF-8?q?=E2=86=92=20r69?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- facade/src/main/scala/org/denigma/threejs/threejs.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/facade/src/main/scala/org/denigma/threejs/threejs.scala b/facade/src/main/scala/org/denigma/threejs/threejs.scala index 23a5ed9..d743237 100644 --- a/facade/src/main/scala/org/denigma/threejs/threejs.scala +++ b/facade/src/main/scala/org/denigma/threejs/threejs.scala @@ -2331,7 +2331,6 @@ class WebGLRenderer extends Renderer { def renderBuffer(camera: Camera, lights: js.Array[Light], fog: Fog, material: Material, geometryGroup: js.Any, `object`: Object3D): Unit = js.native def render(scene: Scene, camera: Camera, renderTarget: RenderTarget = js.native, forceClear: Boolean = js.native): Unit = js.native def renderImmediateObject(camera: Camera, lights: js.Array[Light], fog: Fog, material: Material, `object`: Object3D): Unit = js.native - def initMaterial(material: Material, lights: js.Array[Light], fog: Fog, `object`: Object3D): Unit = js.native def setFaceCulling(cullFace: CullFace = js.native, frontFace: FrontFaceDirection = js.native): Unit = js.native def setMaterialFaces(material: Material): Unit = js.native def setDepthTest(depthTest: Boolean): Unit = js.native From 5ed7cdef7cfcf96a68289ae8043f39f2d9f85e43 Mon Sep 17 00:00:00 2001 From: Franco Ponticelli Date: Sat, 11 Jun 2016 18:10:13 -0600 Subject: [PATCH 05/12] =?UTF-8?q?=E2=86=92=20r70?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- facade/src/main/scala/org/denigma/threejs/threejs.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/facade/src/main/scala/org/denigma/threejs/threejs.scala b/facade/src/main/scala/org/denigma/threejs/threejs.scala index d743237..81110a3 100644 --- a/facade/src/main/scala/org/denigma/threejs/threejs.scala +++ b/facade/src/main/scala/org/denigma/threejs/threejs.scala @@ -571,7 +571,6 @@ class Object3D extends js.Object { var rotation: Euler = js.native var quaternion: Quaternion = js.native var scale: Vector3 = js.native - var renderDepth: Double = js.native var rotationAutoUpdate: Boolean = js.native var matrix: Matrix4 = js.native var matrixWorld: Matrix4 = js.native @@ -2167,7 +2166,6 @@ class PointCloud extends Object3D { def this(geometry: Geometry, material: PointCloudMaterial = js.native) = this() var geometry: Geometry = js.native var material: Material = js.native - var sortParticles: Boolean = js.native override def raycast(raycaster: Raycaster, intersects: js.Any): Unit = js.native def clone(`object`: PointCloud): PointCloud = js.native } From 14978ed17c19d11e42877856debde90298ff9ee9 Mon Sep 17 00:00:00 2001 From: Franco Ponticelli Date: Sat, 11 Jun 2016 18:14:42 -0600 Subject: [PATCH 06/12] =?UTF-8?q?=E2=86=92=20r71?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- facade/src/main/scala/org/denigma/threejs/threejs.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/facade/src/main/scala/org/denigma/threejs/threejs.scala b/facade/src/main/scala/org/denigma/threejs/threejs.scala index 81110a3..3ee6d8c 100644 --- a/facade/src/main/scala/org/denigma/threejs/threejs.scala +++ b/facade/src/main/scala/org/denigma/threejs/threejs.scala @@ -603,8 +603,8 @@ class Object3D extends js.Object { def remove(`object`: Object3D): Unit = js.native def raycast(raycaster: Raycaster, intersects: js.Any): Unit = js.native def traverse(callback: js.Function1[Object3D, Any]): Unit = js.native - def getObjectById(id: String, recursive: Boolean): Object3D = js.native - def getObjectByName(name: String, recursive: Boolean = js.native): Object3D = js.native + def getObjectById(id: String): Object3D = js.native + def getObjectByName(name: String): Object3D = js.native def getChildByName(name: String, recursive: Boolean = js.native): Object3D = js.native def updateMatrix(): Unit = js.native def updateMatrixWorld(force: Boolean): Unit = js.native @@ -1147,7 +1147,6 @@ class MeshNormalMaterial extends Material { @js.native trait MeshPhongMaterialParameters extends MaterialParameters { var color: Double = js.native - var ambient: Double = js.native var emissive: Double = js.native var specular: Double = js.native var shininess: Double = js.native @@ -1183,7 +1182,6 @@ trait MeshPhongMaterialParameters extends MaterialParameters { class MeshPhongMaterial extends Material { def this(parameters: MeshPhongMaterialParameters = js.native) = this() var color: Color = js.native - var ambient: Color = js.native var emissive: Color = js.native var specular: Color = js.native var shininess: Double = js.native From 36ea99045265e7af9610fa649bbe3e0b00182379 Mon Sep 17 00:00:00 2001 From: Franco Ponticelli Date: Sat, 11 Jun 2016 18:25:16 -0600 Subject: [PATCH 07/12] =?UTF-8?q?=E2=86=92=20r72?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scala/org/denigma/threejs/threejs.scala | 49 +++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/facade/src/main/scala/org/denigma/threejs/threejs.scala b/facade/src/main/scala/org/denigma/threejs/threejs.scala index 3ee6d8c..e0605e5 100644 --- a/facade/src/main/scala/org/denigma/threejs/threejs.scala +++ b/facade/src/main/scala/org/denigma/threejs/threejs.scala @@ -543,7 +543,6 @@ class Geometry extends js.Object { def computeFaceNormals(): Unit = js.native def computeVertexNormals(areaWeighted: Boolean = js.native): Unit = js.native def computeMorphNormals(): Unit = js.native - def computeTangents(): Unit = js.native def computeLineDistances(): Unit = js.native def computeBoundingBox(): Unit = js.native def computeBoundingSphere(): Unit = js.native @@ -634,7 +633,7 @@ trait Intersection extends js.Object { trait RaycasterParameters extends js.Object { var Sprite: js.Any = js.native var Mesh: js.Any = js.native - var PointCloud: js.Any = js.native + var Points: js.Any = js.native var LOD: js.Any = js.native var Line: js.Any = js.native } @@ -1214,7 +1213,7 @@ class MeshPhongMaterial extends Material { } @js.native -trait PointCloudMaterialParameters extends MaterialParameters { +trait PointsMaterialParameters extends MaterialParameters { var color: Double = js.native var map: Texture = js.native var size: Double = js.native @@ -1224,26 +1223,26 @@ trait PointCloudMaterialParameters extends MaterialParameters { } @js.native -@JSName("THREE.PointCloudMaterial") -class PointCloudMaterial extends Material { - def this(parameters: PointCloudMaterialParameters = js.native) = this() +@JSName("THREE.PointsMaterial") +class PointsMaterial extends Material { + def this(parameters: PointsMaterialParameters = js.native) = this() var color: Color = js.native var map: Texture = js.native var size: Double = js.native var sizeAttenuation: Boolean = js.native var vertexColors: Boolean = js.native var fog: Boolean = js.native - override def clone(): PointCloudMaterial = js.native + override def clone(): PointsMaterial = js.native } @js.native @JSName("THREE.ParticleBasicMaterial") -class ParticleBasicMaterial extends PointCloudMaterial { +class ParticleBasicMaterial extends PointsMaterial { } @js.native @JSName("THREE.ParticleSystemMaterial") -class ParticleSystemMaterial extends PointCloudMaterial { +class ParticleSystemMaterial extends PointsMaterial { } @js.native @@ -2099,6 +2098,11 @@ class Line extends Object3D { def clone(`object`: Line): Line = js.native } +@js.native +@JSName("THREE.LineSegments") +class LineSegments extends Line { +} + @js.native sealed trait LineType extends js.Object { } @@ -2159,13 +2163,13 @@ class MorphAnimMesh extends Mesh { } @js.native -@JSName("THREE.PointCloud") -class PointCloud extends Object3D { - def this(geometry: Geometry, material: PointCloudMaterial = js.native) = this() +@JSName("THREE.Points") +class Points extends Object3D { + def this(geometry: Geometry, material: PointsMaterial = js.native) = this() var geometry: Geometry = js.native var material: Material = js.native override def raycast(raycaster: Raycaster, intersects: js.Any): Unit = js.native - def clone(`object`: PointCloud): PointCloud = js.native + def clone(`object`: Points): Points = js.native } @js.native @@ -2273,6 +2277,17 @@ trait WebGLRendererParameters extends js.Object { var clearAlpha: Double = js.native } +@js.native +trait WebGLRendererShadowMap extends js.Object { + var enabled: Boolean = js.native + var autoUpdate: Boolean = js.native + var `type`: ShadowMapType = js.native + var cullFace: CullFace = js.native + var debug: Boolean = js.native + var cascade: Boolean = js.native + var plugin: ShadowMapPlugin = js.native +} + @js.native @JSName("THREE.WebGLRenderer") class WebGLRenderer extends Renderer { @@ -2286,19 +2301,13 @@ class WebGLRenderer extends Renderer { var sortObjects: Boolean = js.native var gammaInput: Boolean = js.native var gammaOutput: Boolean = js.native - var shadowMapEnabled: Boolean = js.native - var shadowMapAutoUpdate: Boolean = js.native - var shadowMapType: ShadowMapType = js.native - var shadowMapCullFace: CullFace = js.native - var shadowMapDebug: Boolean = js.native - var shadowMapCascade: Boolean = js.native var maxMorphTargets: Double = js.native var maxMorphNormals: Double = js.native var autoScaleCubemaps: Boolean = js.native var renderPluginsPre: js.Array[RendererPlugin] = js.native var renderPluginsPost: js.Array[RendererPlugin] = js.native var info: js.Any = js.native - var shadowMapPlugin: ShadowMapPlugin = js.native + var shadowMap: WebGLRendererShadowMap = js.native def getContext(): WebGLRenderingContext = js.native def supportsVertexTextures(): Boolean = js.native def supportsFloatTextures(): Boolean = js.native From 2cebca6e705d2eb1cb4c4e6a89c04fbaacea1cf3 Mon Sep 17 00:00:00 2001 From: Franco Ponticelli Date: Sat, 11 Jun 2016 18:34:24 -0600 Subject: [PATCH 08/12] =?UTF-8?q?=E2=86=92=20r73?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../denigma/threejs/extras/FontUtils.scala | 22 ++++++++++++++++ .../extras/geometries/TextGeometry.scala | 11 ++++++++ .../scala/org/denigma/threejs/threejs.scala | 25 ------------------- 3 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 facade/src/main/scala/org/denigma/threejs/extras/FontUtils.scala create mode 100644 facade/src/main/scala/org/denigma/threejs/extras/geometries/TextGeometry.scala diff --git a/facade/src/main/scala/org/denigma/threejs/extras/FontUtils.scala b/facade/src/main/scala/org/denigma/threejs/extras/FontUtils.scala new file mode 100644 index 0000000..31d5792 --- /dev/null +++ b/facade/src/main/scala/org/denigma/threejs/extras/FontUtils.scala @@ -0,0 +1,22 @@ +package org.denigma.threejs.extras.geometries + +import scalajs.js +import scalajs.js.annotation._ +import org.denigma.threejs._ + +@js.native +@JSName("THREE.FontUtils") +object FontUtils extends js.Object { + var faces: js.Any = js.native + var face: String = js.native + var weight: String = js.native + var style: String = js.native + var size: Double = js.native + var divisions: Double = js.native + def getFace(): Face3 = js.native + def loadFace(data: TypefaceData): TypefaceData = js.native + def drawText(text: String): js.Any = js.native + def extractGlyphPoints(c: String, face: Face3, scale: Double, offset: Double, path: Path): js.Any = js.native + def generateShapes(text: String, parameters: js.Any = js.native): js.Array[Shape] = js.native + var Triangulate: js.Any = js.native +} diff --git a/facade/src/main/scala/org/denigma/threejs/extras/geometries/TextGeometry.scala b/facade/src/main/scala/org/denigma/threejs/extras/geometries/TextGeometry.scala new file mode 100644 index 0000000..c1f50be --- /dev/null +++ b/facade/src/main/scala/org/denigma/threejs/extras/geometries/TextGeometry.scala @@ -0,0 +1,11 @@ +package org.denigma.threejs.extras.geometries + +import scalajs.js +import scalajs.js.annotation._ +import org.denigma.threejs._ + +@js.native +@JSName("THREE.TextGeometry") +class TextGeometry extends ExtrudeGeometry { + def this(text: String, TextGeometryParameters: TextGeometryParameters = js.native) = this() +} diff --git a/facade/src/main/scala/org/denigma/threejs/threejs.scala b/facade/src/main/scala/org/denigma/threejs/threejs.scala index e0605e5..709d16c 100644 --- a/facade/src/main/scala/org/denigma/threejs/threejs.scala +++ b/facade/src/main/scala/org/denigma/threejs/threejs.scala @@ -520,7 +520,6 @@ class Geometry extends js.Object { var faces: js.Array[Face3] = js.native var faceVertexUvs: js.Array[js.Array[js.Array[Vector2]]] = js.native var morphTargets: js.Array[MorphTarget] = js.native - var morphColors: js.Array[MorphColor] = js.native var morphNormals: js.Array[MorphNormals] = js.native var skinWeights: js.Array[Double] = js.native var skinIndices: js.Array[Double] = js.native @@ -1647,7 +1646,6 @@ class Line3 extends js.Object { trait Math extends js.Object { def generateUUID(): String = js.native def clamp(x: Double, a: Double, b: Double): Double = js.native - def clampBottom(x: Double, a: Double): Double = js.native def mapLinear(x: Double, a1: Double, a2: Double, b1: Double, b2: Double): Double = js.native def smoothstep(x: Double, min: Double, max: Double): Double = js.native def smootherstep(x: Double, min: Double, max: Double): Double = js.native @@ -2677,23 +2675,6 @@ trait TypefaceData extends js.Object { var cssFontStyle: String = js.native } -@js.native -@JSName("THREE.FontUtils") -object FontUtils extends js.Object { - var faces: js.Any = js.native - var face: String = js.native - var weight: String = js.native - var style: String = js.native - var size: Double = js.native - var divisions: Double = js.native - def getFace(): Face3 = js.native - def loadFace(data: TypefaceData): TypefaceData = js.native - def drawText(text: String): js.Any = js.native - def extractGlyphPoints(c: String, face: Face3, scale: Double, offset: Double, path: Path): js.Any = js.native - def generateShapes(text: String, parameters: js.Any = js.native): js.Array[Shape] = js.native - var Triangulate: js.Any = js.native -} - @js.native @JSName("THREE.GeometryUtils") object GeometryUtils extends js.Object { @@ -3198,12 +3179,6 @@ trait TextGeometryParameters extends js.Object { var bevelSize: Double = js.native } -@js.native -@JSName("THREE.TextGeometry") -class TextGeometry extends ExtrudeGeometry { - def this(text: String, TextGeometryParameters: TextGeometryParameters = js.native) = this() -} - @js.native @JSName("THREE.TorusGeometry") class TorusGeometry extends Geometry { From 0ed1b9c6187f90a412533aba5a846ad01e8c5cea Mon Sep 17 00:00:00 2001 From: Franco Ponticelli Date: Sat, 11 Jun 2016 18:56:58 -0600 Subject: [PATCH 09/12] =?UTF-8?q?=E2=86=92=20r74?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scala/org/denigma/threejs/threejs.scala | 65 +++++++------------ 1 file changed, 25 insertions(+), 40 deletions(-) diff --git a/facade/src/main/scala/org/denigma/threejs/threejs.scala b/facade/src/main/scala/org/denigma/threejs/threejs.scala index 709d16c..b4a0e5c 100644 --- a/facade/src/main/scala/org/denigma/threejs/threejs.scala +++ b/facade/src/main/scala/org/denigma/threejs/threejs.scala @@ -654,11 +654,31 @@ class Raycaster extends js.Object { def intersectObjects(objects: js.Array[Object3D], recursive: Boolean = js.native): js.Array[Intersection] = js.native } +@js.native +@JSName("THREE.LightShadow") +class LightShadow extends js.Object { + def this(camera: Camera) = this() + var camera: Camera = js.native + var bias: Double = js.native + var radius: Double = js.native + var mapSize: Vector2 = js.native + var matrix: Matrix4 = js.native + var map: WebGLRenderTarget = js.native + def copy(src: LightShadow): Unit = js.native +} + +@js.native +@JSName("THREE.DirectionalLightShadow") +class DirectionalLightShadow extends LightShadow { + def this(light: DirectionalLight) = this() +} + @js.native @JSName("THREE.Light") class Light extends Object3D { def this(hex: Double = js.native) = this() var color: Color = js.native + val shadow: LightShadow = js.native def clone(light: Light): Light = js.native } @@ -689,32 +709,7 @@ class DirectionalLight extends Light { def this(hex: Double = js.native, intensity: Double = js.native) = this() var target: Object3D = js.native var intensity: Double = js.native - - var onlyShadow: Boolean = js.native - var shadowCameraNear: Double = js.native - var shadowCameraFar: Double = js.native - var shadowCameraLeft: Double = js.native - var shadowCameraRight: Double = js.native - var shadowCameraTop: Double = js.native - var shadowCameraBottom: Double = js.native - var shadowCameraVisible: Boolean = js.native - var shadowBias: Double = js.native - var shadowDarkness: Double = js.native - var shadowMapWidth: Double = js.native - var shadowMapHeight: Double = js.native - var shadowCascade: Boolean = js.native - var shadowCascadeOffset: Vector3 = js.native - var shadowCascadeCount: Double = js.native - var shadowCascadeBias: js.Array[Double] = js.native - var shadowCascadeWidth: js.Array[Double] = js.native - var shadowCascadeHeight: js.Array[Double] = js.native - var shadowCascadeNearZ: js.Array[Double] = js.native - var shadowCascadeFarZ: js.Array[Double] = js.native - var shadowCascadeArray: js.Array[DirectionalLight] = js.native - var shadowMap: RenderTarget = js.native - var shadowMapSize: Double = js.native - var shadowCamera: Camera = js.native - var shadowMatrix: Matrix4 = js.native + override val shadow: DirectionalLightShadow = js.native override def clone(): DirectionalLight = js.native } @@ -1148,7 +1143,6 @@ trait MeshPhongMaterialParameters extends MaterialParameters { var emissive: Double = js.native var specular: Double = js.native var shininess: Double = js.native - var metal: Boolean = js.native var wrapAround: Boolean = js.native var wrapRGB: Vector3 = js.native var map: Texture = js.native @@ -1183,7 +1177,6 @@ class MeshPhongMaterial extends Material { var emissive: Color = js.native var specular: Color = js.native var shininess: Double = js.native - var metal: Boolean = js.native var wrapAround: Boolean = js.native var wrapRGB: Vector3 = js.native var map: Texture = js.native @@ -1335,7 +1328,7 @@ class Box2 extends js.Object { def setFromCenterAndSize(center: Vector2, size: Double): Box2 = js.native def copy(box: Box2): Box2 = js.native def makeEmpty(): Box2 = js.native - def empty(): Boolean = js.native + def isEmpty(): Boolean = js.native def center(optionalTarget: Vector2 = js.native): Vector2 = js.native def size(optionalTarget: Vector2 = js.native): Vector2 = js.native def expandByPoint(point: Vector2): Box2 = js.native @@ -1366,7 +1359,7 @@ class Box3 extends js.Object { def setFromObject(`object`: Object3D): Box3 = js.native def copy(box: Box3): Box3 = js.native def makeEmpty(): Box3 = js.native - def empty(): Boolean = js.native + def isEmpty(): Boolean = js.native def center(optionalTarget: Vector3 = js.native): Vector3 = js.native def size(optionalTarget: Vector3 = js.native): Vector3 = js.native def expandByPoint(point: Vector3): Box3 = js.native @@ -2243,7 +2236,7 @@ class CanvasRenderer extends Renderer { override def setSize(width: Double, height: Double, updateStyle: Boolean = js.native): Unit = js.native def setViewport(x: Double, y: Double, width: Double, height: Double): Unit = js.native def setScissor(): Unit = js.native - def enableScissorTest(): Unit = js.native + def setScissorTest(enable: Boolean): Unit = js.native def setClearColor(color: Color, opacity: Double = js.native): Unit = js.native def setClearColorHex(hex: Double, alpha: Double = js.native): Unit = js.native def getClearColor(): Color = js.native @@ -2316,7 +2309,7 @@ class WebGLRenderer extends Renderer { override def setSize(width: Double, height: Double, updateStyle: Boolean = js.native): Unit = js.native def setViewport(x: Double = js.native, y: Double = js.native, width: Double = js.native, height: Double = js.native): Unit = js.native def setScissor(x: Double, y: Double, width: Double, height: Double): Unit = js.native - def enableScissorTest(enable: Boolean): Unit = js.native + def setScissorTest(enable: Boolean): Unit = js.native def setClearColor(color: Color, alpha: Double = js.native): Unit = js.native def setClearColorHex(hex: Double, alpha: Double): Unit = js.native def getClearColor(): Color = js.native @@ -2927,14 +2920,6 @@ class ArcCurve extends EllipseCurve { def this(aX: Double, aY: Double, aRadius: Double, aStartAngle: Double, aEndAngle: Double, aClockwise: Boolean) = this() } -@js.native -@JSName("THREE.ClosedSplineCurve3") -class ClosedSplineCurve3 extends Curve { - def this(points: js.Array[Vector3] = js.native) = this() - var points: js.Array[Vector3] = js.native - override def getPoint(t: Double): Vector3 = js.native -} - @js.native @JSName("THREE.CubicBezierCurve") class CubicBezierCurve extends Curve { From dcf881c638d62828a000e20f970bc255fe8c6a27 Mon Sep 17 00:00:00 2001 From: Franco Ponticelli Date: Sat, 11 Jun 2016 18:58:11 -0600 Subject: [PATCH 10/12] satisfied Scala.js warning --- facade/src/main/scala/org/denigma/threejs/threejs.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/facade/src/main/scala/org/denigma/threejs/threejs.scala b/facade/src/main/scala/org/denigma/threejs/threejs.scala index b4a0e5c..eae91fc 100644 --- a/facade/src/main/scala/org/denigma/threejs/threejs.scala +++ b/facade/src/main/scala/org/denigma/threejs/threejs.scala @@ -12,6 +12,7 @@ trait WebGLRenderingContext extends js.Object { } +@js.native object THREE extends js.Object { var REVISION: String = js.native var CullFaceNone: CullFace = js.native From 3d0fdd4716c55a3c22d3fcaea6cd7025e6cdc1a6 Mon Sep 17 00:00:00 2001 From: Franco Ponticelli Date: Sat, 11 Jun 2016 19:02:01 -0600 Subject: [PATCH 11/12] =?UTF-8?q?=E2=86=92=20r75?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- facade/src/main/scala/org/denigma/threejs/threejs.scala | 3 +-- project/Versions.scala | 3 +-- project/plugins.sbt | 3 +-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 0be1eab..0ce97e6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ threejs facade ============== -This if a facade of threejs javascript 3D library ( http://threejs.org/ ). -All the code is inside facade folder (threejs subproject). +This if a facade of threejs javascript 3D library ( http://threejs.org/ ). +All the code is inside facade folder (threejs subproject). It also contains some extra classes for esier scence creation and css3d rendering. Usage @@ -11,7 +11,7 @@ Usage In order to resolve a lib you should add a resolver:: ```scala resolvers += sbt.Resolver.bintrayRepo("denigma", "denigma-releases") //add resolver -libraryDependencies += "org.denigma" %%% "threejs-facade" % "0.0.74-0.1.6" //add dependency +libraryDependencies += "org.denigma" %%% "threejs-facade" % "0.0.75-0.1.6" //add dependency ``` Gettings started diff --git a/facade/src/main/scala/org/denigma/threejs/threejs.scala b/facade/src/main/scala/org/denigma/threejs/threejs.scala index eae91fc..582349a 100644 --- a/facade/src/main/scala/org/denigma/threejs/threejs.scala +++ b/facade/src/main/scala/org/denigma/threejs/threejs.scala @@ -2013,7 +2013,7 @@ class Vector3 extends Vector { def distanceToSquared(v: Vector3): Double = js.native def setFromMatrixPosition(m: Matrix4): Vector3 = js.native def setFromMatrixScale(m: Matrix4): Vector3 = js.native - def setFromMatrixColumn(index: Double, matrix: Matrix4): Vector3 = js.native + def setFromMatrixColumn(matrix: Matrix4, index: Double): Vector3 = js.native def equals(v: Vector3): Boolean = js.native def fromArray(xyz: js.Array[Double]): Vector3 = js.native def toArray(): js.Array[Double] = js.native @@ -2372,7 +2372,6 @@ class WebGLRenderTarget extends RenderTarget { var depthBuffer: Boolean = js.native var stencilBuffer: Boolean = js.native var generateMipmaps: Boolean = js.native - var shareDepthFrom: js.Any = js.native override def clone(): WebGLRenderTarget = js.native def dispose(): Unit = js.native def addEventListener(`type`: String, listener: js.Function1[js.Any, Unit]): Unit = js.native diff --git a/project/Versions.scala b/project/Versions.scala index cbe2b3e..735dfa7 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -7,7 +7,7 @@ object Versions extends WebJarsVersions with ScalaJSVersions with SharedVersions trait ScalaJSVersions { - val threejsFacade = "0.0.74-0.1.7" + val threejsFacade = "0.0.75-SNAPSHOT" val jqueryFacade = "1.0-RC3" @@ -46,4 +46,3 @@ trait WebJarsVersions{ val codemirror = "5.13.2" } - diff --git a/project/plugins.sbt b/project/plugins.sbt index ccff3e5..75fea3b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -18,7 +18,6 @@ addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10") - From d996ab661f2dd5b50a2e3451e5c197b95a73867e Mon Sep 17 00:00:00 2001 From: Franco Ponticelli Date: Sat, 11 Jun 2016 19:05:09 -0600 Subject: [PATCH 12/12] =?UTF-8?q?=E2=86=92=20r77?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- facade/src/main/scala/org/denigma/threejs/threejs.scala | 5 +---- project/Versions.scala | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0ce97e6..cf8bfeb 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Usage In order to resolve a lib you should add a resolver:: ```scala resolvers += sbt.Resolver.bintrayRepo("denigma", "denigma-releases") //add resolver -libraryDependencies += "org.denigma" %%% "threejs-facade" % "0.0.75-0.1.6" //add dependency +libraryDependencies += "org.denigma" %%% "threejs-facade" % "0.0.77-0.1.6" //add dependency ``` Gettings started diff --git a/facade/src/main/scala/org/denigma/threejs/threejs.scala b/facade/src/main/scala/org/denigma/threejs/threejs.scala index 582349a..128868f 100644 --- a/facade/src/main/scala/org/denigma/threejs/threejs.scala +++ b/facade/src/main/scala/org/denigma/threejs/threejs.scala @@ -3280,10 +3280,7 @@ class FaceNormalsHelper extends Line { @js.native @JSName("THREE.GridHelper") class GridHelper extends Line { - def this(size: Double, step: Double) = this() - var color1: Color = js.native - var color2: Color = js.native - def setColors(colorCenterLine: Double, colorGrid: Double): Unit = js.native + def this(size: Double, step: Double, color1: Color, color2: Color) = this() } @js.native diff --git a/project/Versions.scala b/project/Versions.scala index 735dfa7..e1446b3 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -7,7 +7,7 @@ object Versions extends WebJarsVersions with ScalaJSVersions with SharedVersions trait ScalaJSVersions { - val threejsFacade = "0.0.75-SNAPSHOT" + val threejsFacade = "0.0.77-SNAPSHOT" val jqueryFacade = "1.0-RC3"