Merge branch 'dev'

.all-contributorsrc

@@ -216,7 +216,16 @@
       ]
     },
     {
-      "login": "woo-cie",
+      "login": "benpigchu",
+      "name": "Ben \"Pig\" Chu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9023067?v=4",
+      "profile": "https://benpigchu.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+          "login": "woo-cie",
       "name": "Makoto Yamada",
       "avatar_url": "https://avatars.githubusercontent.com/u/24642989?v=4",
       "profile": "https://github.com/woo-cie",

README.md

@@ -54,6 +54,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/servinlp"><img src="https://avatars.githubusercontent.com/u/7222029?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Servin Nissen</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=servinlp" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://benpigchu.com/"><img src="https://avatars.githubusercontent.com/u/9023067?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ben "Pig" Chu</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=benpigchu" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/woo-cie"><img src="https://avatars.githubusercontent.com/u/24642989?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Makoto Yamada</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=woo-cie" title="Code">💻</a></td>
   </tr>
 </table>

types/three/OTHER_FILES.txt

@@ -244,7 +244,6 @@ examples/jsm/shaders/LuminosityHighPassShader.d.ts
 examples/jsm/shaders/LuminosityShader.d.ts
 examples/jsm/shaders/MirrorShader.d.ts
 examples/jsm/shaders/NormalMapShader.d.ts
-examples/jsm/shaders/ParallaxShader.d.ts
 examples/jsm/shaders/PixelShader.d.ts
 examples/jsm/shaders/RGBShiftShader.d.ts
 examples/jsm/shaders/SAOShader.d.ts

types/three/examples/jsm/lines/LineMaterial.d.ts

@@ -1,6 +1,7 @@
 import { Color, MaterialParameters, ShaderMaterial, Vector2 } from '../../../src/Three';
 
 export interface LineMaterialParameters extends MaterialParameters {
+    alphaToCoverage?: boolean | undefined;
     color?: number | undefined;
     dashed?: boolean | undefined;
     dashScale?: number | undefined;
@@ -10,6 +11,7 @@ export interface LineMaterialParameters extends MaterialParameters {
     linewidth?: number | undefined;
     resolution?: Vector2 | undefined;
     wireframe?: boolean | undefined;
+    worldUnits?: boolean | undefined;
 }
 
 export class LineMaterial extends ShaderMaterial {
@@ -25,4 +27,5 @@ export class LineMaterial extends ShaderMaterial {
     linewidth: number;
     resolution: Vector2;
     alphaToCoverage: boolean;
+    worldUnits: boolean;
 }