Compare commits

..

322 Commits

Author SHA1 Message Date
정영민
04325eed1b Window UI 동적 크기 조절 기능 개선 2025-06-12 18:08:43 +09:00
wsh
9f618c0ffc 1 2025-06-12 16:15:53 +09:00
wsh
5e93961e9e Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/Studio 2025-06-12 11:10:04 +09:00
25c999e349 Merge pull request '프로그램 아이콘 변경' (#157) from pgd/20250612_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/157
2025-06-12 11:09:53 +09:00
geondo55
824511e46f 프로그램 아이콘 변경 2025-06-12 10:22:47 +09:00
wsh
5a366266d3 Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/Studio 2025-06-12 09:40:00 +09:00
eb84293dd2 Merge pull request 'API, MQTT Setting 레이아웃 수정' (#156) from jym/250611_03 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/156
2025-06-12 09:38:54 +09:00
정영민
1acea5cf30 마우스 스크롤 속도 조정 2025-06-11 18:02:48 +09:00
정영민
2cbbbf8dec API, MQTT Setting 레이아웃 수정 2025-06-11 17:23:11 +09:00
wsh
f832bdd8c6 1 2025-06-11 16:51:05 +09:00
wsh
99a685a30f 1 2025-06-11 16:50:56 +09:00
64c527db69 Merge pull request '프로젝트 생성 시 이미 해당 파일이 존재 하는지 확인하는 기능' (#155) from jym/250611_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/155
2025-06-11 16:49:35 +09:00
60773505b1 Merge pull request '에셋 라이브러리 스크롤 버그' (#154) from pgd/20250611_merge into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/154
2025-06-11 16:49:23 +09:00
정영민
3fc2c4ff5c TopMenuNewProject Button 적용 2025-06-11 16:41:37 +09:00
정영민
3eed27c15d 프로젝트 생성 시 이미 해당 파일이 존재 하는지 확인하는 기능 2025-06-11 16:39:39 +09:00
jym
131c8d28e3 Merge pull request 'jym/250611_01' (#153) from jym/250611_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/153
2025-06-11 16:37:08 +09:00
geondo55
b294098ac3 에셋 라이브러리 스크롤 버그 2025-06-11 16:30:46 +09:00
정영민
f7de18725e Resource 폴더 내의 AssetInfo 오류 수정 2025-06-11 14:26:20 +09:00
정영민
5165c13b05 자산 관리자 기능 개발 2025-06-11 11:02:05 +09:00
정영민
2b666e856a 자산 관리자 - 에셋 하이어라키 기능 개발 2025-06-11 08:51:23 +09:00
4c92eef18a Merge pull request 'Run 모드에서 하이어라키 창 내부 조작이 불가능 하게끔 수정' (#152) from pgd/20250610_4 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/152
2025-06-10 18:26:18 +09:00
b969a17059 Merge pull request '에셋 썸네일 비율 수정 및 썸네일 라이트 추가' (#151) from pgd/20250610_3 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/151
2025-06-10 18:26:09 +09:00
geondo55
a52c041f47 Run 모드에서 하이어라키 창 내부 조작이 불가능 하게끔 수정 2025-06-10 17:27:49 +09:00
geondo55
09ad8abf47 에셋 썸네일 비율 수정 및 썸네일 라이트 추가 2025-06-10 16:19:20 +09:00
wsh
fc1be3b301 1 2025-06-10 14:42:04 +09:00
wsh
78cebf10c2 1 2025-06-10 13:55:15 +09:00
wsh
104b83cb39 Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/Studio 2025-06-10 10:49:22 +09:00
wsh
0a8262fa29 실행 에러 제거 2025-06-10 10:49:17 +09:00
69d796acd9 Merge pull request 'Run 모드 종료 시 데이터가 바로 끊기지 않는 문제' (#150) from pgd/20250610_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/150
2025-06-10 09:46:25 +09:00
geondo55
f49899afbc Run 모드 종료 시 데이터가 바로 끊기지 않는 문제 2025-06-10 09:40:58 +09:00
0251951472 Merge pull request '마우스 우클릭 상태일 시 Gizmo 변경 제한' (#149) from jym/250609_04 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/149
2025-06-09 18:30:06 +09:00
jym
af51f34ac6 Merge branch 'main' into jym/250609_04 2025-06-09 18:13:02 +09:00
정영민
69831116ab 마우스 우클릭 상태일 시 Gizmo 변경 제한 2025-06-09 18:12:34 +09:00
03cb99becd Merge pull request '최초 프로젝트 오픈 화면에서 파일을 선택 후 선택을 취소 해도 Open 버튼이 사라지지 않는 오류 및 UI 수정' (#148) from jym/250609_03 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/148
2025-06-09 18:01:48 +09:00
정영민
aed8f88553 최초 프로젝트 오픈 화면에서 파일을 선택 후 선택을 취소 해도 Open 버튼이 사라지지 않는 오류 및 UI 수정 2025-06-09 16:25:18 +09:00
wsh
b0b2b3c98e 1 2025-06-09 15:39:33 +09:00
ac651823d5 Merge pull request '최초 페이지에서 프로젝트 명 없이 Create가 가능한 오류 수정' (#147) from jym/250609_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/147
2025-06-09 14:59:24 +09:00
4b397d5a11 Merge pull request '프로그램 외부로 마우스 포커스 이동 후 재조작시 카메라가 급회전 하는 오류 수정' (#146) from jym/250609_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/146
2025-06-09 14:59:09 +09:00
정영민
8dabd9731e 최초 페이지에서 프로젝트 명 없이 Create가 가능한 오류 수정 2025-06-09 14:56:17 +09:00
정영민
b43ef96772 프로그램 외부로 마우스 포커스 이동 후 재조작시 카메라가 급회전 하는 오류 수정 2025-06-09 13:52:23 +09:00
901e363538 Update README.md 2025-06-09 10:56:21 +09:00
wsh
a7144b73b8 0.30.0 2025-06-09 10:55:46 +09:00
b2a25b378c Merge pull request 'pgd/20250529_4' (#145) from pgd/20250529_4 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/145
2025-05-29 18:29:41 +09:00
jmaniuvc
73e121e3c8 Merge branch 'pgd/20250529_3' into pgd/20250529_4 2025-05-29 18:29:10 +09:00
jmaniuvc
bc8fa060a8 씬 수정 2025-05-29 18:28:40 +09:00
05c72141f2 Merge pull request 'pgd/20250529_3' (#144) from pgd/20250529_3 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/144
2025-05-29 18:21:57 +09:00
jmaniuvc
033ae66ca3 Merge branch 'main' into pgd/20250529_3 2025-05-29 18:12:01 +09:00
d322050828 Merge pull request '씬, 라이팅 수정' (#143) from njh/250529_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/143
2025-05-29 18:11:31 +09:00
e5a1ceb685 Merge pull request 'jym/250529_09' (#142) from jym/250529_09 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/142
2025-05-29 18:11:18 +09:00
jmaniuvc
05bf9e1249 하이어라키 버그 수정 2025-05-29 18:09:26 +09:00
32f7408d4c 씬, 라이팅 수정 2025-05-29 18:04:24 +09:00
84308a961d merge 2025-05-29 17:52:46 +09:00
ad5127774f ... 2025-05-29 17:52:16 +09:00
b0d82b76cb 씬수 2025-05-29 17:49:45 +09:00
정영민
e83d15e69b ProjectName, Project Route 입력 필드 기울기 제거 2025-05-29 17:42:28 +09:00
정영민
eb486c9dc3 NewProject, OpenProject Button Text 색상 변경 기능 추가 2025-05-29 17:40:59 +09:00
jmaniuvc
1de71f8790 저장 2025-05-29 17:31:35 +09:00
406162c463 Merge pull request '하이어라키 디테일 수정' (#141) from pgd/20250529_1 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/141
2025-05-29 16:55:24 +09:00
geondo55
c401754e28 merge 2025-05-29 16:52:57 +09:00
geondo55
4d4e8927ee Merge branch 'main' into pgd/20250529_1 2025-05-29 16:43:41 +09:00
geondo55
6ca17e56eb 하이어라키 AGV 아이디 표시 및 패널 크기 수정 2025-05-29 16:42:53 +09:00
jym
f2cb0f9945 Merge pull request 'SaveAndNew, SaveAndOpen UI 기능 수정 및 TopMenu 버튼 강조 효과 오류 수정' (#140) from jym/250529_08 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/140
2025-05-29 16:30:06 +09:00
정영민
4d9d74b982 SaveAndNew, SaveAndOpen UI 기능 수정 및 TopMenu 버튼 강조 효과 오류 수정 2025-05-29 16:29:43 +09:00
wsh
e02a0d1532 1 2025-05-29 16:14:24 +09:00
4fb756f32e Merge pull request '하이어라키 디자인 수정 및 버그 수정' (#139) from pgd/20250529_merge into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/139
2025-05-29 16:08:07 +09:00
geondo55
c8add0f490 패널 프리팹 수정 2025-05-29 16:03:35 +09:00
geondo55
a7841dbc74 Merge branch 'pgd/20250529' into pgd/20250529_merge 2025-05-29 16:00:47 +09:00
geondo55
af91e87bf3 하이어라키 디자인 수정 2025-05-29 15:56:38 +09:00
jym
b459ca35a5 Merge pull request '프로젝트 로드 시 MQTT Setting Add Topic버튼이 아래로 내려가지 않는 오류 수정' (#138) from jym/250529_06 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/138
2025-05-29 15:55:07 +09:00
정영민
ea826a888d 프로젝트 로드 시 MQTT Setting Add Topic버튼이 아래로 내려가지 않는 오류 수정 2025-05-29 15:53:00 +09:00
032a952813 Merge pull request 'File 의 SaveProject, NewProject, OpenProject 작동 되지 않는 오류 수정' (#137) from jym/250529_05 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/137
2025-05-29 15:43:59 +09:00
정영민
ccb71e3e2f File 의 SaveProject, NewProject, OpenProject 작동 되지 않는 오류 수정 2025-05-29 15:41:11 +09:00
b1be1ca51c Merge pull request '스플래시 이미지 변경' (#136) from sjm/250529 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/136
2025-05-29 14:54:49 +09:00
jmaniuvc
cc9c2a5980 스플래시 이미지 변경 2025-05-29 14:51:40 +09:00
wsh
ac413cd390 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-29 14:18:21 +09:00
wsh
b03c6108b4 시작화면 동적 해상도 처리 2025-05-29 14:18:17 +09:00
be7d95976f merege 2025-05-29 14:11:37 +09:00
fe14ca9f00 agv 1층 제거 2025-05-29 14:10:36 +09:00
2c122b0a89 Merge pull request '프로그램 종료 이벤트 연결 및 File-OpenProject 예외 처리' (#135) from jym/250529_04 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/135
2025-05-29 13:54:32 +09:00
정영민
e3460a42cd 프로그램 종료 이벤트 연결 및 File-OpenProject 예외 처리 2025-05-29 13:53:27 +09:00
wsh
dba322ffd4 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-29 13:47:04 +09:00
wsh
eaa9e0c453 1 2025-05-29 13:47:01 +09:00
fd5121ecac Merge pull request 'Panel_Start 수정' (#134) from sjm/250529 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/134
2025-05-29 13:46:47 +09:00
7754cb47f9 agv 2025-05-29 11:14:14 +09:00
a3946cb1a8 Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/Studio 2025-05-29 11:10:45 +09:00
acd268b39f 모델링수정 2025-05-29 11:10:43 +09:00
wsh
6aed166ad8 미사용 UI Scene에서 제거중 2025-05-29 10:53:56 +09:00
jmaniuvc
adeb8021f1 Panel_Start 수정 2025-05-29 10:44:22 +09:00
wsh
3de7e7f0bc Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-29 10:38:21 +09:00
wsh
f254c0bb90 1 2025-05-29 10:38:19 +09:00
5309e123b4 Merge pull request 'Ctrl+D 오브젝트 복제' (#133) from jym/250529_03 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/133
2025-05-29 10:34:51 +09:00
4176a73266 재성버튼 이미지, aseetlibrary 위치 조절 코드 수정 2025-05-29 10:24:45 +09:00
정영민
c9711ef03d Ctrl+D 오브젝트 복제 2025-05-29 10:21:20 +09:00
wsh
e5bac3ed1a 1 2025-05-29 05:34:15 +09:00
wsh
c50e823011 1 2025-05-29 05:34:12 +09:00
wsh
42bef75e28 1 2025-05-29 05:29:54 +09:00
bf2b9c793d 라이브러리 UI ,Panel_Toolbox 프리팹 수정 2025-05-29 05:25:59 +09:00
wsh
efb5d43ebe 1 2025-05-29 05:19:28 +09:00
cdd0737480 Merge pull request '파일 탐색기 사용 시의 기본 경로 설정' (#132) from jym/250529_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/132
2025-05-29 02:59:50 +09:00
2f37bb458d Merge pull request '패널 프리팹 수정' (#131) from pgd/20250529_7 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/131
2025-05-29 02:59:39 +09:00
정영민
0df3594f94 파일 탐색기 사용 시의 기본 경로 설정 2025-05-29 02:50:23 +09:00
5efd1f8b1e Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/Studio 2025-05-29 02:41:43 +09:00
c873178717 에셋매니져 고침 2025-05-29 02:41:41 +09:00
geondo55
24792b59f8 Merge branch 'main' into pgd/20250529_7 2025-05-29 02:27:28 +09:00
wsh
e74e34c027 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-29 02:23:18 +09:00
wsh
b405f64f09 디자인 변경 2025-05-29 02:23:13 +09:00
geondo55
f0bb4d0de8 MQTTTestResult 패널 수정 2025-05-29 02:08:20 +09:00
geondo55
252044318b Merge branch 'main' into pgd/20250529_7 2025-05-29 01:56:32 +09:00
geondo55
b0ade360d6 ObjectDetails 패널 수정 2025-05-29 01:55:20 +09:00
85f03cfb28 씬 카메라 위치 수정 2025-05-29 01:53:43 +09:00
a326eddded merge 2025-05-29 01:53:21 +09:00
a9485850bd commit 2025-05-29 01:51:13 +09:00
b02fcf6e62 merge 2025-05-29 01:50:48 +09:00
wsh
70079d09ae 1 2025-05-29 01:44:36 +09:00
wsh
45d207e335 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-29 01:42:01 +09:00
wsh
f34ef67afe 1 2025-05-29 01:41:59 +09:00
jym
34c689ded1 Merge pull request '파일 탐색기 사용 시의 기본 경로 설정' (#130) from jym/250529_01 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/130
2025-05-29 01:41:02 +09:00
정영민
7f1612a944 기본 경로 설정 2025-05-29 01:40:30 +09:00
wsh
54040b7808 1 2025-05-29 01:32:29 +09:00
wsh
a332f6782f 1 2025-05-29 01:27:15 +09:00
wsh
31ec8e39b1 1 2025-05-29 01:27:04 +09:00
1bedfd565e Merge pull request '패널 수정 및 충돌 이펙트 제거' (#129) from pgd/20250529_5merge into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/129
2025-05-29 01:26:39 +09:00
geondo55
180dc5f737 Merge branch 'main' into pgd/20250529_5merge 2025-05-29 01:19:54 +09:00
wsh
18d75515df AuthSetting 2025-05-29 01:19:14 +09:00
geondo55
301f8c404f 씬 병합 2025-05-29 01:18:55 +09:00
wsh
f104378f2e Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-29 01:09:32 +09:00
wsh
c7cc1e395d APP Setting 디자인 변경 2025-05-29 01:09:27 +09:00
geondo55
2c83bde173 Merge branch 'pgd/20250529_4' into pgd/20250529_5merge 2025-05-29 01:09:09 +09:00
geondo55
c91b76b396 패널 수정 및 충돌 이펙트 제거 2025-05-29 01:07:43 +09:00
jym
5da457112c Merge pull request 'Asset Setting, Asset Manager 병합 작업' (#128) from jym/250529_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/128
2025-05-29 01:07:41 +09:00
정영민
86cfa72157 Asset Setting, Asset Manager 병합 작업 2025-05-29 00:59:12 +09:00
wsh
d807951f5c Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-29 00:41:07 +09:00
wsh
eebd10cc15 StartSetting 메뉴들 탑메뉴로 이전 2025-05-29 00:41:06 +09:00
jym
cbf145be7d Merge pull request '프로젝트 로드시 거리 측정 기능이 활성화 되어있는 문제 수정' (#127) from jym/250528_09 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/127
2025-05-29 00:08:09 +09:00
정영민
c377b7d44e 프로젝트 로드시 거리 측정 기능이 활성화 되어있는 문제 수정 2025-05-28 23:53:58 +09:00
6f433dcb4f Merge pull request 'File-NewProject 에서 파일 이름과 경로를 설정하지 않아도 Create가 되어 다음으로 넘어가는 문제 수정' (#126) from jym/250528_08 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/126
2025-05-28 23:47:46 +09:00
정영민
8abdfa3bbe File-NewProject 에서 파일 이름과 경로를 설정하지 않아도 Create가 되어 다음으로 넘어가는 문제 수정 2025-05-28 23:45:31 +09:00
1e396ca15a ,. 2025-05-28 23:44:04 +09:00
wsh
14cbeb7258 1 2025-05-28 23:42:50 +09:00
wsh
c2dbaf5545 1 2025-05-28 23:27:30 +09:00
wsh
0d8447b883 1 2025-05-28 23:27:20 +09:00
wsh
a867e270d5 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 23:23:26 +09:00
wsh
f617ae1767 1 2025-05-28 23:23:24 +09:00
8186391449 Merge pull request '오브젝트 선택 시 정보 창 디자인 수정 및 크레인 정보창 연동' (#125) from pgd/20250528_3merge into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/125
2025-05-28 23:23:00 +09:00
geondo55
4ee15664af Merge branch 'main' into pgd/20250528_3merge 2025-05-28 23:22:16 +09:00
geondo55
2d32c93d82 Run버그 수정 2025-05-28 23:20:50 +09:00
jym
9419fcd255 Merge pull request '최초 프로젝트 오픈 화면에서 파일을 선택하지 않아도 Open 되어버리는 문제 수정' (#124) from jym/250528_07 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/124
2025-05-28 23:17:13 +09:00
정영민
84a28afe05 최초 프로젝트 오픈 화면에서 파일을 선택하지 않아도 Open 되어버리는 문제 수정 2025-05-28 23:15:05 +09:00
geondo55
0aca7af93d Merge branch 'main' into pgd/20250528_3merge 2025-05-28 23:08:28 +09:00
geondo55
0ee42064ca 오브젝트 선택 시 정보 창 디자인 수정 및 크레인 정보창 연동 2025-05-28 23:06:11 +09:00
wsh
8132550ec5 로고위치 변경 2025-05-28 22:59:32 +09:00
wsh
ca19b97527 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 22:38:52 +09:00
wsh
550efefba8 toolbox 추가 2025-05-28 22:38:11 +09:00
jym
2df18ea15e Merge pull request 'Open Project 모달의 Open버튼이 Create 버튼으로 표기되는 오류 수정 및 에셋 관리자 UI 디자인 적용' (#123) from jym/250528_06 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/123
2025-05-28 22:34:45 +09:00
정영민
9f857d055b Open Project 모달의 Open버튼이 Create 버튼으로 표기되는 오류 수정 및 에셋 관리자 UI 디자인 적용 2025-05-28 22:26:52 +09:00
jym
609fae6cff Merge pull request '자산관리자 URL에 잘못된 값이 한번이라도 입력되었을 경우 이후 정상 작동 하지 않는 오류 수정' (#122) from jym/250528_05 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/122
2025-05-28 20:53:56 +09:00
정영민
6a8f159f57 자산관리자 URL에 잘못된 값이 한번이라도 입력되었을 경우 이후 정상 작동 하지 않는 오류 수정 2025-05-28 20:48:28 +09:00
wsh
027c83c7ea Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 20:44:59 +09:00
wsh
1d08f9d2ec 1 2025-05-28 20:44:55 +09:00
geondo55
12e2293493 Merge branch 'pgd/20250528' into pgd/20250528_3merge 2025-05-28 20:33:51 +09:00
geondo55
2e00970a6a 백업 2025-05-28 20:33:00 +09:00
b96ae8a277 Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/Studio 2025-05-28 20:32:00 +09:00
78741a18d0 Filemanager 원상복구 2025-05-28 20:31:53 +09:00
wsh
b83b763f99 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 20:31:26 +09:00
wsh
263a38ef92 1 2025-05-28 20:31:25 +09:00
eaa0060a1f Merge pull request '에셋 라이브러리 위치 및 크기 조정 (씬 수정)' (#121) from pgd/20250528_3 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/121
2025-05-28 20:31:07 +09:00
wsh
ee8e4ca051 탑메뉴 아이콘 늘어짐 현상 수정 2025-05-28 20:28:12 +09:00
geondo55
2d5b2ba187 Merge branch 'main' into pgd/20250528_3 2025-05-28 20:25:38 +09:00
geondo55
059e0acb6d 에셋 라이브러리 위치 및 크기 조정 (씬 수정_ 2025-05-28 20:25:05 +09:00
wsh
bee153444d toolbar 수정 2025-05-28 20:18:20 +09:00
wsh
f055ba2d1f 1 2025-05-28 20:12:06 +09:00
wsh
1771f97186 1 2025-05-28 20:08:56 +09:00
wsh
e449ab79c5 1 2025-05-28 20:08:37 +09:00
wsh
3f888a4bc6 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 20:04:38 +09:00
wsh
b5d77ea363 1 2025-05-28 20:04:36 +09:00
d693e1d502 Merge pull request 'AssetLibrary 패널 디자인 변경 및 코드 수정' (#120) from pgd/20250528_2merge into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/120
2025-05-28 20:04:26 +09:00
geondo55
54a9f6ff9c 로그 제거 2025-05-28 20:01:59 +09:00
geondo55
e6e052b029 Merge branch 'main' into pgd/20250528_2merge 2025-05-28 19:59:50 +09:00
geondo55
bec20f52a9 AssetLibrary 패널 수정 2025-05-28 19:57:44 +09:00
wsh
56110f32e4 1 2025-05-28 19:45:22 +09:00
wsh
33072ef3e7 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 18:47:09 +09:00
wsh
6fb4ec52a8 11 2025-05-28 18:47:07 +09:00
bf0b6fc4e4 Merge pull request 'Panel_Toolbar' (#119) from sjm/250528_4 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/119
2025-05-28 18:46:38 +09:00
jmaniuvc
a1fb8cc204 Panel_Toolbar 씬에 적용 2025-05-28 18:20:28 +09:00
jmaniuvc
e425083d8b 충돌 2025-05-28 18:19:15 +09:00
jmaniuvc
24d5a80272 Panel_Toolbar 2025-05-28 18:18:35 +09:00
c4aaaad6f2 Update README.md 2025-05-28 18:12:58 +09:00
wsh
5786ceb9bf 씬 오브젝트 삭제가 이루어지면 저장이 제대로 되지 않는 오류 수정 2025-05-28 18:00:53 +09:00
wsh
f62a10765f Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 17:53:45 +09:00
wsh
aa5e997bd6 1. UI 위(자기자신의 영역만 해당)에 마우스가 있는지 확인할 수 있는 MouseObserver 추가
2. StudioTopBar 의 애니메이션 때문에 클릭이 제대로 되지 않던 문제 수정
2025-05-28 17:53:30 +09:00
65a64551bf Merge pull request 'MQTTTestResult, Inspector 패널 디자인 변경' (#118) from pgd/20250528_2merge into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/118
2025-05-28 17:08:53 +09:00
25cc15675a Merge pull request 'Panel_MQTTSetting' (#117) from sjm/250528_3 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/117
2025-05-28 17:08:42 +09:00
geondo55
8c99d4c736 Merge branch 'pgd/20250528_2' into pgd/20250528_2merge 2025-05-28 17:03:18 +09:00
geondo55
74c8f9446f MQTTTestResult, Inspector 패널 디자인 변경 2025-05-28 17:01:36 +09:00
jmaniuvc
b2521e40eb 씬 수정 2025-05-28 16:50:16 +09:00
jmaniuvc
14d46bddd8 충돌 2025-05-28 16:47:22 +09:00
jmaniuvc
f25e54fc52 MQTT Setiing, 기타 수정 2025-05-28 16:46:14 +09:00
wsh
1a4151deee 미사용 UI 제외 2025-05-28 16:33:01 +09:00
wsh
d8fb708715 탑메뉴 드랍다운 애니메이션 제거 2025-05-28 16:27:54 +09:00
jmaniuvc
1418883dc5 저장 2025-05-28 16:24:03 +09:00
wsh
a952239f6b Toolbar UI 및 기능 복원 2025-05-28 16:20:36 +09:00
jmaniuvc
ba65202774 저장 2025-05-28 16:17:38 +09:00
wsh
386bac5988 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 16:09:42 +09:00
wsh
f15b8cab3e 1 2025-05-28 16:09:41 +09:00
daf5ab1a83 Update README.md 2025-05-28 16:07:17 +09:00
wsh
ba38d106ac 1 2025-05-28 15:50:18 +09:00
wsh
6b2d51fe84 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 15:47:00 +09:00
wsh
bb285d2723 1 2025-05-28 15:46:59 +09:00
65ed4284ba Merge pull request 'Scene Tab 오류 수정' (#116) from jym/250528_04 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/116
2025-05-28 15:45:59 +09:00
정영민
e70ecc8176 Scene Tab 오류 수정 2025-05-28 15:44:13 +09:00
wsh
a7ad255031 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 15:43:08 +09:00
wsh
2b2264f9d9 시작화면 우측하단에 현재 버전 텍스트 추가(수동편집) 2025-05-28 15:43:05 +09:00
57ae8bafc9 Update README.md 2025-05-28 15:42:31 +09:00
wsh
bbdd3220a7 1 2025-05-28 15:32:08 +09:00
wsh
0c2952592f 인증설정 기본 텍스트 변경 2025-05-28 15:31:56 +09:00
wsh
956a6d2adc Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 15:29:33 +09:00
wsh
72c0bf8690 1 2025-05-28 15:29:31 +09:00
f8865b5f81 Merge pull request 'Panel_API Setting' (#115) from sjm/250528_2 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/115
2025-05-28 15:29:16 +09:00
wsh
1a27bc3e07 1 2025-05-28 15:29:00 +09:00
wsh
29747cbe5b StartPanel 수정 2025-05-28 15:24:44 +09:00
jmaniuvc
bc93da9fc6 Merge branch 'sjm/250528' into sjm/250528_2 2025-05-28 15:24:34 +09:00
jmaniuvc
a40a139e28 Panel_API Setting 문제 수정 2025-05-28 15:23:54 +09:00
wsh
466c4af018 Start Panel 수정 2025-05-28 15:22:55 +09:00
jmaniuvc
4c2ae966d3 Panel_API Setting 2025-05-28 15:16:20 +09:00
daf2d31a4f Merge pull request '프로젝트 파일의 경로에 따라 저장이 되지 않는 오류 수정' (#114) from jym/250528_03 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/114
2025-05-28 15:02:02 +09:00
정영민
af447f8636 프로젝트 파일의 경로에 따라 저장이 되지 않는 오류 수정 2025-05-28 14:37:37 +09:00
jmaniuvc
873602f3ed 저장 2025-05-28 14:29:37 +09:00
wsh
fa366785c8 1 2025-05-28 14:05:35 +09:00
6ee26ed70a Merge pull request 'jym/250528_02' (#113) from jym/250528_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/113
2025-05-28 13:58:08 +09:00
정영민
529424e82c AGV 저장 기능 추가 2025-05-28 13:56:31 +09:00
정영민
890dfff2b7 Merge branch 'jym/250528_01' into jym/250528_02 2025-05-28 13:55:21 +09:00
정영민
c0159ef1ff AGV 저장 기능 수정 2025-05-28 13:54:19 +09:00
wsh
c02292c659 로그 추가 및 중복 이벤트 제거 2025-05-28 13:53:27 +09:00
wsh
a0fa6371c5 중복이벤트 제거. 네임스페이스 수정 2025-05-28 13:42:49 +09:00
2105417fe0 Merge pull request 'Panel_Start Setting,App Setting 디자인 적용' (#112) from sjm/250528 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/112
2025-05-28 13:35:51 +09:00
45d6cbdc7f Merge pull request '사내 리뷰 버전' (#111) from pgd/20250528 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/111
2025-05-28 13:35:41 +09:00
jmaniuvc
d15a412047 Panel_Start Setting,App Setting 디자인 적용 2025-05-28 12:25:29 +09:00
geondo55
11834b2a2a 사내 리뷰 2025-05-28 11:00:04 +09:00
geondo55
b106724f4a Merge branch 'pgd/20250527_merge2' into pgd/20250528 2025-05-28 09:59:52 +09:00
5003ee2a11 Merge pull request 'UI 적용' (#110) from sjm/250528 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/110
2025-05-28 09:57:31 +09:00
jmaniuvc
e4d5553575 Scene 충돌 제거 2025-05-28 09:54:08 +09:00
jmaniuvc
515edb1d6a 중간 저장 2025-05-28 09:53:21 +09:00
geondo55
9c607e3e75 버그 수정 2025-05-28 09:52:09 +09:00
wsh
d7c3e14c94 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-28 09:35:45 +09:00
wsh
43de7262ee MQTTTestResult 디자인 초안적용 2025-05-28 09:35:40 +09:00
d14d703553 Merge pull request 'play 버튼 클릭시 실행' (#109) from njh/250527_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/109
2025-05-28 09:16:04 +09:00
geondo55
aa99e41b2e Run, Stop 분기 처리 2025-05-27 19:44:13 +09:00
9d5966c4a2 tttt 2025-05-27 19:33:25 +09:00
503947940e merger 2025-05-27 19:33:19 +09:00
jmaniuvc
ec9edeb38c Panel_TopMenuNewProjectInfo
Panel_TopMenuOpenProjectInfo
Panel_ExitChecker
완료
2025-05-27 18:25:35 +09:00
jmaniuvc
1981d5ea3e 저장 2025-05-27 18:18:40 +09:00
7824fb23fd Merge pull request 'pgd/20250527_merge2' (#108) from pgd/20250527_merge2 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/108
2025-05-27 17:00:35 +09:00
geondo55
a627cbb298 씬수정 2025-05-27 16:59:09 +09:00
geondo55
7873d5203b Merge branch 'pgd/20250527merge' into pgd/20250527_merge2 2025-05-27 16:55:01 +09:00
geondo55
95a3029da5 AGV 모달 추가 2025-05-27 16:27:49 +09:00
wsh
fdeb66168f Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-27 16:26:40 +09:00
wsh
286adebe38 디자인가이드 이미지 추가 2025-05-27 16:26:39 +09:00
17690b4071 Merge pull request 'UI 디자인 일부 적용' (#106) from sjm/250527 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/106
2025-05-27 16:26:22 +09:00
jmaniuvc
a13d2c3412 Setting 창 안켜지는 버그 수정 2025-05-27 16:24:25 +09:00
jmaniuvc
757c0174fa 저장 2025-05-27 15:48:24 +09:00
wsh
a70fdef27a MQTT Outgoing 머시기 에러코드 수정 2025-05-27 15:45:51 +09:00
jmaniuvc
84c07f1e62 충돌 해결 2025-05-27 15:45:43 +09:00
jmaniuvc
0e0705ea8e 저장 2025-05-27 15:44:20 +09:00
geondo55
52a26828f9 Merge branch 'main' into pgd/20250527merge 2025-05-27 15:36:52 +09:00
wsh
7a70032f1d 1 2025-05-27 15:34:26 +09:00
wsh
1b3e9212fe 1 2025-05-27 15:31:07 +09:00
69080b5714 코드업데이트 2025-05-27 15:24:25 +09:00
jmaniuvc
f7cdec7ad6 Panel_StudioTopbar 디자인 적용 2025-05-27 15:19:17 +09:00
geondo55
304125a4bf 백업 2025-05-27 15:17:38 +09:00
geondo55
f6b9cd3dee 백업 2025-05-27 15:12:30 +09:00
geondo55
3ae8f88700 Merge branch 'main' into pgd/20250527merge 2025-05-27 14:58:40 +09:00
geondo55
a81e040123 AGV 정보 창 2025-05-27 14:54:39 +09:00
wsh
bfb1daabf4 1. Panel_MQTTConnectModal 삭제
2. MessagePackFileManager 삭제
2025-05-27 13:53:23 +09:00
wsh
d58fdd3d67 1 2025-05-27 12:04:07 +09:00
jmaniuvc
14cdcca582 TMP Folder 정리 2025-05-27 12:03:53 +09:00
wsh
646123646d 1 2025-05-27 11:44:09 +09:00
wsh
93b6fa3801 1 2025-05-27 11:37:21 +09:00
wsh
a5e54b370f 1 2025-05-27 11:31:06 +09:00
jmaniuvc
7df3175092 Footer, StartItem 수정 2025-05-27 11:11:51 +09:00
wsh
b92b07e81e namespace 2025-05-27 11:02:41 +09:00
wsh
5143fbfce7 1 2025-05-27 10:58:20 +09:00
wsh
dc1b4446d4 1 2025-05-27 10:56:36 +09:00
jmaniuvc
2afdf571fc OpenProjectInfo 네이밍 수정 2025-05-27 10:49:30 +09:00
wsh
453bf72091 1 2025-05-27 10:49:19 +09:00
wsh
d6afee0f5f 1 2025-05-27 10:48:14 +09:00
wsh
0eedd10759 Panel_AssetProperties 삭제 2025-05-27 10:48:09 +09:00
wsh
bf4cd9c052 1 2025-05-27 10:46:19 +09:00
jmaniuvc
ee29325ef3 Panel_Start 디자인 적용 2025-05-27 10:36:59 +09:00
wsh
3557d39cb9 1 2025-05-27 10:33:46 +09:00
wsh
6bf7c55391 1 2025-05-27 10:28:12 +09:00
wsh
e1dc63bcf4 1 2025-05-27 10:25:19 +09:00
2fee4e3fe8 바닥을 클릭해도 인스펙터가 활성화 되는 버그 해결 2025-05-27 10:11:30 +09:00
wsh
f331abd7b8 삭제삭제!!!이동이동!!!!@ 2025-05-27 10:02:37 +09:00
wsh
daa3234e5e 불필요 코드 삭제 2025-05-27 09:54:28 +09:00
wsh
0cc0620e9c 불필요 코드 삭제 2025-05-27 09:49:45 +09:00
wsh
2bb1fbc928 1 2025-05-27 09:45:20 +09:00
wsh
1b43e00554 Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-27 09:42:29 +09:00
wsh
23311a8f95 네임스페이스 정리 2025-05-27 09:42:25 +09:00
96d9b25945 Update README.md 2025-05-27 09:38:17 +09:00
wsh
52e7ec398f EventConnector->CanvasManager 2025-05-27 09:37:32 +09:00
wsh
6d68500cdd 1 2025-05-27 09:36:41 +09:00
wsh
3e8ffeffb8 1 2025-05-27 09:31:18 +09:00
geondo55
b7c34cfc38 Merge branch 'main' into pgd/20250527 2025-05-27 09:25:06 +09:00
jym
deb844203b Merge pull request '스크립트이동' (#103) from njh/250526_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/103
2025-05-27 09:18:07 +09:00
20c1a5e38a 스크립트이동 2025-05-27 09:15:50 +09:00
23e7264a89 Merge pull request 'Connection 연결 기능,Component 연결 기능 Inspector 모달' (#102) from njh/250526_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/102
2025-05-27 09:00:10 +09:00
dab794e479 agvmanager .임시수정 2025-05-26 20:22:01 +09:00
d814eedc5a megre 2025-05-26 20:21:53 +09:00
23a2394e58 Connection 연결 기능,Component 연결 기능
Inspector 모달
2025-05-26 20:14:19 +09:00
geondo55
1d629af7ee AGV 정보 창 2025-05-26 19:13:46 +09:00
3f0fa7bb59 Merge pull request 'Asset Setting 추가 및 동일한 모델링 중복 배치 오류 수정' (#101) from jym/250526_04 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/101
2025-05-26 17:45:36 +09:00
geondo55
7006c70270 백업 2025-05-26 17:41:54 +09:00
정영민
1310ce1823 Asset Setting 추가 및 동일한 모델링 중복 배치 오류 수정 2025-05-26 17:39:10 +09:00
a6746e5272 Merge pull request '라인 렌더러 버그 수정' (#100) from sjm/250526 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/100
2025-05-26 14:26:01 +09:00
c463877bb1 Merge pull request '불러온 에셋이 정상적으로 렌더링 되지 않는 오류수정' (#99) from jym/250526_03 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/99
2025-05-26 14:25:47 +09:00
jmaniuvc
b2cd3621fc 거리측정 라인 두께 조절 2025-05-26 12:06:08 +09:00
jmaniuvc
9fd0f759cd 라인 렌더러가 정상적으로 사라지지 않는 버그 수정 2025-05-26 11:47:47 +09:00
정영민
df2140212b 불러온 에셋이 정상적으로 렌더링 되지 않는 오류수정 2025-05-26 11:41:17 +09:00
9ede173f77 Merge pull request 'jym/250526_02' (#98) from jym/250526_02 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/98
2025-05-26 11:01:02 +09:00
정영민
57397f956a 충돌 해결 2025-05-26 11:00:28 +09:00
wsh
1d9279a4af Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio 2025-05-26 10:39:57 +09:00
wsh
8d612d8b30 1 2025-05-26 10:39:54 +09:00
1782 changed files with 359577 additions and 357720 deletions

View File

@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 4a1d48d42fb1a3745ac549ee8a7dc869
m_currentHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
Hash: 543b0b976a536f3a195577dd11f805cb
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 1
m_CatalogRequestsTimeout: 0

View File

@@ -0,0 +1,24 @@
<linker>
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
</assembly>
<assembly fullname="Unity.Localization, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Localization.Locale" preserve="all" />
<type fullname="UnityEngine.Localization.Tables.SharedTableData" preserve="all" />
<type fullname="UnityEngine.Localization.Tables.StringTable" preserve="all" />
<type fullname="UnityEngine.Localization.Metadata.MetadataCollection" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Localization.Tables.DistributedUIDGenerator" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Localization.Tables.SharedTableData/SharedTableEntry" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Localization.LocaleIdentifier" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Localization.Tables.TableEntryData" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Object" preserve="all" />
</assembly>
</linker>

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2f199f1c9b15d8049a1b6a5b535dbc5a
guid: 4159b5f02693b614e9328aa0940643ef
TextScriptImporter:
externalObjects: {}
userData:

View File

@@ -1,5 +1,4 @@
using TriLibCore.General;
using TriLibCore.Mappers;
using UnityEditor;
using UnityEngine;
@@ -49,76 +48,137 @@ namespace TriLibCore.Editor
{
case 0:
GUILayout.Label(new GUIContent("Scene", "Scene import settings"), "BoldLabel");
EditorGUILayout.PropertyField(serializedObject.FindProperty("ScaleFactor"), new GUIContent("Scale Factor", "Model scale multiplier."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("UseFileScale"), new GUIContent("Use File Scale", "Turn on this flag to use the file original scale."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ImportVisibility"), new GUIContent("Import Visibility", "Turn on this field to apply the visibility property to Mesh Renderers/Skinned Mesh Renderers."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ImportCameras"), new GUIContent("Import Cameras", "Turn on this field to enable Cameras importing."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ImportLights"), new GUIContent("Import Lights", "Turn on this field to enable Lights importing."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("Static"), new GUIContent("Import as Static", "Turn on this field to import the Model as a static Game Object."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("SortHierarchyByName"), new GUIContent("Sort Hierarchy by Name", "Turn on this field to sort the Model hierarchy by name."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("AddAssetUnloader"), new GUIContent("Add Asset Unloader", "Turn on this field to add the Asset Unloader Component to the loaded Game Object."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ShowLoadingWarnings"), new GUIContent("Show Loading Warnings", "Turn on this field to display Model loading warnings on the Console."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("CloseStreamAutomatically"), new GUIContent("Close Stream Automatically", "Turn on this field to close the Model loading Stream automatically."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("DestroyOnError"), new GUIContent("Destroy on Error", "Turn on this field to destroy the loaded Game Object automatically when there is any loading error."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("PivotPosition"), new GUIContent("Pivot Position", "Use this field to realign the Model pivot based on the given value."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("DisableObjectsRenaming"), new GUIContent("Disable Objects Renaming", "Turn on this field to disable objects renaming."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("MergeSingleChild"), new GUIContent("Merge Single Child", "Turn on this field to merge single child models into a single GameObject."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ScaleFactor"),
new GUIContent("Scale Factor", "Model scale multiplier."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("UseFileScale"),
new GUIContent("Use File Scale", "Turn on this flag to use the file's original scale."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ImportVisibility"),
new GUIContent("Import Visibility", "Turn on this field to apply the visibility property to Mesh Renderers/Skinned Mesh Renderers."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ImportCameras"),
new GUIContent("Import Cameras", "Turn on this field to enable camera importing."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ImportLights"),
new GUIContent("Import Lights", "Turn on this field to enable light importing."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("Static"),
new GUIContent("Import as Static", "Turn on this field to import the Model as a static Game Object."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("SortHierarchyByName"),
new GUIContent("Sort Hierarchy by Name", "Turn on this field to sort the Model hierarchy by name."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("AddAssetUnloader"),
new GUIContent("Add Asset Unloader", "Turn on this field to add the Asset Unloader Component to the loaded Game Object."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("CloseStreamAutomatically"),
new GUIContent("Close Stream Automatically", "Turn on this field to close the Model loading Stream automatically."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("DestroyOnError"),
new GUIContent("Destroy on Error", "Turn on this field to destroy the loaded Game Object automatically when there is any loading error."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("PivotPosition"),
new GUIContent("Pivot Position", "Use this field to realign the Model pivot based on the given value."));
var disableObjectsRenamingProperty = serializedObject.FindProperty("DisableObjectsRenaming");
EditorGUILayout.PropertyField(disableObjectsRenamingProperty,
new GUIContent("Disable Object Renaming", "Turn on this field to disable object renaming."));
if (!disableObjectsRenamingProperty.boolValue)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("MaxObjectsToRename"),
new GUIContent("Max Objects to Rename",
"Use this field to set the maximum number of objects TriLib can rename. Renaming is an expensive process, so it's advised to keep this value low."));
}
EditorGUILayout.PropertyField(serializedObject.FindProperty("MergeSingleChild"),
new GUIContent("Merge Single Child", "Turn on this field to merge single-child models into a single GameObject."));
EditorGUILayout.Space();
GUILayout.Label(new GUIContent("Meshes", "Global settings for generated meshes"), "BoldLabel");
var importMeshesProperty = serializedObject.FindProperty("ImportMeshes");
EditorGUILayout.PropertyField(importMeshesProperty, new GUIContent("Import Meshes", "Turn on this field to import Model Meshes."));
EditorGUILayout.PropertyField(importMeshesProperty,
new GUIContent("Import Meshes", "Turn on this field to import Model Meshes."));
if (importMeshesProperty.boolValue)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("MarkMeshesAsDynamic"), new GUIContent("Mark Meshes as Dynamic", "Turn on this field to mark created meshes as dynamic."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("MarkMeshesAsDynamic"),
new GUIContent("Mark Meshes as Dynamic", "Turn on this field to mark created meshes as dynamic."));
var generateCollidersProperty = serializedObject.FindProperty("GenerateColliders");
EditorGUILayout.PropertyField(generateCollidersProperty, new GUIContent("Generate Colliders", "Turn on this field to generate Colliders for imported Meshes."));
EditorGUILayout.PropertyField(generateCollidersProperty,
new GUIContent("Generate Colliders", "Turn on this field to generate Colliders for imported Meshes."));
if (generateCollidersProperty.boolValue)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("ConvexColliders"), new GUIContent("Convex Colliders", "Turn on this field to generate convex Colliders when the GenerateColliders field is enabled."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ConvexColliders"),
new GUIContent("Convex Colliders", "Turn on this field to generate convex Colliders when GenerateColliders is enabled."));
}
EditorGUILayout.PropertyField(serializedObject.FindProperty("IndexFormat"), new GUIContent("Index Format", "Mesh index format (16 or 32 bits)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("KeepQuads"), new GUIContent("Keep Quads", "Turn on this field to mantain Mesh quads (Useful for DX11 tesselation)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("MergeVertices"), new GUIContent("Merge Vertices", "Turn on this field to merge model duplicated vertices where possible."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("IndexFormat"),
new GUIContent("Index Format", "Mesh index format (16 or 32 bits)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("KeepQuads"),
new GUIContent("Keep Quads", "Turn on this field to maintain Mesh quads (useful for DX11 tessellation)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("MergeVertices"),
new GUIContent("Merge Vertices", "Turn on this field to merge model duplicated vertices where possible."));
var importNormalsProperty = serializedObject.FindProperty("ImportNormals");
EditorGUILayout.PropertyField(importNormalsProperty, new GUIContent("Import Normals", "Turn on this field to import Mesh normals. If not enabled, normals will be calculated instead."));
EditorGUILayout.PropertyField(importNormalsProperty,
new GUIContent("Import Normals", "Turn on this field to import Mesh normals. If disabled, normals will be calculated instead."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("BakeAxisConversion"),
new GUIContent("Bake Axis Conversion", "Turn on this field to bake the model transform into models and animations (Experimental)."));
var generateNormalsProperty = serializedObject.FindProperty("GenerateNormals");
if (generateNormalsProperty.boolValue)
{
EditorGUILayout.PropertyField(generateNormalsProperty, new GUIContent("Generate Normals", "Turn off this field to disable Mesh normals generation."));
EditorGUILayout.PropertyField(generateNormalsProperty,
new GUIContent("Generate Normals", "Turn off this field to disable Mesh normals generation."));
var useUnityNativeNormalCalculatorProperty = serializedObject.FindProperty("UseUnityNativeNormalCalculator");
EditorGUILayout.PropertyField(useUnityNativeNormalCalculatorProperty, new GUIContent("Use Unity Native Normal Calculator", "Turn on this field to use the builtin Unity normal calculator."));
EditorGUILayout.PropertyField(useUnityNativeNormalCalculatorProperty,
new GUIContent("Use Unity Native Normal Calculator", "Turn on this field to use the built-in Unity normal calculator."));
if (!useUnityNativeNormalCalculatorProperty.boolValue)
{
EditorGUILayout.Slider(serializedObject.FindProperty("SmoothingAngle"), 0f, 180f, new GUIContent("Smoothing Angle", "Normals calculation smoothing angle."));
EditorGUILayout.Slider(serializedObject.FindProperty("SmoothingAngle"), 0f, 180f,
new GUIContent("Smoothing Angle", "Normals calculation smoothing angle."));
}
}
var importBlendShapesProperty = serializedObject.FindProperty("ImportBlendShapes");
EditorGUILayout.PropertyField(importBlendShapesProperty, new GUIContent("Import Blend Shapes", "Turn on this field to import Mesh Blend Shapes."));
EditorGUILayout.PropertyField(importBlendShapesProperty,
new GUIContent("Import Blend Shapes", "Turn on this field to import Mesh Blend Shapes."));
if (importBlendShapesProperty.boolValue)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("ImportBlendShapeNormals"), new GUIContent("Import Blend Shape Normals", "Turn on this field to import Mesh Blend Shape normals."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("CalculateBlendShapeNormals"), new GUIContent("Calculate Blend Shape Normals", "Turn on this field to calculate Mesh Blend Shape normals when none can be imported."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ImportBlendShapeNormals"),
new GUIContent("Import Blend Shape Normals", "Turn on this field to import Mesh Blend Shape normals."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("CalculateBlendShapeNormals"),
new GUIContent("Calculate Blend Shape Normals",
"Turn on this field to calculate Mesh Blend Shape normals when none are available in the file."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("BlendShapeMapper"),
new GUIContent("Blend Shape Mapper",
"Use this field to set a BlendShapeMapper to use with the loaded model. BlendShapeMappers can replace the Unity built-in blend shape playback system."));
}
EditorGUILayout.PropertyField(serializedObject.FindProperty("ImportColors"), new GUIContent("Import Colors", "Turn on this field to import Mesh Colors."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ImportColors"),
new GUIContent("Import Colors", "Turn on this field to import Mesh colors."));
var importTangentsProperty = serializedObject.FindProperty("ImportTangents");
EditorGUILayout.PropertyField(importTangentsProperty, new GUIContent("Import Tangents", "Turn on this field to import Mesh tangents. If not enabled, tangents will be calculated instead."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("GenerateTangents"), new GUIContent("Generate Tangents", "Turn off this field to disable Mesh tangents generation."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("SwapUVs"), new GUIContent("Swap UVs", "Turn on this field to swap Mesh UVs. (uv1 into uv2)"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("LODScreenRelativeTransitionHeightBase"), new GUIContent("LOD Screen Relative Transition Height Base", "Defines the initial screen relative transition height when creating LOD Groups."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ReadEnabled"), new GUIContent("Read Enabled", "Turn on this field to make mesh CPU data readable."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("DisableTesselation"), new GUIContent("Disable Tesselation", "Turn on this field to disable polygon tesselation."));
EditorGUILayout.PropertyField(importTangentsProperty,
new GUIContent("Import Tangents",
"Turn on this field to import Mesh tangents. If disabled, tangents will be calculated instead."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("GenerateTangents"),
new GUIContent("Generate Tangents", "Turn off this field to disable Mesh tangents generation."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("SwapUVs"),
new GUIContent("Swap UVs", "Turn on this field to swap Mesh UVs (uv1 into uv2)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("LODScreenRelativeTransitionHeightBase"),
new GUIContent("LOD Screen Relative Transition Height Base",
"Defines the initial screen relative transition height when creating LOD Groups."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ReadEnabled"),
new GUIContent("Read Enabled", "Turn on this field to make mesh CPU data readable."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("DisableTesselation"),
new GUIContent("Disable Tessellation", "Turn on this field to disable polygon tessellation."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("UseSharedMeshes"),
new GUIContent("Use Shared Meshes",
"Turn off this field to use the mesh filter's \"mesh\" property instead of the \"sharedMesh\" property."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("MeshWorldTransform"),
new GUIContent("Mesh World Transform",
"Use this field to define a transformation applied in world space to all mesh vertices."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("UpdateSkinnedMeshRendererWhenOffscreen"),
new GUIContent("Update Skinned Mesh Renderer when Offscreen",
"Turn on this field to update SkinnedMeshRenderers when they're offscreen."));
}
var loadPointCloudsProperty = serializedObject.FindProperty("LoadPointClouds");
EditorGUILayout.PropertyField(loadPointCloudsProperty, new GUIContent("Load Point Clouds", "TTurn on this field to load the model as a Point Cloud (PLY and OBJ only)"));
EditorGUILayout.PropertyField(loadPointCloudsProperty,
new GUIContent("Load Point Clouds",
"Turn on this field to load the model as a point cloud (PLY and OBJ only)."));
if (!loadPointCloudsProperty.boolValue)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("OptimizeMeshes"), new GUIContent("Optimize Meshes", "Turn on this field to optimize imported Meshes for GPU access."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("OptimizeMeshes"),
new GUIContent("Optimize Meshes", "Turn on this field to optimize imported Meshes for GPU access."));
}
break;
case 1:
var animationTypeProperty = serializedObject.FindProperty("AnimationType");
EditorGUILayout.PropertyField(animationTypeProperty, new GUIContent("Animation Type", "Model rigging type."));
EditorGUILayout.PropertyField(animationTypeProperty,
new GUIContent("Animation Type", "Model rigging type."));
var animationType = (AnimationType)animationTypeProperty.intValue;
switch (animationType)
{
@@ -126,98 +186,181 @@ namespace TriLibCore.Editor
case AnimationType.Humanoid:
var avatarDefinitionTypeProperty = serializedObject.FindProperty("AvatarDefinition");
EditorGUILayout.PropertyField(avatarDefinitionTypeProperty, new GUIContent("Avatar Definition", "Type of avatar creation for the Model."));
EditorGUILayout.PropertyField(avatarDefinitionTypeProperty,
new GUIContent("Avatar Definition", "Type of avatar creation for the Model."));
var avatarDefinitionType = (AvatarDefinitionType)avatarDefinitionTypeProperty.intValue;
switch (avatarDefinitionType)
{
case AvatarDefinitionType.CreateFromThisModel:
if (animationType == AnimationType.Humanoid)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("HumanDescription"), new GUIContent("Human Description", "Human Description used to create the humanoid Avatar, when the humanoid rigging type is selected."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("SampleBindPose"), new GUIContent("Sample Bind Pose", "Turn on this field to enforce the loaded Model to the bind-pose when rigging."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("EnforceTPose"), new GUIContent("Enforce T-Pose", "Turn on this field to enforce the loaded Model to the t-pose when rigging."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("HumanoidAvatarMapper"), new GUIContent("Humanoid Avatar Mapper", "Mapper used to map the humanoid Avatar, when the humanoid rigging type is selected."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("HumanDescription"),
new GUIContent("Human Description",
"Human Description used to create the humanoid Avatar, when the humanoid rigging type is selected."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("SampleBindPose"),
new GUIContent("Sample Bind Pose",
"Turn on this field to enforce the loaded Model to the bind-pose when rigging."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("EnforceTPose"),
new GUIContent("Enforce T-Pose",
"Turn on this field to enforce the loaded Model to a T-pose when rigging."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("HumanoidAvatarMapper"),
new GUIContent("Humanoid Avatar Mapper",
"Mapper used to map the humanoid Avatar when the humanoid rigging type is selected."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ApplyAvatarHipsCompensation"),
new GUIContent("Apply Avatar Hips Compensation",
"Turn off this field if your avatars seem to hover over the ground. This disables avatar hips height compensation."));
}
break;
case AvatarDefinitionType.CopyFromOtherAvatar:
EditorGUILayout.PropertyField(serializedObject.FindProperty("Avatar"), new GUIContent("Source", "Source Avatar to use when copying from other Avatar."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("Avatar"),
new GUIContent("Source", "Source Avatar to use when copying from another Avatar."));
break;
}
break;
case AnimationType.Legacy:
EditorGUILayout.PropertyField(serializedObject.FindProperty("AutomaticallyPlayLegacyAnimations"), new GUIContent("Play Legacy Animations Automatically", "Turn on this field to play Legacy Animation Clips automatically (The first available Clip will be played)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("EnforceAnimatorWithLegacyAnimations"), new GUIContent("Enforce Animator with Legacy Animations", "Turn on this field to add an Animator when the AnimationType is set to Legacy."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("AutomaticallyPlayLegacyAnimations"),
new GUIContent("Play Legacy Animations Automatically",
"Turn on this field to play Legacy Animation Clips automatically (The first available Clip will be played)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("EnforceAnimatorWithLegacyAnimations"),
new GUIContent("Enforce Animator with Legacy Animations",
"Turn on this field to add an Animator when the AnimationType is set to Legacy."));
break;
}
if (animationType != AnimationType.None)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("RootBoneMapper"), new GUIContent("Root Bone Mapper", "Mapper used to find the Model root bone."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("RootBoneMapper"),
new GUIContent("Root Bone Mapper", "Mapper used to find the Model root bone."));
}
break;
case 2:
animationTypeProperty = serializedObject.FindProperty("AnimationType");
animationType = (AnimationType)animationTypeProperty.intValue;
//todo: add constraints
if (animationType != AnimationType.None)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("EnsureQuaternionContinuity"), new GUIContent("Ensure Quaternion Continuity", "Turn on this field to realign quaternion keys to ensure shortest interpolation paths."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ResampleFrequency"), new GUIContent("Resample Frequency", "Defines the FBX Rotation Animation Curve resampling frequency. (1 = every frame, 2 = every 2 frames, 3 = every 3 frames and so on)"));
//todo: add keyframe reduction
EditorGUILayout.PropertyField(serializedObject.FindProperty("AnimationWrapMode"), new GUIContent("Wrap Mode", "Default wrap-mode to apply to Animations."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("AnimationClipMappers"), new GUIContent("Animation Clip Mappers", "Mappers used to process Animation Clips."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("AddAllBonesToSkinnedMeshRenderers"), new GUIContent("Add all Bones to Skinned Mesh Renderers", "Turn on this field to add all available bones to every created SkinnedMeshRenderer."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("EnsureQuaternionContinuity"),
new GUIContent("Ensure Quaternion Continuity",
"Turn on this field to realign quaternion keys to ensure the shortest interpolation paths."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ResampleFrequency"),
new GUIContent("Resample Frequency",
"Defines the FBX Rotation Animation Curve resampling frequency. (1 = every frame, 2 = every 2 frames, etc.)"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("AnimationWrapMode"),
new GUIContent("Wrap Mode", "Default wrap-mode to apply to Animations."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("AnimationClipMappers"),
new GUIContent("Animation Clip Mappers", "Mappers used to process Animation Clips."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("AddAllBonesToSkinnedMeshRenderers"),
new GUIContent("Add All Bones to Skinned Mesh Renderers",
"Turn on this field to add all available bones to every created SkinnedMeshRenderer."));
}
break;
case 3:
var importMaterialsProperty = serializedObject.FindProperty("ImportMaterials");
EditorGUILayout.PropertyField(importMaterialsProperty, new GUIContent("Import Materials", "Turn on this field to import Materials."));
EditorGUILayout.PropertyField(importMaterialsProperty,
new GUIContent("Import Materials", "Turn on this field to import Materials."));
if (importMaterialsProperty.boolValue)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("UseMaterialKeywords"), new GUIContent("Use Material Keywords", "Turn on this field to enable/disable created Material Keywords based on the source native Materials."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("AlphaMaterialMode"), new GUIContent("Alpha Material Mode", "Chooses the way TriLib creates alpha materials."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("MaterialMappers"), new GUIContent("Material Mappers", "Mappers used to create suitable Unity Materials from original Materials."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("DoubleSidedMaterials"), new GUIContent("Double Sided Materials", "Turn on this field to create double-sided Materials (TriLib does that by duplicating the original Meshes)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("SetUnusedTexturePropertiesToNull"), new GUIContent("Set unused Texture Properties to Null", "Turn on this field to set the unused Material Texture Properties to null."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("CreateMaterialsForAllModels"), new GUIContent("Create Materials for all Models", "Turn on this field to make TriLib create materials for every loaded model, even models without an original material."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("UseMaterialKeywords"),
new GUIContent("Use Material Keywords",
"Turn on this field to enable/disable created Material keywords based on the source native materials."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("AlphaMaterialMode"),
new GUIContent("Alpha Material Mode", "Chooses the way TriLib creates alpha materials."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("MaterialMappers"),
new GUIContent("Material Mappers", "Mappers used to create suitable Unity Materials from original Materials."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("DoubleSidedMaterials"),
new GUIContent("Double-Sided Materials",
"Turn on this field to create double-sided Materials (TriLib does that by duplicating the original Meshes)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("SetUnusedTexturePropertiesToNull"),
new GUIContent("Set Unused Texture Properties to Null",
"Turn on this field to set unused Material Texture Properties to null."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("UseSharedMaterials"),
new GUIContent("Use Shared Materials",
"Turn on this field to use the renderers' \"sharedMaterials\" property instead of \"materials\"."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("DoPBRConversion"),
new GUIContent("Do PBR Conversion",
"Turn off this field to disable Phong to PBR conversion."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ApplyGammaCurveToMaterialColors"),
new GUIContent("Apply Gamma Curve to Material Colors",
"When this field is on, TriLib will also apply the gamma curve to the material colors."));
}
break;
case 4:
var importTexturesProperty = serializedObject.FindProperty("ImportTextures");
EditorGUILayout.PropertyField(importTexturesProperty, new GUIContent("Import Textures", "Turn on this field to import Textures."));
EditorGUILayout.PropertyField(importTexturesProperty,
new GUIContent("Import Textures", "Turn on this field to import Textures."));
if (importTexturesProperty.boolValue)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("TextureMappers"), new GUIContent("Texture Mappers", "Mappers used to find native Texture Streams from custom sources."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("TextureCompressionQuality"), new GUIContent("Texture Compression Quality", "Texture compression to apply on loaded Textures."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("GenerateMipmaps"), new GUIContent("Generate Mipmaps", "Turn on this field to enable Textures mip-map generation."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("FixNormalMaps"), new GUIContent("Fix Normal Maps", "Turn on this field to change normal map channels order to ABBR instead of RGBA."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("EnforceAlphaChannelTextures"), new GUIContent("Enforce Alpha Channel Textures", "Turn on this field to enforce alpha channel on textures creation."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("TextureMappers"),
new GUIContent("Texture Mappers", "Mappers used to find native Texture Streams from custom sources."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("TextureCompressionQuality"),
new GUIContent("Texture Compression Quality",
"Texture compression to apply on loaded Textures."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("GenerateMipmaps"),
new GUIContent("Generate Mipmaps", "Turn on this field to enable Texture mipmap generation."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("FixNormalMaps"),
new GUIContent("Fix Normal Maps",
"Turn on this field to change the normal map channel order to ABBR instead of RGBA."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("EnforceAlphaChannelTextures"),
new GUIContent("Enforce Alpha Channel Textures",
"Turn on this field to enforce an alpha channel on texture creation."));
var alphaMaterialModeProperty = serializedObject.FindProperty("AlphaMaterialMode");
if (alphaMaterialModeProperty.enumValueIndex > 0)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("ScanForAlphaPixels"), new GUIContent("Scan for Alpha Pixels", "Turn on this field to scan Textures for alpha-blended pixels in order to generate transparent Materials."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ScanForAlphaPixels"),
new GUIContent("Scan for Alpha Pixels",
"Turn on this field to scan textures for alpha-blended pixels to generate transparent Materials."));
}
EditorGUILayout.PropertyField(serializedObject.FindProperty("LoadTexturesAsSRGB"), new GUIContent("Load Textures as sRGB", "Turn off this field to load textures as linear, instead of sRGB."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ApplyGammaCurveToMaterialColors"), new GUIContent("Apply Gamma Curve to Material Colors", "When this field is on, TriLib will also apply the gamma curve to the material colors."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ApplyTexturesOffsetAndScaling"), new GUIContent("Apply Textures Offset and Scaling", "Turn on this field to apply Textures offset and scaling."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("DiscardUnusedTextures"), new GUIContent("Discard Unused Textures", "Turn off this field to keep unused Textures."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ForcePowerOfTwoTextures"), new GUIContent("Force Power of Two Textures", "Turn on this field to enforce power of two resolution when loading textures (needed for texture compression and in some platforms)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("UseUnityNativeTextureLoader"), new GUIContent("Use Unity Native Texture Loader", "Turn on this field to use Unity builtin Texture loader instead of stb_image."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("MaxTexturesResolution"), new GUIContent("Max Textures Resolution", "Use this field to limit textures resolution. Textures with resolutions higher than this value (when the value is not zero) will not be loaded."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ConvertMaterialTexturesUsingHalfRes"), new GUIContent("Convert Material Textures using Half Res", "Turn off this field to generate the \"Metallic/Smoothness/Specular/Roughness\" textures with the full original resolution."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("LoadTexturesAsSRGB"),
new GUIContent("Load Textures as sRGB",
"Turn off this field to load textures as linear instead of sRGB."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ApplyTexturesOffsetAndScaling"),
new GUIContent("Apply Textures Offset and Scaling",
"Turn on this field to apply texture offset and scaling."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("DiscardUnusedTextures"),
new GUIContent("Discard Unused Textures",
"Turn off this field to keep unused Textures."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ForcePowerOfTwoTextures"),
new GUIContent("Force Power of Two Textures",
"Turn on this field to enforce power-of-two resolution when loading textures (needed for compression on some platforms)."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("UseUnityNativeTextureLoader"),
new GUIContent("Use Unity Native Texture Loader",
"Turn on this field to use the Unity built-in Texture loader instead of stb_image."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("MaxTexturesResolution"),
new GUIContent("Max Textures Resolution",
"Use this field to limit texture resolution. Textures with resolutions higher than this value (when not zero) will not be loaded."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ConvertMaterialTexturesUsingHalfRes"),
new GUIContent("Convert Material Textures Using Half Res",
"Turn off this field to generate the \"Metallic/Smoothness/Specular/Roughness\" textures at their full original resolution."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("LoadDisplacementTextures"),
new GUIContent("Load Displacement Textures",
"Turn on this field to load displacement textures."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("LoadTexturesViaWebRequest"),
new GUIContent("Load Textures via Web Request",
"Turn on this field to load textures using the UnityWebRequest class (experimental). " +
"UnityWebRequest is the fastest way to load PNG/JPG textures but uses more memory."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ConvertTexturesAs2D"),
new GUIContent("Convert Textures as 2D",
"Turn off this field to keep processed/composed textures as RenderTextures."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ApplyTransparencyTexture"),
new GUIContent("Apply Transparency Texture",
"Turn off this field to disable composing the Albedo texture using the original material's transparency texture."));
}
break;
case 5:
EditorGUILayout.PropertyField(serializedObject.FindProperty("ExternalDataMapper"), new GUIContent("External Data Mapper", "Mapper used to find data Streams on external sources."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("UserPropertiesMapper"), new GUIContent("User Properties Mapper", " Mapper used to process User Properties from Models."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("LipSyncMappers"), new GUIContent("Lip Sync Mappers", "Mappers used to configure Lip-Sync Blend Shapes."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("NameMapper"), new GUIContent("Name Mapper", "This class can be inherited and used to generate Game Object naming based on file-format model specific data."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("ExternalDataMapper"),
new GUIContent("External Data Mapper", "Mapper used to find data Streams on external sources."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("UserPropertiesMapper"),
new GUIContent("User Properties Mapper", "Mapper used to process User Properties from Models."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("LipSyncMappers"),
new GUIContent("Lip Sync Mappers", "Mappers used to configure Lip-Sync Blend Shapes."));
EditorGUILayout.PropertyField(serializedObject.FindProperty("NameMapper"),
new GUIContent("Name Mapper",
"This class can be inherited and used to generate GameObject naming based on file-format model-specific data."));
break;
}
EditorGUILayout.EndVertical();
serializedObject.ApplyModifiedProperties();
}
}
}

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: e964c5e158b24dc6ad03b0a14c2ef811
timeCreated: 1573053965
timeCreated: 1573053965
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/AssetLoaderOptionsEditor.cs
uploadId: 752923

View File

@@ -1,15 +1,13 @@
using System;
using UnityEditor;
using UnityEditor;
using UnityEditor.Build;
using UnityEditor.Build.Reporting;
using UnityEngine;
using Debug = UnityEngine.Debug;
namespace TriLibCore.Editor
{
public class BuildProcessor : IPreprocessBuildWithReport
{
public int callbackOrder => -1000;
public int callbackOrder => 0;
public void OnPreprocessBuild(BuildReport report)
{
@@ -18,44 +16,17 @@ namespace TriLibCore.Editor
#else
PlayerSettings.WebGL.threadsSupport = false;
#endif
if (!Application.isBatchMode)
{
#if UNITY_WSA
if (!Application.isBatchMode && !PlayerSettings.WSA.GetCapability(PlayerSettings.WSACapability.RemovableStorage) && EditorUtility.DisplayDialog(
"TriLib", "TriLib cache system needs the [RemovableStorage] WSA Capacity enabled. Do you want to enable it?", "Yes", "No"))
if (!PlayerSettings.WSA.GetCapability(PlayerSettings.WSACapability.RemovableStorage) && EditorUtility.DisplayDialog(
"TriLib", "TriLib cache system needs the [RemovableStorage] WSA Capacity enabled. Do you want to enable it now?", "Yes", "No"))
{
PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.RemovableStorage, true);
}
#endif
var waitingMappers = false;
string materialMapper = null;
var arguments = Environment.GetCommandLineArgs();
for (var i = 0; i < arguments.Length; i++)
{
var argument = arguments[i];
if (waitingMappers)
{
materialMapper = argument;
continue;
}
switch (argument)
{
case "-trilib_mappers":
{
waitingMappers = true;
break;
}
}
}
if (materialMapper is object)
{
Debug.Log($"Using the given material mapper:{materialMapper}.");
CheckMappers.SelectMapper(materialMapper);
}
else
{
CheckMappers.Initialize();
}
CheckMappers.EnableCompatibleMaterialMapperIfNeeded();
}
}
}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d556beac2d22e38459a0060666d79950
guid: 48732532528e378478a056f14449aa64
MonoImporter:
externalObjects: {}
serializedVersion: 2
@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/BuildProcessor.cs
uploadId: 752923

View File

@@ -0,0 +1,41 @@
using System;
using TriLibCore.General;
using TriLibCore.Mappers;
using UnityEditor;
using UnityEngine;
namespace TriLibCore.Editor
{
[CustomEditor(typeof(ByNameHumanoidAvatarMapper))]
public class ByNameHumanoidAvatarMapperEditor : UnityEditor.Editor
{
private bool[] _folded = new bool[2];
public override void OnInspectorGUI()
{
_folded[0] = EditorGUILayout.BeginFoldoutHeaderGroup(_folded[0], "String Comparison");
if (_folded[0])
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("stringComparisonMode"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("CaseInsensitive"));
}
EditorGUILayout.EndFoldoutHeaderGroup();
_folded[1] = EditorGUILayout.BeginFoldoutHeaderGroup(_folded[1], "Bones Mapping");
EditorGUILayout.EndFoldoutHeaderGroup();
if (_folded[1])
{
var bonesMapping = serializedObject.FindProperty("BonesMapping");
for (var i = 0; i < bonesMapping.arraySize; i++)
{
var boneMapping = bonesMapping.GetArrayElementAtIndex(i);
var humanBone = boneMapping.FindPropertyRelative("HumanBone");
var enumDisplayNames = humanBone.enumDisplayNames;
var boneNames = boneMapping.FindPropertyRelative("BoneNames");
EditorGUILayout.PropertyField(boneNames, new GUIContent(enumDisplayNames[humanBone.enumValueIndex]));
}
}
serializedObject.ApplyModifiedProperties();
}
}
}

View File

@@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: ae81488757bd60e4db304d3c72f0cfde
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/ByNameHumanoidAvatarMapperEditor.cs
uploadId: 752923

View File

@@ -5,71 +5,72 @@ using UnityEngine;
namespace TriLibCore.Editor
{
/// <summary>
/// Represents a series of Material Mapper utility methods.
/// </summary>
[InitializeOnLoad]
public static class CheckMappers
{
[InitializeOnEnterPlayMode]
[InitializeOnLoadMethod]
public static void Initialize()
[MenuItem("Tools/TriLib/Select Material Mappers based on Rendering Pipeline")]
private static void AutoSelect()
{
var hasAnyMapper = false;
string materialMapperName;
for (var i = 0; i < MaterialMapper.RegisteredMappers.Count; i++)
{
materialMapperName = MaterialMapper.RegisteredMappers[i];
TriLibSettings.SetBool(materialMapperName, false);
}
materialMapperName = AssetLoader.GetCompatibleMaterialMapperName();
SelectMapper(materialMapperName);
}
/// <summary>
/// Enables a compatible Material Mapper if none is found.
/// </summary>
public static void EnableCompatibleMaterialMapperIfNeeded()
{
string materialMapperName;
for (var i = 0; i < MaterialMapper.RegisteredMappers.Count; i++)
{
materialMapperName = MaterialMapper.RegisteredMappers[i];
if (TriLibSettings.GetBool(materialMapperName, false))
{
return;
}
}
EnableCompatibleMaterialMapper();
}
/// <summary>
/// Tries to find the best Material Mapper depending on the Rendering Pipeline.
/// </summary>
public static void EnableCompatibleMaterialMapper()
{
var usingMaterialMapper = false;
for (var i = 0; i < MaterialMapper.RegisteredMappers.Count; i++)
{
var materialMapperName = MaterialMapper.RegisteredMappers[i];
if (TriLibSettings.GetBool(materialMapperName))
{
hasAnyMapper = true;
usingMaterialMapper = true;
break;
}
}
if (!hasAnyMapper)
if (!usingMaterialMapper)
{
string materialMapper;
if (GraphicsSettingsUtils.IsUsingHDRPPipeline)
{
materialMapper = "HDRPMaterialMapper";
}
else if (GraphicsSettingsUtils.IsUsingUniversalPipeline)
{
materialMapper = "UniversalRPMaterialMapper";
}
else
{
materialMapper = "StandardMaterialMapper";
}
Debug.Log($"TriLib is configured to use the '{materialMapper}' Material Mapper. If you want to use different Material Mappers, you can change this setting on the Project Settings/TriLib area.");
TriLibSettings.SetBool(materialMapper, true);
var materialMapperName = AssetLoader.GetCompatibleMaterialMapperName();
SelectMapper(materialMapperName);
}
}
[MenuItem("Tools/TriLib/Select Material Mappers based on Rendering Pipeline")]
public static void AutoSelect()
static CheckMappers()
{
for (var i = 0; i < MaterialMapper.RegisteredMappers.Count; i++)
{
var materialMapperName = MaterialMapper.RegisteredMappers[i];
TriLibSettings.SetBool(materialMapperName, false);
}
string materialMapper;
if (GraphicsSettingsUtils.IsUsingHDRPPipeline)
{
materialMapper = "HDRPMaterialMapper";
}
else if (GraphicsSettingsUtils.IsUsingUniversalPipeline)
{
materialMapper = "UniversalRPMaterialMapper";
}
else
{
materialMapper = "StandardMaterialMapper";
}
SelectMapper(materialMapper);
EnableCompatibleMaterialMapperIfNeeded();
}
public static void SelectMapper(string materialMapper)
{
Debug.Log($"TriLib is configured to use the '{materialMapper}' Material Mapper. If you want to use different Material Mappers, you can change this setting on the Project Settings/TriLib area.");
Debug.Log($"TriLib is configured to use the '{materialMapper}' Material Mapper. If you want to use different Material Mappers, you can change this setting on the 'Edit->Project Settings->TriLib' menu.");
TriLibSettings.SetBool(materialMapper, true);
}
}

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/CheckMappers.cs
uploadId: 752923

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: c201497c49b244e8a7ae0152eb5ad027
timeCreated: 1573070165
timeCreated: 1573070165
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/ImporterOption.cs
uploadId: 752923

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/LipSyncMappingEditor.cs
uploadId: 752923

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/MapperContextActions.cs
uploadId: 752923

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/PreBuiltResources.cs
uploadId: 752923

View File

@@ -0,0 +1,52 @@
using UnityEditor;
using UnityEngine;
namespace TriLibCore.Editor
{
/// <summary>
/// Represents a class with Shader Variant Collection utility methods.
/// </summary>
public static class ShaderVariantCollectionUtils
{
/// <summary>
/// Adds the given Shader Variant Collection to the Graphic Settings preloaded shaders.
/// </summary>
/// <param name="shaderVariantCollection">The Shader Variant Collection to add.</param>
public static void AddShaderVariantCollectionToGraphicSettings(ShaderVariantCollection shaderVariantCollection)
{
var graphicSettingAssets = AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/GraphicsSettings.asset");
if (graphicSettingAssets != null && graphicSettingAssets.Length > 0)
{
var graphicsSettings = new SerializedObject(graphicSettingAssets[0]);
var preloadedShaders = graphicsSettings.FindProperty("m_PreloadedShaders");
preloadedShaders.InsertArrayElementAtIndex(preloadedShaders.arraySize);
preloadedShaders.GetArrayElementAtIndex(preloadedShaders.arraySize - 1).objectReferenceValue = shaderVariantCollection;
graphicsSettings.ApplyModifiedProperties();
}
}
/// <summary>
/// Returns whether the given Shader Variant Collection exists on the Graphic Settings preloaded shaders.
/// </summary>
/// <param name="shaderVariantCollection">The Shader Variant Collection to check for.</param>
/// <returns>Whether the Shader Variant Collection exists on the Graphic Settings preloaded shaders.</returns>
public static bool IsShaderVariantCollectionPreloaded(ShaderVariantCollection shaderVariantCollection)
{
var graphicSettingAssets = AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/GraphicsSettings.asset");
if (graphicSettingAssets != null && graphicSettingAssets.Length > 0)
{
var graphicsSettings = new SerializedObject(graphicSettingAssets[0]);
var preloadedShaders = graphicsSettings.FindProperty("m_PreloadedShaders");
for (var i = 0; i < preloadedShaders.arraySize; i++)
{
if (preloadedShaders.GetArrayElementAtIndex(i).objectReferenceValue == shaderVariantCollection)
{
return true;
}
}
return false;
}
return true;
}
}
}

View File

@@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: 9d608c222bc0e864cbc3769c06a760e0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/ShaderVariantCollectionUtils.cs
uploadId: 752923

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: f2d92827e4bc43d68ac3a39cbdee0da3
timeCreated: 1589229113
timeCreated: 1589229113
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/SimpleAnimationPlayerEditor.cs
uploadId: 752923

View File

@@ -2,7 +2,11 @@
using System;
using UnityEditor;
using Object = UnityEngine.Object;
#if UNITY_2020_2_OR_NEWER
using UnityEditor.AssetImporters;
#else
using UnityEditor.Experimental.AssetImporters;
#endif
namespace TriLibCore.Editor
{
#if !TRILIB_DISABLE_EDITOR_3MF_IMPORT

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLib3MFScriptedImporter.cs
uploadId: 752923

View File

@@ -7,9 +7,13 @@ namespace TriLibCore.Editor
{
public static bool IsSymbolDefined(string targetDefineSymbol)
{
var targetGroup = NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
//var defineSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
var defineSymbols = PlayerSettings.GetScriptingDefineSymbols(targetGroup);
#if UNITY_2020_3_OR_NEWER
var buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
var defineSymbols = PlayerSettings.GetScriptingDefineSymbols(namedBuildTarget);
#else
var defineSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
#endif
var defineSymbolsArray = defineSymbols.Split(';');
for (var i = 0; i < defineSymbolsArray.Length; i++)
{
@@ -20,15 +24,18 @@ namespace TriLibCore.Editor
return true;
}
}
return false;
}
public static void UpdateSymbol(string targetDefineSymbol, bool value)
{
var targetGroup = NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
var defineSymbols = PlayerSettings.GetScriptingDefineSymbols(targetGroup);
//var defineSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
#if UNITY_2020_3_OR_NEWER
var buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
var defineSymbols = PlayerSettings.GetScriptingDefineSymbols(namedBuildTarget);
#else
var defineSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
#endif
var defineSymbolsArray = defineSymbols.Split(';');
var newDefineSymbols = string.Empty;
var isDefined = false;
@@ -42,10 +49,8 @@ namespace TriLibCore.Editor
{
continue;
}
isDefined = true;
}
newDefineSymbols += string.Format("{0};", trimmedDefineSymbol);
}
@@ -53,8 +58,11 @@ namespace TriLibCore.Editor
{
newDefineSymbols += string.Format("{0};", targetDefineSymbol);
}
PlayerSettings.SetScriptingDefineSymbols(targetGroup, newDefineSymbols);
//PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, newDefineSymbols);
#if UNITY_2020_3_OR_NEWER
PlayerSettings.SetScriptingDefineSymbols(namedBuildTarget, newDefineSymbols);
#else
PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, newDefineSymbols);
#endif
}
}
}

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLibDefineSymbolsHelper.cs
uploadId: 752923

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLibDeprecationWarnings.cs
uploadId: 752923

View File

@@ -2,7 +2,11 @@
using System;
using UnityEditor;
using Object = UnityEngine.Object;
#if UNITY_2020_2_OR_NEWER
using UnityEditor.AssetImporters;
#else
using UnityEditor.Experimental.AssetImporters;
#endif
namespace TriLibCore.Editor
{
#if !TRILIB_DISABLE_EDITOR_GLTF_IMPORT

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLibGLTFScriptedImporter.cs
uploadId: 752923

View File

@@ -2,7 +2,11 @@
using System;
using UnityEditor;
using Object = UnityEngine.Object;
#if UNITY_2020_2_OR_NEWER
using UnityEditor.AssetImporters;
#else
using UnityEditor.Experimental.AssetImporters;
#endif
namespace TriLibCore.Editor
{
#if !TRILIB_DISABLE_EDITOR_PLY_IMPORT

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLibPLYScriptedImporter.cs
uploadId: 752923

View File

@@ -2,7 +2,11 @@
using System;
using UnityEditor;
using Object = UnityEngine.Object;
#if UNITY_2020_2_OR_NEWER
using UnityEditor.AssetImporters;
#else
using UnityEditor.Experimental.AssetImporters;
#endif
namespace TriLibCore.Editor
{
#if !TRILIB_DISABLE_EDITOR_STL_IMPORT

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLibSTLScriptedImporter.cs
uploadId: 752923

View File

@@ -1,4 +1,5 @@
#pragma warning disable CS0105
#pragma warning disable CS0618
using UnityEngine;
using TriLibCore.Interfaces;
using UnityEditor;
@@ -19,6 +20,8 @@ namespace TriLibCore.Editor
}
//Editor coroutines are not allowed
assetLoaderOptions.UseCoroutines = false;
//Asset Unloader is not suitable for editor loading
assetLoaderOptions.AddAssetUnloader = false;
return assetLoaderOptions;
}
set => userData = EditorJsonUtility.ToJson(value);

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLibScriptedImporter.cs
uploadId: 752923

View File

@@ -39,7 +39,7 @@ namespace TriLibCore.Editor
GUILayout.Label("You can disable runtime file-formats importing here");
EditorGUILayout.Space();
ShowConditionalToggle("Disable runtime FBX importing", "TRILIB_DISABLE_FBX_IMPORT");
ShowConditionalToggle("Disable runtime gLTF2 importing", "TRILIB_DISABLE_GLTF_IMPORT");
ShowConditionalToggle("Disable runtime glTF2 importing", "TRILIB_DISABLE_GLTF_IMPORT");
ShowConditionalToggle("Disable runtime OBJ importing", "TRILIB_DISABLE_OBJ_IMPORT");
ShowConditionalToggle("Disable runtime STL importing", "TRILIB_DISABLE_STL_IMPORT");
ShowConditionalToggle("Disable runtime PLY importing", "TRILIB_DISABLE_PLY_IMPORT");
@@ -51,7 +51,7 @@ namespace TriLibCore.Editor
EditorPrefs.SetInt("TriLibTimeout", EditorGUILayout.IntField("Loading timeout", EditorPrefs.GetInt("TriLibTimeout", 180)));
GUILayout.Label("You can disable in editor file-formats importing to avoid conflicts with other editor importers");
EditorGUILayout.Space();
ShowConditionalToggle("Disable in editor gLTF2 importing", "TRILIB_DISABLE_EDITOR_GLTF_IMPORT");
ShowConditionalToggle("Disable in editor glTF2 importing", "TRILIB_DISABLE_EDITOR_GLTF_IMPORT");
ShowConditionalToggle("Disable in editor PLY importing", "TRILIB_DISABLE_EDITOR_PLY_IMPORT");
ShowConditionalToggle("Disable in editor 3MF importing", "TRILIB_DISABLE_EDITOR_3MF_IMPORT");
ShowConditionalToggle("Disable in editor STL importing", "TRILIB_DISABLE_EDITOR_STL_IMPORT");
@@ -75,10 +75,8 @@ namespace TriLibCore.Editor
GUILayout.Label("Misc Options", EditorStyles.boldLabel);
GUILayout.Label("Advanced and experimental options");
EditorGUILayout.Space();
//todo: fbx sdk will be included in a future update
//ShowConditionalToggle("Use FBX SDK (Experimental)", "TRILIB_USE_FBXSDK");
ShowConditionalToggle("Enable UWP threaded loading (Experimental)", "TRILIB_ENABLE_UWP_THREADS");
ShowConditionalToggle("Enable gLTF2 Draco decompression (Experimental)", "TRILIB_DRACO");
ShowConditionalToggle("Enable glTF2 Draco decompression (Experimental)", "TRILIB_DRACO");
ShowConditionalToggle("Force synchronous loading", "TRILIB_FORCE_SYNC");
ShowConditionalToggle("Change thread names (Debug purposes only)", "TRILIB_USE_THREAD_NAMES");
ShowConditionalToggle("Disable asset loader options validations", "TRILIB_DISABLE_VALIDATIONS");
@@ -98,13 +96,16 @@ namespace TriLibCore.Editor
{
Application.OpenURL("https://ricardoreis.net/trilibwiki/index.php");
}
if (GUILayout.Button("Discord Server"))
{
Application.OpenURL("https://discord.gg/FV6tqCxY2U");
}
if (GUILayout.Button("Support"))
{
Application.OpenURL("https://ricardoreis.net/contact/");
}
GUILayout.EndHorizontal();
GUILayout.EndVertical();
CheckMappers.Initialize();
base.OnGUI(searchContext);
}

View File

@@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: a5b653e1047e419fb6dc0d9b9d4d2c46
timeCreated: 1573055735
timeCreated: 1573055735
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLibSettingsProvider.cs
uploadId: 752923

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLibSplashScreen.cs
uploadId: 752923

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLibVersionInfo.cs
uploadId: 752923

View File

@@ -1,6 +1,9 @@
using System.IO;
using System;
using System.IO;
using System.Text.RegularExpressions;
using UnityEditor;
using UnityEngine;
using UnityEngine.Windows;
namespace TriLibCore.Editor
{
@@ -8,8 +11,6 @@ namespace TriLibCore.Editor
{
private class Styles
{
public const float WindowWidth = 0.75f;
public const float WindowHeight = 0.5f;
public static readonly GUIStyle HeaderStyle = new GUIStyle("label") { fontSize = 19, fontStyle = FontStyle.Bold, margin = new RectOffset(10, 10, 5, 5) };
public static readonly GUIStyle SubHeaderStyle = new GUIStyle("label") { margin = new RectOffset(10, 10, 5, 5), fontStyle = FontStyle.Bold };
public static readonly GUIStyle TextStyle = new GUIStyle("label") { margin = new RectOffset(20, 20, 5, 5) };
@@ -19,8 +20,12 @@ namespace TriLibCore.Editor
private string _text;
private bool _loaded;
private Vector2 _changeLogScrollPosition;
private Vector2 _notesScrollPosition;
private Vector2 _scrollPosition;
private static readonly string ChangelogPattern = @"(?<=Changelog:)(.*?)(?=(Version Notes:|$))";
private static readonly string VersionNotesPattern = @"(?<=Version Notes:)(.*)";
private static readonly string Pattern = @"(https?://[^\s]+)";
private static readonly Regex URIRegex = new Regex(@"^https?://");
private static TriLibVersionNotes Instance
{
@@ -28,7 +33,6 @@ namespace TriLibCore.Editor
{
var window = GetWindow<TriLibVersionNotes>();
window.titleContent = new GUIContent("TriLib Version Notes");
window.minSize = new Vector2(Styles.WindowWidth * Screen.width, Styles.WindowHeight * Screen.height);
return window;
}
}
@@ -72,61 +76,46 @@ namespace TriLibCore.Editor
}
_loaded = true;
}
EditorGUILayout.BeginVertical();
using (var stringReader = new StringReader(_text))
_scrollPosition = EditorGUILayout.BeginScrollView(_scrollPosition);
var changelogMatch = Regex.Match(_text, ChangelogPattern, RegexOptions.Singleline);
var changelogSection = changelogMatch.Success ? changelogMatch.Value.Trim() : "No changelog found";
var versionNotesMatch = Regex.Match(_text, VersionNotesPattern, RegexOptions.Singleline);
var versionNotesSection = versionNotesMatch.Success ? versionNotesMatch.Value.Trim() : "No version notes found";
GUILayout.Label("Version Notes", Styles.SubHeaderStyle);
var groups = Regex.Split(versionNotesSection, Pattern);
foreach (var group in groups)
{
var changeLogOpen = false;
var version = stringReader.ReadLine();
GUILayout.Label($"TriLib {version}", Styles.HeaderStyle);
for (; ; )
if (!string.IsNullOrEmpty(group))
{
var line = stringReader.ReadLine();
if (line == null)
if (URIRegex.IsMatch(group))
{
break;
}
if (line.ToLowerInvariant() == "changelog:")
{
EditorGUILayout.Space();
GUILayout.Label("Changelog", Styles.SubHeaderStyle);
_changeLogScrollPosition = GUILayout.BeginScrollView(_changeLogScrollPosition, GUILayout.Height(260f));
changeLogOpen = true;
}
else if (line.ToLowerInvariant() == "version notes:")
{
if (changeLogOpen)
GUILayout.BeginHorizontal();
GUILayout.Space(20);
if (EditorGUILayout.LinkButton(group))
{
GUILayout.EndScrollView();
changeLogOpen = false;
Application.OpenURL(group);
}
EditorGUILayout.Space();
GUILayout.Label("Version Notes", Styles.SubHeaderStyle);
var versionInfo = stringReader.ReadToEnd();
_notesScrollPosition = EditorGUILayout.BeginScrollView(_notesScrollPosition);
EditorGUILayout.TextArea(versionInfo, Styles.TextAreaStyle);
EditorGUILayout.EndScrollView();
break;
GUILayout.EndHorizontal();
}
else
{
GUILayout.Label(line, Styles.TextStyle);
EditorGUILayout.TextArea(group, Styles.TextAreaStyle);
}
}
if (changeLogOpen)
{
GUILayout.EndScrollView();
}
EditorGUILayout.EndVertical();
EditorGUILayout.Space();
GUILayout.Label("You can show this window on the Project Settings/TriLib area", Styles.SubHeaderStyle);
EditorGUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();
if (GUILayout.Button("Close", Styles.ButtonStyle))
{
Close();
}
EditorGUILayout.EndHorizontal();
}
EditorGUILayout.Space();
GUILayout.Label("Changelog", Styles.SubHeaderStyle);
EditorGUILayout.TextArea(changelogSection, Styles.TextAreaStyle);
EditorGUILayout.EndScrollView();
EditorGUILayout.Space();
GUILayout.Label("You can show this window on the Project Settings/TriLib area", Styles.SubHeaderStyle);
EditorGUILayout.BeginHorizontal();
GUILayout.FlexibleSpace();
if (GUILayout.Button("Close", Styles.ButtonStyle))
{
Close();
}
EditorGUILayout.EndHorizontal();
}
}
}

View File

@@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 157548
packageName: TriLib 2 - Model Loading Package
packageVersion: 2.5.5
assetPath: Assets/Editor/TriLibCore/Scripts/TriLibVersionNotes.cs
uploadId: 752923

View File

@@ -0,0 +1,45 @@
using UnityEditor;
using UnityEngine;
using System.IO;
using System.Collections.Generic;
using Newtonsoft.Json;
using Studio.Manage;
public class ResourcesFileSizeExporter
{
[MenuItem("Tools/Export Resources File Sizes to JSON")]
public static void ExportFileSizes()
{
string resourcesPath = Application.dataPath + "/Resources";
var sampleAssetPaths = Application.dataPath + "/Resources/Sample";
var fileSizeListWrapper = new FileSizeListWrapper();
if (!Directory.Exists(sampleAssetPaths))
{
return;
}
Dictionary<string, long> fileSizes = new Dictionary<string, long>();
string[] files = Directory.GetFiles(sampleAssetPaths, "*.prefab", SearchOption.AllDirectories);
foreach (string filePath in files)
{
var fileEntry = new FileSizeEntry();
long fileByteSize = new FileInfo(filePath).Length;
string fileName = Path.GetFileNameWithoutExtension(filePath);
fileEntry.name = fileName;
fileEntry.size = fileByteSize;
fileSizeListWrapper.files.Add(fileEntry);
}
string json = JsonConvert.SerializeObject(fileSizeListWrapper);
string outputPath = Path.Combine(resourcesPath, "FileSizes.json");
File.WriteAllText(outputPath, json);
Debug.Log($"파일 이름/크기 정보가 저장되었습니다: {outputPath}");
AssetDatabase.Refresh();
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 5f5ead7d05f396848bdd5d3a16b3587f

View File

@@ -1,273 +0,0 @@
using UnityEngine;
using UnityEditor;
using System.IO;
using System.Collections.Generic;
using XRLib;
using XRLib.Util;
using System.Threading.Tasks;
#if UNITY_EDITOR
using UnityEditor.AddressableAssets.Settings;
using UnityEditor.AddressableAssets;
#endif
namespace Studio
{
public class TwinObjectPreprocessingHelper
{
#if UNITY_EDITOR
static List<TwinContainer> twinContainerList = new();
//[MenuItem("Tools/TwinObjectsSetting")]
//public static void TwinObjectsSetting()
//{
// AutomateTwinObjectSetup();
//}
//존재하지 않은 폴더의 경우 해당 폴더를 생성해주는 메서드
static void CreateFolder(string folderPath)
{
if (Directory.Exists(folderPath))
return;
Directory.CreateDirectory(folderPath);
}
//TODO : 경로를 하드코딩 하는 방식 이외의 다른 방식 활용, Prefab 의 이름 파싱을 이용한 방식 활용(PRF_Robot01_Robot)
static void AutomateTwinObjectSetup()
{
var mainPath = "Assets/Models/";
var beforePath = string.Concat(mainPath, "TwinObject_BeforeProcessing");
var afterPath = string.Concat(mainPath, "TwinObject_AfterProcessing/");
string etcPath = string.Concat(mainPath, "$etc");
CreateFolder(etcPath);
CreateAddressableAssets(beforePath, etcPath, afterPath);
TwinContainerAddressableSetting(twinContainerList);
}
static void CreateAddressableAssets(string beforePath, string etcPath, string afterPath)
{
//beforPath 폴더 안의 타입이 프리팹인 Asset의 guid를 모두 찾습니다.
string[] guids = AssetDatabase.FindAssets("t:Prefab", new string[] { beforePath });
foreach (var guid in guids)
{
//guid 에 해당하는 Asset 의 경로를 찾습니다.
string filePath = AssetDatabase.GUIDToAssetPath(guid);
if (filePath.StartsWith(etcPath))
{
continue;
}
//경로에 해당하는 Asset 을 찾습니다.
var loadAsset = AssetDatabase.LoadAssetAtPath<GameObject>(filePath);
var twinObject = loadAsset.GetComponent<TwinObject>();
string fileName = Path.GetFileName(filePath);
string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(filePath);
string folderPath = string.Concat(afterPath, fileNameWithoutExtension);
string fullPath = string.Concat(folderPath, "/", fileName);
//전처리 완료 폴더를 생성합니다.
CreateFolder(folderPath);
//TwinContainer 를 생성합니다.
var twinContainer = CreateTwinContainer(folderPath, twinObject);
//TwinObject 미리보기 이미지를 생성합니다.
var texture = CreateTwinObjectPortrait(folderPath, twinObject);
//TwinObject 의 모델링 위치, 콜라이더를 초기화 후 파일 위치를 변경합니다.
SetTwinObject(loadAsset);
var moveFilePath = MoveFiles(fileName, filePath, fullPath, etcPath);
AssetDatabase.Refresh();
//TwinContainer 에 데이터를 할당합니다.
TwinContainerSetData(twinContainer, texture, moveFilePath);
twinContainerList.Add(twinContainer);
}
}
static TwinContainer CreateTwinContainer(string folderPath, TwinObject twinObject)
{
var twinContainer = ScriptableObject.CreateInstance<TwinContainer>();
var path = string.Concat(folderPath, "/", twinObject.name, ".asset");
AssetDatabase.CreateAsset(twinContainer, path);
return twinContainer;
}
static Texture2D CreateTwinObjectPortrait(string folderPath, TwinObject twinObject)
{
Texture2D thumbnailTexture = null;
//미리보기 텍스처 생성
while (thumbnailTexture == null)
{
thumbnailTexture = AssetPreview.GetAssetPreview(twinObject.gameObject);
System.Threading.Thread.Sleep(5);
}
var transparentTexture = BackgroundTransparencyProcess(thumbnailTexture);
//텍스처 저장
transparentTexture.name = string.Concat("Texture_", twinObject.name);
byte[] bytes = transparentTexture.EncodeToPNG();
string filePath = string.Concat(folderPath, "/", transparentTexture.name, ".png");
File.WriteAllBytes(filePath, bytes);
AssetDatabase.Refresh();
//텍스처 불러오기
var texture = AssetDatabase.LoadAssetAtPath<Texture2D>(filePath);
return texture;
}
static Texture2D BackgroundTransparencyProcess(Texture2D texture)
{
var transparentTexture = new Texture2D(texture.width, texture.height);
transparentTexture.SetPixels(texture.GetPixels());
for (int h = 0; h < texture.height; h++)
{
for (int w = 0; w < texture.width; w++)
{
transparentTexture.SetPixel(w, h, Color.clear);
if (texture.GetPixel(w, h) != texture.GetPixel(w + 1, h))
break;
}
for (int w = texture.width; w > 0; w--)
{
transparentTexture.SetPixel(w, h, Color.clear);
if (texture.GetPixel(w, h) != texture.GetPixel(w - 1, h))
break;
}
}
transparentTexture.Apply();
return transparentTexture;
}
//작업이 완료된 모델링을 전처리 완료 폴더로 이동시키는 메서드
static string MoveFiles(string fileName, string filePath, string fullPath, string etcPath)
{
if (File.Exists(fullPath) && (filePath != fullPath))
{
int filenum = 0;
string EtcFileName = string.Concat(etcPath, "/", fileName);
while (File.Exists(EtcFileName))
{
filenum++;
EtcFileName = string.Concat(etcPath, "/", filenum.ToString(), "_", fileName);
}
fullPath = EtcFileName;
}
File.Move(filePath, fullPath);
return fullPath;
}
static void TwinContainerSetData(TwinContainer twinContainer, Texture2D texture, string filePath)
{
var moveAsset = AssetDatabase.LoadAssetAtPath<GameObject>(filePath);
var moveTwinObject = moveAsset.GetComponent<TwinObject>();
twinContainer.twinObject = moveTwinObject;
twinContainer.twinObjectPortrait = texture;
}
#region TwinObject Modeling Collider
//TwinObject 의 Modeling 의 위치와 Collider 를 설정하는 메서드
static void SetTwinObject(GameObject twinObject)
{
var bounds = CalculateBounds(twinObject.transform);
SetModelPosition(twinObject.transform, bounds);
SetBoxCollider(twinObject.transform, bounds);
}
//TwinObject 의 Bounds 를 계산하는 메서드
static Bounds CalculateBounds(Transform twinObject)
{
var childRenderers = twinObject.GetComponentsInChildren<Renderer>();
var combinedBounds = childRenderers[0].bounds;
foreach (var childRenderer in childRenderers)
{
combinedBounds.Encapsulate(childRenderer.bounds);
}
return combinedBounds;
}
//TwinObject 의 콜라이더를 크기에 맞게 설정하는 메서드
static void SetBoxCollider(Transform twinObject, Bounds bounds)
{
var boxCollider = twinObject.GetOrAddComponent<BoxCollider>();
boxCollider.size = bounds.size;
boxCollider.center = Vector3.zero;
}
//TwinObject 의 모델링 객체의 위치를 설정하는 메서드
static void SetModelPosition(Transform twinObject, Bounds bounds)
{
var twinObjectChild = twinObject.GetChild(0);
twinObjectChild.position -= bounds.center;
}
#endregion
#region TwinContainer Addressable Asset
private static void TwinContainerAddressableSetting(List<TwinContainer> twinContainers)
{
foreach (var twinContainer in twinContainers)
{
AddressableSetting(twinContainer);
}
}
//TwinContainer 의 Addressable(Group, Label)을 설정하는 메서드
private static void AddressableSetting(TwinContainer twinContainer)
{
AddressableAssetSettings settings = AddressableAssetSettingsDefaultObject.Settings;
var path = AssetDatabase.GetAssetPath(twinContainer);
var guid = AssetDatabase.AssetPathToGUID(path);
var entry = settings.FindAssetEntry(guid);
var label = twinContainer.twinObject.assetLabel.ToString();
var group = CreateOrFindGroup(settings, label);
if (entry == null)
{
entry = settings.CreateOrMoveEntry(guid, group);
}
else
{
entry.address = path;
}
settings.MoveEntry(entry, group);
entry.SetLabel(label, true);
}
//Addressable Group 을 찾고, 찾지 못했으면 해당 Group 을 생성하고 반환하는 메서드
static AddressableAssetGroup CreateOrFindGroup(AddressableAssetSettings settings, string groupName)
{
var group = settings.FindGroup(groupName);
if (group == null)
group = settings.CreateGroup(groupName, false, false, true, null);
return group;
}
#endregion
#endif
}
}

View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: db14844db8d707440bc723fb7a82959c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3167acc57ed2a444aafec0cabecf8ebc
guid: 414be81bcdc9caa4a8dc790330504c1a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

Binary file not shown.

View File

@@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 6514d5d3f61f8164a86185fa7b99553a
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- AppleSDGothicNeoM00
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 209ad2f3b7388ed4da6b37b1355da3a5
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 20, y: 20, z: 20, w: 20}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 09bfec43f3dd1d043bf32547dede95fc
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 12, y: 12, z: 12, w: 12}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 15, y: 15, z: 15, w: 15}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -114,7 +114,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 30, y: 30, z: 30, w: 30}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -114,7 +114,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5ff63a502cab4fe499ba4ba9f2798703
guid: ad0fb2a563bdcaf42bd5f636d49fb089
folderAsset: yes
DefaultImporter:
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2c7e9ae01a3f2fa45bca71c13caf1e41
guid: 80f327edbc04f5042bd7145566c148d6
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 KiB

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c6c3ee8c421360a40ab4d62ff8399813
guid: f5fef85030dc6454286c7e8e08c071e1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5ca17c5d0efbfd44caf4aac40851396d
guid: 75f1ea45fc23df644b41ca330ea2c1c4
folderAsset: yes
DefaultImporter:
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1018 B

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2fb6311e5cc1d9f4e88f6261b87cea63
guid: b40878f93b8e7e345930b3e1f1dcfe13
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: be4cbf97282d7394bbfeb45a740d6fe7
guid: c72945ef5aa7ebf4e98a7cdc90ec80ea
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 8eef45a7894ce094799b9faa5ee2e1a3
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 879 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: d7e293787c7fd5241a49ea9d28ddee55
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 922 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: fe7dcc3af6509a74cbb1eec04d1e61ba
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 834 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 6ce4c9afe0f40c84288f222f580883d5
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: a073d5f770735c04280752bf3f23c2ee
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 20a77b12f32d12e45b0a7ac636e0695b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 14bd4a4aed8c9ca4b85ff867f7dc6e5e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: b3785fd67e6513a4b967306021a6fa68
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 511 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 7a3e81a25aeea9644a1c2ea0f35b0cfa
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 774 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 7e3254ccfd43ffa4bb2c6b316d4f28a2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: b3cbdc9e38ae3da4e8b6701e7e934ddb
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 35, y: 35, z: 35, w: 35}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 61aedac8d0de27a47844e29fb12e9fe5
guid: a0818f9413bb3144cb56afa04c77eb99
folderAsset: yes
DefaultImporter:
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: b7c037db434d8d941801167eb8023f76
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 00ca82eaeef82fc448f382d69a00c338
guid: e0dadfc07389b3e4da3866a2d13c68f5
folderAsset: yes
DefaultImporter:
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: f91153228e2c0b641be4ea5d06f5c876
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: df29797f6db37634097364218d65e93f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 05bd64a2497868a4f9559550cab9c36f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 KiB

Some files were not shown because too many files have changed in this diff Show More