Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fix ducks and building rotation #1411

Merged
merged 3 commits into from
May 24, 2024
Merged

Fix ducks and building rotation #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdcc8ce
Fix ducks and building rotation
JackPlaymint May 24, 2024
b6e2180
remove console log
JackPlaymint May 24, 2024
a6e3120
Added ScriptableBuildPipeline.json to gitignore
ldunnplaymint May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
/contracts/node_modules/
/contracts/lib/cog/services/
!/contracts/lib/cog/services/schema/
/map/ProjectSettings/ScriptableBuildPipeline.json
2 changes: 1 addition & 1 deletion frontend/src/components/map/Buildings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const Buildings = memo(
const coords = getCoords(b.location.tile);
const height = getTileHeightFromCoords(coords);
const selected = selectedElementID === b.id ? 'outline' : 'none';
const rotation = b.facingDirection == FacingDirectionKind.RIGHT ? -30 : 30;
const rotation = b.facingDirection && b.facingDirection == FacingDirectionKind.LEFT ? 30 : -30;
const tile = tiles.find(({ id }) => id === b.location?.tile.id);
const overrideModel = (pluginBuildingProperties || [])
.find((prop) => prop.id == b.id && prop.key == 'model')
Expand Down
14 changes: 7 additions & 7 deletions map/Assets/Addressables/DisplayBuilding/DisplayBuildingMapElement.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ PrefabInstance:
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.038
value: 0.0043643117
objectReference: {fileID: 0}
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
type: 3}
Expand All @@ -459,27 +459,27 @@ PrefabInstance:
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: 0.05016914
objectReference: {fileID: 0}
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
value: 0.70710576
objectReference: {fileID: 0}
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
value: 0.70710784
objectReference: {fileID: 0}
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
type: 3}
Expand All @@ -489,7 +489,7 @@ PrefabInstance:
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
value: 90
objectReference: {fileID: 0}
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
type: 3}
Expand Down
20 changes: 10 additions & 10 deletions map/Assets/Addressables/FactoryBuilding/FactoryBuilding_2.0/Roof_04.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,22 +135,22 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
Expand All @@ -160,7 +160,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
Expand Down Expand Up @@ -241,22 +241,22 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
Expand All @@ -266,7 +266,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
type: 3}
Expand Down
13 changes: 13 additions & 0 deletions map/ProjectSettings/ScriptableBuildPipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"useBuildCacheServer": false,
"cacheServerHost": "",
"cacheServerPort": 8126,
"threadedArchiving": true,
"logCacheMiss": false,
"slimWriteResults": true,
"maximumCacheSize": 20,
"useDetailedBuildLog": false,
"useV2Hasher": true,
"fileIDHashSeed": 0,
"prefabPackedHeaderSize": 2
}
Comment on lines +1 to +13
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you mean to commit this? ... seems unrelated

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not mean to commit this... I also don't know what it is 🤔. It may be a left over from playing with the rendering. I'll remove it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ooookay... turns out it's auto-generated and will appear after a build forever, so I guess we need it. It's also been added in the Graphics update PR I made.

Loading