added stamp brush type and new brushes

YingJiang96 · Sep 8, 2016 · ab41559 · ab41559
1 parent 853ca93
commit ab41559
Show file tree

Hide file tree

Showing 48 changed files with 458 additions and 54 deletions.
diff --git a/brushes/bristles0.png b/brushes/bristles0.png
diff --git a/brushes/fur0.png b/brushes/fur0.png
diff --git a/brushes/fur1.png b/brushes/fur1.png
diff --git a/brushes/grunge0.png b/brushes/grunge0.png
diff --git a/brushes/line_gradient.png b/brushes/line_gradient.png
diff --git a/brushes/line_grunge1.png b/brushes/line_grunge1.png
diff --git a/brushes/line_grunge2.png b/brushes/line_grunge2.png
diff --git a/brushes/line_grunge3.png b/brushes/line_grunge3.png
diff --git a/brushes/lines1.png b/brushes/lines1.png
diff --git a/brushes/lines2.png b/brushes/lines2.png
diff --git a/brushes/lines3.png b/brushes/lines3.png
diff --git a/brushes/lines4.png b/brushes/lines4.png
diff --git a/brushes/lines5.png b/brushes/lines5.png
diff --git a/brushes/roundflat.png b/brushes/roundflat.png
diff --git a/brushes/roundsoft.png b/brushes/roundsoft.png
diff --git a/brushes/silky_flat.png b/brushes/silky_flat.png
diff --git a/brushes/silky_textured.png b/brushes/silky_textured.png
diff --git a/brushes/smoke0.png b/brushes/smoke0.png
diff --git a/brushes/squared_textured.png b/brushes/squared_textured.png
diff --git a/brushes/stamp_bush1.png b/brushes/stamp_bush1.png
diff --git a/brushes/stamp_column1.png b/brushes/stamp_column1.png
diff --git a/brushes/stamp_dots.png b/brushes/stamp_dots.png
diff --git a/brushes/stamp_fur1.png b/brushes/stamp_fur1.png
diff --git a/brushes/stamp_fur2.png b/brushes/stamp_fur2.png
diff --git a/brushes/stamp_gear1.png b/brushes/stamp_gear1.png
diff --git a/brushes/stamp_grass1.png b/brushes/stamp_grass1.png
diff --git a/brushes/stamp_grunge1.png b/brushes/stamp_grunge1.png
diff --git a/brushes/stamp_grunge2.png b/brushes/stamp_grunge2.png
diff --git a/brushes/stamp_grunge3.png b/brushes/stamp_grunge3.png
diff --git a/brushes/stamp_grunge4.png b/brushes/stamp_grunge4.png
diff --git a/brushes/stamp_grunge5.png b/brushes/stamp_grunge5.png
diff --git a/brushes/stamp_leaf1.png b/brushes/stamp_leaf1.png
diff --git a/brushes/stamp_leaf2.png b/brushes/stamp_leaf2.png
diff --git a/brushes/stamp_leaf3.png b/brushes/stamp_leaf3.png
diff --git a/brushes/stamp_rain1.png b/brushes/stamp_rain1.png
diff --git a/brushes/stamp_snow1.png b/brushes/stamp_snow1.png
diff --git a/brushes/stamp_squares.png b/brushes/stamp_squares.png
diff --git a/brushes/stamp_star1.png b/brushes/stamp_star1.png
diff --git a/brushes/stroke1.png b/brushes/stroke1.png
diff --git a/brushes/thumb_fur0.png b/brushes/thumb_fur0.png
diff --git a/brushes/thumb_fur1.png b/brushes/thumb_fur1.png
diff --git a/brushes/thumb_grunge0.png b/brushes/thumb_grunge0.png
diff --git a/brushes/thumb_roundflat.png b/brushes/thumb_roundflat.png
diff --git a/brushes/thumb_roundsoft.png b/brushes/thumb_roundsoft.png
diff --git a/brushes/thumb_smoke0.png b/brushes/thumb_smoke0.png
diff --git a/index.html b/index.html
@@ -24,6 +24,7 @@
     <script src="src/components/ui.js"></script>
     <!-- brushes -->
     <script src="src/brushes/line.js"></script>
+    <script src="src/brushes/stamp.js"></script>
     <script src="src/brushes/spheres.js"></script>
     <script src="src/brushes/cubes.js"></script>
     <!-- css -->

diff --git a/src/brushes/line.js b/src/brushes/line.js
@@ -41,8 +41,8 @@ var line = {
     if (type === 'shaded') {
       defaultOptions = {
         color: this.data.color,
-        roughness: 0.5,
-        metalness: 0.5,
+        roughness: 0.75,
+        metalness: 0.25,
         side: THREE.DoubleSide,
       };
     }
@@ -178,77 +178,117 @@ var line = {
 };
 
 var lines = [
-  {
-    name: 'flat',
+  { 
+    name: 'flat', 
     materialOptions: {
       type: 'flat'
-    },
-    thumbnail: ''
+    }, 
+    thumbnail: '' 
   },
-  {
-    name: 'shaded',
+  { 
+    name: 'smooth', 
     materialOptions: {
-      type: 'shaded'
-    },
-    thumbnail: ''
+      type: 'smooth'
+    }, 
+    thumbnail: '' 
   },
-  {
-    name: 'bristles',
+  { 
+    name: 'squared-textured', 
     materialOptions: {
-      type: 'shaded',
-      textureSrc: 'brushes/bristles0.png'
-    },
-    thumbnail: 'brushes/thumb_bristles0.png'
+      type: 'textured', 
+      textureSrc: 'brushes/squared_textured.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png' 
+  },
+  { 
+    name: 'line-gradient', 
+    materialOptions: {
+      type: 'textured', 
+      textureSrc: 'brushes/line_gradient.png'
+    }, 
+    thumbnail: 'brushes/line_gradient.png' 
+  },
+  { 
+    name: 'silky-flat', 
+    materialOptions: {
+      type: 'textured', 
+      textureSrc: 'brushes/silky_flat.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png' 
+  },
+  { 
+    name: 'silky-textured',
+    materialOptions: {
+      type: 'textured', 
+      textureSrc: 'brushes/silky_textured.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png' 
+  },
+  { 
+    name: 'lines1', 
+    materialOptions: {
+      type: 'textured', 
+      textureSrc: 'brushes/lines1.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png' 
   },
-  {
-    name: 'fur',
+  { 
+    name: 'lines2', 
     materialOptions: {
-      type: 'shaded',
-      textureSrc: 'brushes/fur0.png'
-    },
-    thumbnail: 'brushes/thumb_fur0.png'
+      type: 'textured', 
+      textureSrc: 'brushes/lines2.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png' 
   },
-  {
-    name: 'fur 2',
+  { 
+    name: 'lines3', 
     materialOptions: {
-      type: 'shaded',
-      textureSrc: 'brushes/fur1.png'
-    },
-    thumbnail: 'brushes/thumb_fur1.png'
+      type: 'textured', 
+      textureSrc: 'brushes/lines3.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png' 
   },
-  {
-    name: 'grunge',
+  { 
+    name: 'lines4', 
     materialOptions: {
-      type: 'shaded',
-      textureSrc: 'brushes/grunge0.png'
-    },
-    thumbnail: 'brushes/thumb_grunge0.png'
+      type: 'textured', 
+      textureSrc: 'brushes/lines4.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png' 
   },
-  {
-    name: 'roundflat',
+  { 
+    name: 'lines5', 
     materialOptions: {
-      type: 'shaded',
-      textureSrc: 'brushes/roundflat.png'
-    },
-    thumbnail: 'brushes/thumb_roundflat.png'
+      type: 'textured', 
+      textureSrc: 'brushes/lines5.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png' 
   },
-  {
-    name: 'roundsoft',
+  { 
+    name: 'line-grunge1', 
     materialOptions: {
-      type: 'shaded',
-      textureSrc: 'brushes/roundsoft.png'
-    },
-    thumbnail: 'brushes/thumb_roundsoft.png'
+      type: 'textured', 
+      textureSrc: 'brushes/line_grunge1.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png' 
   },
-  {
-    name: 'smoke',
+  { 
+    name: 'line-grunge2', 
     materialOptions: {
-      type: 'textured',
-      textureSrc: 'brushes/smoke0.png'
-    },
-    thumbnail: 'brushes/thumb_smoke0.png'
+      type: 'textured', 
+      textureSrc: 'brushes/line_grunge2.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png' 
   },
-]
+  { 
+    name: 'line-grunge3', 
+    materialOptions: {
+      type: 'textured', 
+      textureSrc: 'brushes/line_grunge3.png'
+    }, 
+    thumbnail: 'brushes/thumb_bristles0.png'
+  }
+];
 
 for (var i = 0; i < lines.length; i++) {
   var definition = lines[i];