#2 remove sdf from non-sdf icons

unvt · Dec 10, 2023 · 36b4be8 · 36b4be8
1 parent dac8908
commit 36b4be8
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/src/lib/image.ts b/src/lib/image.ts
@@ -141,13 +141,22 @@ export class Image {
   }
 
   to_obj(): SpriteImage {
+    if (this.sdf) {
+      return {
+        height: this.buffer_height(),
+        width: this.buffer_width(),
+        x: this.x,
+        y: this.y,
+        pixelRatio: this.ratio,
+        sdf: this.sdf,
+      }
+    }
     return {
-      height: this.sdf ? this.buffer_height() : this.real_height(),
-      width: this.sdf ? this.buffer_width() : this.real_width(),
+      height: this.real_height(),
+      width: this.real_width(),
       x: this.x,
       y: this.y,
       pixelRatio: this.ratio,
-      sdf: this.sdf,
     }
   }
 }

diff --git a/tests/fixtures/test1.json b/tests/fixtures/test1.json
@@ -1 +1 @@
-{"airport":{"height":15,"width":15,"x":0,"y":43,"pixelRatio":1,"sdf":false},"my_bbq":{"height":32,"width":32,"x":43,"y":0,"pixelRatio":1,"sdf":false},"airport_xl":{"height":43,"width":43,"x":0,"y":0,"pixelRatio":1,"sdf":false}}
+{"airport":{"height":15,"width":15,"x":0,"y":43,"pixelRatio":1},"my_bbq":{"height":32,"width":32,"x":43,"y":0,"pixelRatio":1},"airport_xl":{"height":43,"width":43,"x":0,"y":0,"pixelRatio":1}}
diff --git a/tests/fixtures/test2.json b/tests/fixtures/test2.json
@@ -1 +1 @@
-{"airport":{"height":30,"width":30,"x":0,"y":86,"pixelRatio":2,"sdf":false},"airport_xl":{"height":86,"width":86,"x":0,"y":0,"pixelRatio":2,"sdf":false},"my_bbq":{"height":64,"width":64,"x":86,"y":0,"pixelRatio":2,"sdf":false}}
+{"airport":{"height":30,"width":30,"x":0,"y":86,"pixelRatio":2},"airport_xl":{"height":86,"width":86,"x":0,"y":0,"pixelRatio":2},"my_bbq":{"height":64,"width":64,"x":86,"y":0,"pixelRatio":2}}
diff --git a/tests/fixtures/test3.json b/tests/fixtures/test3.json
@@ -1 +1 @@
-{"airport":{"height":15,"width":15,"x":0,"y":43,"pixelRatio":1,"sdf":false},"my_bbq":{"height":32,"width":32,"x":43,"y":0,"pixelRatio":1,"sdf":false},"airport_xl":{"height":43,"width":43,"x":0,"y":0,"pixelRatio":1,"sdf":false}}
+{"airport":{"height":15,"width":15,"x":0,"y":43,"pixelRatio":1},"my_bbq":{"height":32,"width":32,"x":43,"y":0,"pixelRatio":1},"airport_xl":{"height":43,"width":43,"x":0,"y":0,"pixelRatio":1}}
diff --git a/tests/fixtures/test3@2x.json b/tests/fixtures/test3@2x.json
@@ -1 +1 @@
-{"airport":{"height":30,"width":30,"x":0,"y":86,"pixelRatio":2,"sdf":false},"airport_xl":{"height":86,"width":86,"x":0,"y":0,"pixelRatio":2,"sdf":false},"my_bbq":{"height":64,"width":64,"x":86,"y":0,"pixelRatio":2,"sdf":false}}
+{"airport":{"height":30,"width":30,"x":0,"y":86,"pixelRatio":2},"airport_xl":{"height":86,"width":86,"x":0,"y":0,"pixelRatio":2},"my_bbq":{"height":64,"width":64,"x":86,"y":0,"pixelRatio":2}}
diff --git a/tests/fixtures/test4.json b/tests/fixtures/test4.json
@@ -1 +1 @@
-{"airport":{"height":15,"width":15,"x":0,"y":43,"pixelRatio":1,"sdf":false},"arrow":{"height":15,"width":15,"x":15,"y":43,"pixelRatio":1,"sdf":false},"circle":{"height":15,"width":15,"x":30,"y":43,"pixelRatio":1,"sdf":false},"my_bbq":{"height":32,"width":32,"x":43,"y":0,"pixelRatio":1,"sdf":false},"airport_xl":{"height":43,"width":43,"x":0,"y":0,"pixelRatio":1,"sdf":false}}
+{"airport":{"height":15,"width":15,"x":0,"y":43,"pixelRatio":1},"arrow":{"height":15,"width":15,"x":15,"y":43,"pixelRatio":1},"circle":{"height":15,"width":15,"x":30,"y":43,"pixelRatio":1},"my_bbq":{"height":32,"width":32,"x":43,"y":0,"pixelRatio":1},"airport_xl":{"height":43,"width":43,"x":0,"y":0,"pixelRatio":1}}
diff --git a/tests/fixtures/test5.json b/tests/fixtures/test5.json
diff --git a/tests/fixtures/test5@2x.json b/tests/fixtures/test5@2x.json
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"airport":{"height":15,"width":15,"x":0,"y":43,"pixelRatio":1,"sdf":false},"my_bbq":{"height":32,"width":32,"x":43,"y":0,"pixelRatio":1,"sdf":false},"airport_xl":{"height":43,"width":43,"x":0,"y":0,"pixelRatio":1,"sdf":false}}
		{"airport":{"height":15,"width":15,"x":0,"y":43,"pixelRatio":1},"my_bbq":{"height":32,"width":32,"x":43,"y":0,"pixelRatio":1},"airport_xl":{"height":43,"width":43,"x":0,"y":0,"pixelRatio":1}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"airport":{"height":30,"width":30,"x":0,"y":86,"pixelRatio":2,"sdf":false},"airport_xl":{"height":86,"width":86,"x":0,"y":0,"pixelRatio":2,"sdf":false},"my_bbq":{"height":64,"width":64,"x":86,"y":0,"pixelRatio":2,"sdf":false}}
		{"airport":{"height":30,"width":30,"x":0,"y":86,"pixelRatio":2},"airport_xl":{"height":86,"width":86,"x":0,"y":0,"pixelRatio":2},"my_bbq":{"height":64,"width":64,"x":86,"y":0,"pixelRatio":2}}