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

Fixed Pilus Physics Size #1373

Merged
merged 19 commits into from
Jun 6, 2020
+10 −2
Merged

Fixed Pilus Physics Size #1373

Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
606342f
Fixed up pilus physics size, with a really crappy debug mesh on this …
CoreyHendrey Jun 5, 2020
129e769
Removed debug shape
CoreyHendrey Jun 5, 2020
0971312
Only adding the collission shape once. Works for the meshinstance, bu…
CoreyHendrey Jun 5, 2020
44c468f
Fixed Pilus, no long destroying and recreating the collission shape e…
CoreyHendrey Jun 5, 2020
45178c0
Removed debug collission check
CoreyHendrey Jun 5, 2020
b0cf730
Added a function to create the collision shape
CoreyHendrey Jun 5, 2020
a3d3874
Added a ShouldScale flag to PlacedOrganelles
CoreyHendrey Jun 5, 2020
e80ba52
Added a ShouldScale attribute to PlacedOrganelles
CoreyHendrey Jun 5, 2020
575251e
Fixed formatting errors
CoreyHendrey Jun 5, 2020
6fcfb7f
Removed shouldScale from OnAttachToCell
CoreyHendrey Jun 5, 2020
ffcc24b
Formatting error
CoreyHendrey Jun 5, 2020
a15f51f
Made ShouldScale a property in the organelle.json
CoreyHendrey Jun 5, 2020
f29b3d3
Removed unused method
CoreyHendrey Jun 5, 2020
cb62c08
Made the pilus support n number of collision shapes
CoreyHendrey Jun 6, 2020
735a7aa
Updated ShouldScale comment explanation
CoreyHendrey Jun 6, 2020
fd9afaf
Reverted all changes to PilusComponent as they are not needed now
CoreyHendrey Jun 6, 2020
5469a62
Fixed glitch that caused OnPositionChanged to fire every frame
CoreyHendrey Jun 6, 2020
93215a5
Fixed formatting issues
CoreyHendrey Jun 6, 2020
9ac0f31
Merge branch 'master' into 1064_pilus_physics_size
hhyyrylainen Jun 6, 2020
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
8 changes: 4 additions & 4 deletions src/microbe_stage/organelle_components/PilusComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected override void OnPositionChanged(Quat rotation, float angle,
membraneCoords *= 0.5f;
}

float pilusSize = 4.6f;
float pilusSize = 3.2f;

// Scale the size down for bacteria
if (organelle.ParentMicrobe.Species.IsBacteria)
Expand All @@ -54,8 +54,8 @@ protected override void OnPositionChanged(Quat rotation, float angle,
// pilusSize);

var shape = new CylinderShape();
shape.Radius = pilusSize / 10.0f;
shape.Height = pilusSize;
shape.Radius = pilusSize / 8.0f;
shape.Height = pilusSize * organelle.Scale.Length();

var parentMicrobe = organelle.ParentMicrobe;

Expand All @@ -66,7 +66,7 @@ protected override void OnPositionChanged(Quat rotation, float angle,
// parentMicrobe what is a pilus part of the collision
// pilusShape.SetCustomTag(PHYSICS_PILUS_TAG);

var transform = new Transform(physicsRotation, membraneCoords);
var transform = new Transform(physicsRotation, membraneCoords * organelle.Scale);
parentMicrobe.ShapeOwnerSetTransform(ownerId, transform);

parentMicrobe.AddPilus(ownerId);
Expand Down