Skip to content
This repository has been archived by the owner on Dec 5, 2024. It is now read-only.

Commit

Permalink
Add splash logo, edit Schenley scene
Browse files Browse the repository at this point in the history
  • Loading branch information
wheitman committed Apr 15, 2024
1 parent 9b49216 commit bb7f27d
Show file tree
Hide file tree
Showing 17 changed files with 596 additions and 172 deletions.
12 changes: 11 additions & 1 deletion Assets/Scenes/Schenley.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 2928.646, g: 2977.9634, b: 2878.5002, a: 1}
m_IndirectSpecularColor: {r: 2927.7612, g: 2977.3774, b: 2878.3403, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -8513,6 +8513,16 @@ PrefabInstance:
propertyPath: motorTorque
value: 200
objectReference: {fileID: 0}
- target: {fileID: 9161278994281684011, guid: 39eb98849209acb40807569d1d0136ea,
type: 3}
propertyPath: angularSpeedKp
value: 12
objectReference: {fileID: 0}
- target: {fileID: 9161278994281684011, guid: 39eb98849209acb40807569d1d0136ea,
type: 3}
propertyPath: forwardSpeedKp
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
Expand Down
111 changes: 0 additions & 111 deletions Assets/Scripts/HeightmapExportJPG.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Assets/Scripts/HeightmapExportJPG.cs.meta

This file was deleted.

3 changes: 2 additions & 1 deletion Assets/Scripts/ROS/PlantingService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ private void plantSeedling()
Debug.Log("Planting!");

GameObject seedling = Instantiate(seedlingPrefabs[0], transform.position, Quaternion.identity);
seedling.transform.localScale = new Vector3(0.03f, 0.02f, 0.03f);
seedling.transform.localScale = new Vector3(0.1f, 0.06f, 0.1f);
seedling.transform.position.Set(transform.position.x, transform.position.y - 1.0f, transform.position.z);
}

// Update is called once per frame
Expand Down
29 changes: 0 additions & 29 deletions Assets/Scripts/SaveRenderTextureToFile.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Assets/Scripts/SaveRenderTextureToFile.cs.meta

This file was deleted.

4 changes: 3 additions & 1 deletion Assets/Scripts/UnityCar/CarController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void FixedUpdate()
else if (Math.Abs(currentForwardSpeed) > maxSpeed && Math.Abs(angularSpeedError) < 0.1) {
Debug.Log("Coasting!");
wc.motorTorque = 0;
wc.brakeTorque = 0.1f * brakeTorque;
wc.brakeTorque = 0.5f * brakeTorque;
}
// Otherwise, spin the wheels normally.
else
Expand All @@ -132,6 +132,8 @@ void FixedUpdate()
} else {
wc.motorTorque -= spinFactor * currentMotorTorque;
}

Debug.Log(wc.motorTorque);
}
}

Expand Down
Binary file added Assets/arborsim-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 140 additions & 0 deletions Assets/arborsim-logo.png.meta

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

Binary file added Assets/favicon (sprite).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit bb7f27d

Please sign in to comment.