Merge pull request #41 from oligami-0424/main

add ctrl+z ctrl+y ctrl+delete
oligamiq · Apr 8, 2023 · 921c206 · 921c206
2 parents beeca0e + 4db7a4e
commit 921c206
Show file tree

Hide file tree

Showing 14 changed files with 479 additions and 134 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 oligami
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # IroSphere
 
 これは[Tali](https://github.com/TaliPhoto)さんが、[youtube](https://youtu.be/jrCr4j_qdPo)で紹介した、アイデアまで含めてCC0のソフトであるIroSphereというソフトをtauriというフレームワークで一から書き直したものです。<br>
-[本家](https://github.com/TaliPhoto/IroSphere)
+[本家](https://github.com/TaliPhoto/IroSphere)<br>
 機能の要望などはissueなどにお願いします。
 
 ## install方法
@@ -12,7 +12,8 @@ linux(debian系列): deb <br>
 linux: AppImage<br>
 mac: dmg<br>
 ※私はwindowユーザーなので、web版以外は実際に他のOSで正常に動作するかは知りません<br>
-※linuxではrustがlowercaseな都合上アプリ名がiro-sphereとなっているようなので気を付けてください
+※linuxではrustがlowercaseな都合上アプリ名がiro-sphereとなっているようなので気を付けてください<br>
+実際のサイズは6.6MB程です！　手軽にどうぞ！　（Windows）
 
 ## 使い方
 画像をクリックまたは長押しで右のSphereに色が付きます。<br>
@@ -33,6 +34,7 @@ Fキーなどの便利機能や他の機能などは搭載していません。
 - fキーの実装
 - リセット方法がない
 - スマホ用に縦長モードを搭載
+- ショトカ以外でファイルを開く方法を考える
 
 ## License
 Mit Licenseです。アイコンなどがデフォルトのままですから...
diff --git a/index.html b/index.html
@@ -5,6 +5,7 @@
  <meta charset="UTF-8" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <title>IroSphere</title>
+ <link rel="stylesheet" href="./src/style.scss">
 </head>
 
 <body>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "irosphere",
  "private": true,
- "version": "1.0.2",
+ "version": "1.0.3",
  "type": "module",
  "scripts": {
  "tauri": "tauri",
@@ -12,6 +12,7 @@
  },
  "devDependencies": {
  "@types/three": "^0.150.1",
+ "sass": "^1.61.0",
  "three": "^0.151.2",
  "typescript": "^4.9.3",
  "vite": "^4.2.0"

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "IroSphere"
-version = "1.0.2"
+version = "1.0.3"
 description = "A Tauri App"
 authors = ["oligami"]
 license = "MIT License"

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
  },
  "package": {
  "productName": "IroSphere",
- "version": "1.0.2"
+ "version": "1.0.3"
  },
  "tauri": {
  "allowlist": {