Skip to content

Commit

Permalink
Fix #5
Browse files Browse the repository at this point in the history
  • Loading branch information
olokobayusuf committed Sep 3, 2024
1 parent 512108d commit e79a47c
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 54 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Library/
Temp/
obj/
Logs/
.utmp/

# Function
ProjectSettings/Function.asset
Expand Down
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## 0.0.29
*INCOMPLETE*
+ Fixed Android build errors caused by C++ STL in Unity 2023 and Unity 6 (#5).

## 0.0.28
+ Fixed predictions failing on Android due to predictor embedding error at build time.
Expand Down
Binary file modified Packages/ai.fxn.fxn3d/Plugins/Android/Function.aar
Binary file not shown.
3 changes: 2 additions & 1 deletion ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 11400000, guid: 910e37cfa73f542c99d57762ded74676, type: 2}
- {fileID: 0}
- {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Add the following items to your Unity project's `Packages/manifest.json`:
}
],
"dependencies": {
"ai.fxn.fxn3d": "0.0.28"
"ai.fxn.fxn3d": "0.0.29"
}
}
```
Expand Down
102 changes: 51 additions & 51 deletions UserSettings/Layouts/default-6000.dwlt
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ MonoBehaviour:
m_PixelRect:
serializedVersion: 2
x: 0
y: 53
y: 0
width: 1440
height: 797
height: 900
m_ShowMode: 4
m_Title: Project
m_Title: Hierarchy
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
Expand All @@ -45,7 +45,7 @@ MonoBehaviour:
x: 0
y: 0
width: 1440
height: 797
height: 900
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
Expand Down Expand Up @@ -90,7 +90,7 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 777
y: 880
width: 1440
height: 20
m_MinSize: {x: 0, y: 0}
Expand All @@ -117,11 +117,11 @@ MonoBehaviour:
x: 0
y: 36
width: 1440
height: 741
height: 844
m_MinSize: {x: 400, y: 100}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
controlID: 22
controlID: 76
draggingID: 0
--- !u!114 &6
MonoBehaviour:
Expand All @@ -141,7 +141,7 @@ MonoBehaviour:
x: 0
y: 0
width: 378
height: 741
height: 844
m_MinSize: {x: 201, y: 226}
m_MaxSize: {x: 4001, y: 4026}
m_ActualView: {fileID: 13}
Expand All @@ -167,7 +167,7 @@ MonoBehaviour:
x: 378
y: 0
width: 406.5
height: 741
height: 844
m_MinSize: {x: 202, y: 226}
m_MaxSize: {x: 4002, y: 4026}
m_ActualView: {fileID: 14}
Expand Down Expand Up @@ -195,7 +195,7 @@ MonoBehaviour:
x: 784.5
y: 0
width: 322
height: 741
height: 844
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
Expand All @@ -211,23 +211,23 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ConsoleWindow
m_Name: SceneHierarchyWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 322
height: 371
m_MinSize: {x: 102, y: 126}
height: 422.5
m_MinSize: {x: 202, y: 226}
m_MaxSize: {x: 4002, y: 4026}
m_ActualView: {fileID: 16}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
- {fileID: 16}
m_Selected: 1
m_LastSelected: 0
m_Selected: 0
m_LastSelected: 1
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -244,9 +244,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 371
y: 422.5
width: 322
height: 370
height: 421.5
m_MinSize: {x: 232, y: 276}
m_MaxSize: {x: 10002, y: 10026}
m_ActualView: {fileID: 17}
Expand All @@ -272,7 +272,7 @@ MonoBehaviour:
x: 1106.5
y: 0
width: 333.5
height: 741
height: 844
m_MinSize: {x: 276, y: 76}
m_MaxSize: {x: 4001, y: 4026}
m_ActualView: {fileID: 18}
Expand Down Expand Up @@ -368,9 +368,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 24
y: 36
width: 377
height: 715
height: 818
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
Expand Down Expand Up @@ -933,10 +933,10 @@ MonoBehaviour:
m_TextWithWhitespace: "Game\u200B"
m_Pos:
serializedVersion: 2
x: 379
y: 24
x: 378
y: 36
width: 404.5
height: 715
height: 818
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
Expand All @@ -954,7 +954,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 809, y: 1388}
m_TargetSize: {x: 809, y: 1594}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
Expand All @@ -971,8 +971,8 @@ MonoBehaviour:
vZoomLockedByDefault: 0
m_HBaseRangeMin: -202.25
m_HBaseRangeMax: 202.25
m_VBaseRangeMin: -347
m_VBaseRangeMax: 347
m_VBaseRangeMin: -398.5
m_VBaseRangeMax: 398.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
Expand All @@ -991,22 +991,22 @@ MonoBehaviour:
x: 0
y: 21
width: 404.5
height: 694
height: 797
m_Scale: {x: 1, y: 1}
m_Translation: {x: 202.25, y: 347}
m_Translation: {x: 202.25, y: 398.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -202.25
y: -347
y: -398.5
width: 404.5
height: 694
height: 797
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 809, y: 1430}
m_LastWindowPixelSize: {x: 809, y: 1636}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 00000000000000000000
Expand Down Expand Up @@ -1034,9 +1034,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 784.5
y: 30
y: 36
width: 320
height: 404.5
height: 396.5
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
Expand All @@ -1053,7 +1053,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 7ceeffffcceefffff4efffff34f1ffff18f4ffff
m_ExpandedIDs: aadafffffadaffffecdbffff3adfffff8adfffff88e0ffffc6e3ffff16e4ffff14e5ffffe8e8ffff38e9ffff32eaffffeeeeffff3eefffff62f0ffff0cfbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -1099,10 +1099,10 @@ MonoBehaviour:
m_TextWithWhitespace: "Console\u200B"
m_Pos:
serializedVersion: 2
x: 1
y: 24
x: 784.5
y: 36
width: 320
height: 345
height: 396.5
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
Expand Down Expand Up @@ -1135,10 +1135,10 @@ MonoBehaviour:
m_TextWithWhitespace: "Project\u200B"
m_Pos:
serializedVersion: 2
x: 1
y: 395
x: 784.5
y: 458.5
width: 320
height: 344
height: 395.5
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
Expand All @@ -1161,7 +1161,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Tests
- Packages/ai.fxn.fxn3d/Plugins/Android
m_Globs: []
m_ProductIds:
m_AnyWithAssetOrigin: 0
Expand All @@ -1171,16 +1171,16 @@ MonoBehaviour:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Tests
- Packages/ai.fxn.fxn3d/Plugins/Android
m_LastFoldersGridSize: -1
m_LastProjectPath: /Users/yusuf/Documents/Projects/fxnai/fxn3d
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 76.5}
m_SelectedIDs: c46e0000
m_LastClickedID: 28356
m_ExpandedIDs: 00000000b46e0000b66e0000b86e0000
scrollPos: {x: 0, y: 44.5}
m_SelectedIDs: 2c6e0000
m_LastClickedID: 28204
m_ExpandedIDs: 00000000986d0000046e0000226e000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -1209,7 +1209,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000b46e0000b66e0000b86e0000
m_ExpandedIDs: 00000000986d00009a6d00009c6d0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -1288,10 +1288,10 @@ MonoBehaviour:
m_TextWithWhitespace: "Inspector\u200B"
m_Pos:
serializedVersion: 2
x: 1107.5
y: 24
x: 1106.5
y: 36
width: 332.5
height: 715
height: 818
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
Expand Down

0 comments on commit e79a47c

Please sign in to comment.