Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development→main #14

Open
wants to merge 106 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
6e83a81
ignoreを作り直します
bearl27 May 11, 2024
21ab396
Update .gitignore
bearl27 May 11, 2024
97a4463
All - in one
bearl27 May 11, 2024
50c7668
all - in one 2
bearl27 May 11, 2024
40de199
カメラが動くようになった
bearl27 May 11, 2024
a3e95a5
廊下の完成
bearl27 May 11, 2024
29997cc
壁付きの廊下完成
bearl27 May 11, 2024
01a7f4e
廊下と壁のせってい完成
bearl27 May 11, 2024
6622d5d
なぜgitignoreが動かない?
bearl27 May 11, 2024
195652b
ignore再始動
bearl27 May 11, 2024
94fc995
Django_First
zono0013 May 12, 2024
43f5774
場所移動
zono0013 May 12, 2024
75e1a14
ignoreミス
zono0013 May 12, 2024
8919994
タイピングミス
zono0013 May 12, 2024
296c6fc
アプリの位置ミス
zono0013 May 12, 2024
22d276e
アプリ位置ミス2
zono0013 May 12, 2024
107dbde
パスミス
zono0013 May 12, 2024
8535cf9
動作確認
zono0013 May 12, 2024
89445d8
settingとprocfile変更
zono0013 May 12, 2024
b89f6cf
procfile変更
zono0013 May 12, 2024
e7a552a
Merge branch 'dev/API/Django' of https://github.com/anshibagundan/tea…
zono0013 May 12, 2024
19c27e8
procfile修正
zono0013 May 12, 2024
8168859
Merge branch 'dev/API/Django' of https://github.com/anshibagundan/tea…
zono0013 May 12, 2024
38867b7
修正
zono0013 May 12, 2024
a0eecfc
設定修正
zono0013 May 12, 2024
efb11e6
Posgreは行けた
zono0013 May 12, 2024
ff769b9
たぶん行けた
zono0013 May 12, 2024
47026aa
パス
zono0013 May 12, 2024
b0ed405
stutic 変更
zono0013 May 12, 2024
ae903e1
url修正
zono0013 May 12, 2024
f612f2a
デバッグ
zono0013 May 12, 2024
4486cdc
デバッグ2
zono0013 May 12, 2024
5083875
デバッグ2
zono0013 May 12, 2024
28cdbda
pyのバージョン変えてみる
zono0013 May 13, 2024
37a15f5
デプロイ完了
zono0013 May 13, 2024
9504a3c
test
MegKuma May 13, 2024
05861e9
画像以外はうまい事できた
zono0013 May 13, 2024
1c00fed
urls変更
zono0013 May 13, 2024
b66f82f
画像をデータベースにアップロードandウェブサイトでの取り出し成功
zono0013 May 13, 2024
189c6a4
書き忘れ
zono0013 May 13, 2024
c06028b
Update .gitignore, add mediafile
zono0013 May 13, 2024
a7e1130
Unityで呼び出せるようにした
zono0013 May 13, 2024
10ee524
写真のでも
bearl27 May 14, 2024
a59daac
廊下への写真の配置のみ完了,廊下の時と部屋の時で変える
bearl27 May 14, 2024
c40ccdd
roomの壁
bearl27 May 14, 2024
e6ced8e
api ユーザーデータのやつ追加
zono0013 May 14, 2024
0a0505d
通路(部屋なしがstage1・部屋ありがstage2)
MegKuma May 15, 2024
ea4211d
額縁のfbxファイル
MegKuma May 15, 2024
ff6c94f
各素材のテクスチャ、それぞれ名前に対応してるよ
MegKuma May 15, 2024
8746126
key操作
bearl27 May 15, 2024
e68278d
写真と部屋の連携中
bearl27 May 15, 2024
b6475f5
写真がでかい...
bearl27 May 15, 2024
9a392c8
わたしの仕事は終わりだ!!
bearl27 May 15, 2024
9f78a22
歩くのも,写真の配置も完成
bearl27 May 16, 2024
b141946
手の位置変更
bearl27 May 17, 2024
5fb75f6
なぜか追加されたものの削除
bearl27 May 17, 2024
0b60185
藤吉との連携初めて,VRでも動く
bearl27 May 17, 2024
1c3b9de
写真の配置(ソートできてない)
stk1201 May 17, 2024
c2aaff7
web作成とAPI追加
zono0013 May 17, 2024
d6da8c6
画像配置を一部修正
stk1201 May 17, 2024
947a8ba
いらないものを消す
stk1201 May 17, 2024
069fa08
サイズ調整
stk1201 May 17, 2024
697d0fe
ライトつけた
stk1201 May 17, 2024
a6bfc51
写真の配置完了
stk1201 May 17, 2024
0a16e7c
tagの対応成功!
stk1201 May 17, 2024
7156ccd
webデザイン基盤完成
zono0013 May 17, 2024
6daa562
写真部分変更忘れ
zono0013 May 17, 2024
ce6fa5d
写真の比率修正
zono0013 May 17, 2024
aaae9b9
tagがs1とかになったので修正
stk1201 May 17, 2024
fc8192d
日本語フォント追加(圧縮)
stk1201 May 18, 2024
8dd6f0c
写真系統のボタン以外ほぼ完成
zono0013 May 18, 2024
37ea62b
DBに送信する準備(テストしてない)
stk1201 May 18, 2024
767327a
日本語フォント(ひらがな)
stk1201 May 18, 2024
85e34a0
最後のところにおわり表示
stk1201 May 18, 2024
53d9435
写真の編集と削除以外
zono0013 May 18, 2024
2efb610
おわりの文字完成
bearl27 May 18, 2024
352f17c
Merge pull request #9 from anshibagundan/unity/2003
bearl27 May 18, 2024
65857e9
今までの素材のblenderファイル。aisleの中に2つの通路とかいろんな素材(使わなかったのも含めて入ってる)
MegKuma May 18, 2024
c2034bf
Camera完成
bearl27 May 18, 2024
f05f198
Merge pull request #10 from anshibagundan/unity/2101
bearl27 May 18, 2024
ce5ecd0
修正
zono0013 May 18, 2024
f592caa
通路の色変えました。数字ついてない方が部屋なし。2の方が部屋付き
MegKuma May 18, 2024
37c08ef
操作説明の看板とテクスチャ
MegKuma May 18, 2024
abcf7d6
通路横幅分のパーテションとテクスチャ
MegKuma May 18, 2024
2652714
BGMと最後のパーテーション
bearl27 May 19, 2024
06c5805
無駄な修正
zono0013 May 19, 2024
e119270
いったん削除
zono0013 May 19, 2024
5d0f5e3
一気に追加
zono0013 May 19, 2024
1ca7be3
横向きパーテションのテクスチャの修正版
MegKuma May 19, 2024
9de3851
webの写真追加
zono0013 May 19, 2024
2d934a4
写真
zono0013 May 19, 2024
58d175c
tagの追加まで
zono0013 May 19, 2024
521c7ee
とりま完成
bearl27 May 19, 2024
c3d6244
tagの削除まで
zono0013 May 19, 2024
1565649
syusei
zono0013 May 19, 2024
71b7514
らすt
zono0013 May 19, 2024
ff39551
tag忘れ
zono0013 May 19, 2024
12588b5
完璧完成
bearl27 May 19, 2024
e15a144
login系のwebフロント
zono0013 May 19, 2024
1b8987e
Merge pull request #11 from anshibagundan/unity/2001
bearl27 May 19, 2024
2cf70be
ファイル変更
MegKuma May 19, 2024
0280fc7
Delete .gitignore
bearl27 May 19, 2024
23332bb
Delete .gitignore
bearl27 May 19, 2024
4347314
Merge pull request #12 from anshibagundan/new/APIandWeb1
bearl27 May 19, 2024
805416a
Merge pull request #13 from anshibagundan/modeling/4001
bearl27 May 19, 2024
01297be
Delete README.md
bearl27 May 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .gitattributes 2
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.aar filter=lfs diff=lfs merge=lfs -text
*.so filter=lfs diff=lfs merge=lfs -text
*.assets filter=lfs diff=lfs merge=lfs -text
72 changes: 0 additions & 72 deletions .gitignore

This file was deleted.

18 changes: 18 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

144 changes: 144 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

web: gunicorn vr_museum.wsgi --log-file -
40 changes: 0 additions & 40 deletions README.md

This file was deleted.

Binary file added aisle2_tex3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added aisle_tex3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added blender/aisle.blend
Binary file not shown.
Binary file added blender/pic_frame.blend
Binary file not shown.
Binary file added blender/pic_frame2.blend
Binary file not shown.
Binary file added blender/pic_frame3.blend
Binary file not shown.
Binary file added fbx/partation.fbx
Binary file not shown.
Binary file added fbx/pic_frame1.fbx
Binary file not shown.
Binary file added fbx/pic_frame2.fbx
Binary file not shown.
Binary file added fbx/pic_frame3.fbx
Binary file not shown.
Binary file added fbx/signboard.fbx
Binary file not shown.
Binary file added fbx/stage1.fbx
Binary file not shown.
Binary file added fbx/stage2.fbx
Binary file not shown.
Binary file added frame1_tex.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frame2_tex.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frame3_tex.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions manage.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env python
"""Django's command-line utility for administrative tasks."""
import os
import sys


def main():
"""Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vr_museum.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
"available on your PYTHONPATH environment variable? Did you "
"forget to activate a virtual environment?"
) from exc
execute_from_command_line(sys.argv)


if __name__ == '__main__':
main()
Binary file added media/background_img.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/documents/144144.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/sumple1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/sumple2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/sumple3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/sumple4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions museum/.idea/.idea.museum.dir/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions museum/.idea/.idea.museum.dir/.idea/.gitignore 2

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading