Merge pull request #39 from MidraLab/develop

v0.0.5

Author: ayutaz

.editorconfig

@@ -0,0 +1,116 @@
+
+[*]
+charset = utf-8-bom
+end_of_line = crlf
+trim_trailing_whitespace = false
+insert_final_newline = false
+indent_style = space
+indent_size = 4
+
+# Microsoft .NET properties
+csharp_new_line_before_catch = false
+csharp_new_line_before_else = false
+csharp_new_line_before_finally = false
+csharp_new_line_before_members_in_object_initializers = false
+csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
+csharp_style_namespace_declarations = block_scoped:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+dotnet_naming_rule.unity_serialized_field_rule.import_to_resharper = True
+dotnet_naming_rule.unity_serialized_field_rule.resharper_description = Unity serialized field
+dotnet_naming_rule.unity_serialized_field_rule.resharper_guid = 5f0fdb63-c892-4d2c-9324-15c80b22a7ef
+dotnet_naming_rule.unity_serialized_field_rule.severity = warning
+dotnet_naming_rule.unity_serialized_field_rule.style = lower_camel_case_style
+dotnet_naming_rule.unity_serialized_field_rule.symbols = unity_serialized_field_symbols
+dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
+dotnet_naming_symbols.unity_serialized_field_symbols.applicable_accessibilities = *
+dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds = 
+dotnet_naming_symbols.unity_serialized_field_symbols.resharper_applicable_kinds = unity_serialised_field
+dotnet_naming_symbols.unity_serialized_field_symbols.resharper_required_modifiers = instance
+dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none
+dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+
+# ReSharper properties
+resharper_apply_auto_detected_rules = false
+resharper_autodetect_indent_settings = true
+resharper_braces_for_dowhile = required_for_multiline
+resharper_braces_for_foreach = required
+resharper_braces_for_ifelse = required
+resharper_braces_for_using = required_for_multiline_statement
+resharper_formatter_off_tag = @formatter:off
+resharper_formatter_on_tag = @formatter:on
+resharper_formatter_tags_enabled = true
+resharper_indent_preprocessor_directives = normal
+resharper_place_simple_anonymousmethod_on_single_line = false
+resharper_place_simple_case_statement_on_same_line = true
+resharper_place_simple_embedded_statement_on_same_line = false
+resharper_show_autodetect_configure_formatting_tip = false
+resharper_use_indent_from_vs = false
+resharper_wrap_for_stmt_header_style = wrap_if_long
+
+# ReSharper inspection severities
+resharper_arrange_namespace_body_highlighting = hint
+resharper_arrange_redundant_parentheses_highlighting = hint
+resharper_arrange_this_qualifier_highlighting = none
+resharper_arrange_type_member_modifiers_highlighting = hint
+resharper_arrange_type_modifiers_highlighting = hint
+resharper_built_in_type_reference_style_for_member_access_highlighting = hint
+resharper_built_in_type_reference_style_highlighting = hint
+resharper_check_namespace_highlighting = none
+resharper_c_sharp_build_cs_invalid_module_name_highlighting = none
+resharper_enforce_do_while_statement_braces_highlighting = hint
+resharper_enforce_fixed_statement_braces_highlighting = hint
+resharper_enforce_foreach_statement_braces_highlighting = warning
+resharper_enforce_for_statement_braces_highlighting = hint
+resharper_enforce_if_statement_braces_highlighting = hint
+resharper_enforce_lock_statement_braces_highlighting = hint
+resharper_enforce_using_statement_braces_highlighting = hint
+resharper_enforce_while_statement_braces_highlighting = hint
+resharper_mvc_action_not_resolved_highlighting = warning
+resharper_mvc_area_not_resolved_highlighting = warning
+resharper_mvc_controller_not_resolved_highlighting = warning
+resharper_mvc_masterpage_not_resolved_highlighting = warning
+resharper_mvc_partial_view_not_resolved_highlighting = warning
+resharper_mvc_template_not_resolved_highlighting = warning
+resharper_mvc_view_component_not_resolved_highlighting = warning
+resharper_mvc_view_component_view_not_resolved_highlighting = warning
+resharper_mvc_view_not_resolved_highlighting = warning
+resharper_razor_assembly_not_resolved_highlighting = warning
+resharper_shift_expression_right_operand_not_equal_real_count_highlighting = none
+resharper_suggest_var_or_type_built_in_types_highlighting = hint
+resharper_suggest_var_or_type_elsewhere_highlighting = hint
+resharper_suggest_var_or_type_simple_types_highlighting = hint
+resharper_web_config_module_not_resolved_highlighting = warning
+resharper_web_config_type_not_resolved_highlighting = warning
+resharper_web_config_wrong_module_highlighting = warning
+
+[{*.har,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json}]
+indent_style = space
+indent_size = 2
+
+[{*.yaml,*.yml}]
+indent_style = space
+indent_size = 2
+
+[*.asmdef]
+indent_style = space
+indent_size = 2
+
+[*.asmref]
+indent_style = space
+indent_size = 2
+
+[*.inputactions]
+indent_style = space
+indent_size = 2
+
+[*.{appxmanifest,asax,ascx,aspx,axaml,blockshader,build,c,c++,c++m,cc,ccm,cginc,compute,cp,cpp,cppm,cs,cshtml,cu,cuh,cxx,cxxm,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,h++,hh,hlsl,hlsli,hlslinc,hp,hpp,hxx,icc,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,mxx,nuspec,paml,razor,resw,resx,shader,shaderFoundry,skin,tcc,tpp,urtshader,usf,ush,uxml,vb,xaml,xamlx,xoml,xsd}]
+indent_style = space
+indent_size = 4
+tab_width = 4

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: "[BUG] "
+labels: bug
+assignees: ''
+---
+
+## バグの説明
+
+バグの詳細を説明してください。何が期待され、実際には何が起こったのかを記述してください。
+
+## 再現手順
+
+1. どのようにバグを再現しましたか？(例: "設定 -> オプション -> 使用する")
+2. 同じ手順を行ったときに、何を見ましたか？
+
+## 期待する結果
+
+何を期待していたかを記述してください。
+
+## スクリーンショット
+
+可能であれば、問題のスクリーンショットを添付してください。
+
+## 環境
+
+- OS: [例: Windows, macOS]
+- Unityのバージョン: [例: 6000.0.31f1]
+- その他の依存関係:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+title: "[FEATURE] "
+labels: enhancement
+assignees: ''
+---
+
+## 機能の説明
+
+この機能によって達成したいことを簡潔に説明してください。どのようなサポートが必要ですか？
+
+## 使用例
+
+どのようにこの機能が使用されるかの例を提供してください。
+
+## 追加のコンテキスト
+
+他の情報、関連するリンク、期待する結果のビジュアルなどがあれば追加してください。

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1,30 @@
+---
+name: Pull Request
+about: Submit a pull request for review
+title: "[PR] "
+labels: ''
+assignees: ''
+---
+
+## 概要
+
+このプルリクエストで何を解決したのか、どのように貢献するのかを説明します。
+
+## 変更内容
+
+以下の点を詳しく説明してください:
+
+- [ ] 変更した内容を簡潔にリストアップ
+- [ ] 新しい機能、修正されたバグ、その他の重要な変更について説明
+
+## 関連するIssue
+
+このPRに関連するIssueがあれば、リンクをここに記述してください (例: #123)。
+
+## 検証手順
+
+この変更をテストする手順を提供してください。
+
+## その他のコンテキスト
+
+追加の情報があればここに記述してください。

.github/scripts/translate_readme.py

@@ -1,16 +1,18 @@
-import openai
+from openai import OpenAI
 import os
 
+client = OpenAI(api_key=os.environ["OPENAI_API_KEY"])
+
 def translate_text(text, target_language):
-    openai.api_key = os.environ["OPENAI_API_KEY"]
-    completion = openai.ChatCompletion.create(
-        model="gpt-4o-mini",
+    completion = client.chat.completions.create(
+        model="gpt-4o-mini",  # 使用するモデルの指定
         messages=[
             {"role": "system", "content": "You are a helpful assistant."},
             {"role": "user", "content": f"Translate the following text to {target_language}: {text}"}
         ]
     )
-    return completion.choices[0].message['content']
+    # メッセージのコンテンツに直接アクセスする
+    return completion.choices[0].message.content
 
 def main():
     # Read the original README
@@ -27,5 +29,15 @@ def main():
     with open('README_CN.md', 'w', encoding='utf-8') as file:
         file.write(translated_cn)
 
+    # Translate to Spanish
+    translated_es = translate_text(original_text, 'Spanish')
+    with open('README_ES.md', 'w', encoding='utf-8') as file:
+        file.write(translated_es)
+
+    # Translate to French
+    translated_fr = translate_text(original_text, 'French')
+    with open('README_FR.md', 'w', encoding='utf-8') as file:
+        file.write(translated_fr)
+
 if __name__ == "__main__":
     main()

.github/workflows/branch-restriction-check.yml

@@ -0,0 +1,20 @@
+name: Check branch for PR
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  check_branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check PR branch
+        run: |
+          echo "The source branch for this PR is: ${{ github.head_ref }}"
+          if [[ "${{ github.head_ref }}" != "develop" ]]; then
+            echo "Warning: This PR is from the '${{ github.head_ref }}' branch. Please ensure this is intended."
+            exit 1  # 失敗ステータスを返してPRをマージ不可にする
+          else
+            echo "This PR is from the correct branch (develop)."
+          fi

.github/workflows/build.yml

@@ -1,4 +1,5 @@
 name: Run build
+
 on:
   workflow_dispatch: {}
   push:
@@ -10,7 +11,21 @@ on:
     types: [opened, synchronize, reopened]
 
 jobs:
+  check-branch:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'  # PRイベントの場合にのみ実行
+    steps:
+      - name: Check PR branch
+        run: |
+          echo "The source branch for this PR is: ${{ github.head_ref }}"
+          if [[ "${{ github.head_ref }}" == "develop" ]]; then
+            echo "This PR is from the 'develop' branch. Proceeding with build."
+          else
+            echo "This PR is from the '${{ github.head_ref }}' branch. Non-develop branches are allowed."
+          fi
+
   build:
+    needs: check-branch  # check-branch ジョブの成功が必要
     name: Run builds for Windows, Mac
     strategy:
       fail-fast: false

.github/workflows/translate_readme.yml

@@ -2,33 +2,57 @@ name: Translate README
 
 on:
   pull_request:
+    branches:
+      - develop
     paths:
       - README.md
 
 jobs:
   translate:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
-
-      - name: Install OpenAI library
-        run: pip install openai
-
-      - name: Run translation script
-        env:
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-        run: python .github/scripts/translate_readme.py
-
-      - name: Commit changes
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "GitHub Action"
-          git add README_EN.md README_CN.md
-          git commit -m "Update translations" || echo "No changes to commit"
-          git push
+    - name: Checkout repository
+      uses: actions/[email protected]
+
+    - name: Set up Python
+      uses: actions/[email protected]
+      with:
+        python-version: '3.11'
+
+    - name: Install OpenAI library
+      run: pip install openai
+
+    - name: Run translation script
+      env:
+        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+      run: python .github/scripts/translate_readme.py
+
+    - name: Commit changes
+      run: |
+        git config --local user.email "[email protected]"
+        git config --local user.name "GitHub Action"
+
+        # 変更をステージしてコミット
+        git add README_EN.md README_CN.md README_ES.md README_FR.md
+        if git commit -m "Update translations"; then
+          echo "Changes committed successfully."
+
+          # Pullでリモートの最新の変更を取り込み、リベース
+          if git pull --rebase origin ${{ github.head_ref }}; then
+            echo "Successfully rebased."
+          else
+            echo "Rebase failed. Please review the errors."
+            exit 1  # エラーが発生した場合、処理を中止
+          fi
+
+          # スタッシュが必要かを確認
+          if git stash list | grep -q "stash@{0}"; then
+            # スタッシュが存在する場合はポップする
+            git stash pop
+          fi
+
+          # 最後にプッシュ
+          git push origin HEAD:${{ github.head_ref }}
+        else
+          echo "No changes to commit"
+        fi

.gitignore

@@ -156,4 +156,5 @@ sysinfo.txt
 # End of https://www.toptal.com/developers/gitignore/api/unity,rider
 
 uDesktopMascot.zip
-uDesktopMascotBuild/*
+uDesktopMascotBuild/*
+.vscode/*