Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
6331afb
Avatar Spawning
MarioYangNYU Aug 7, 2023
ff5b786
Add logic to take account of different participant types
MarioYangNYU Aug 7, 2023
d1dc08b
update
DavidGoedicke Aug 14, 2023
23461dd
Update .gitignore
DavidGoedicke Aug 14, 2023
63ad0a6
Update .gitignore
DavidGoedicke Aug 14, 2023
6f15276
update
DavidGoedicke Aug 14, 2023
700c0dd
Update .gitignore
DavidGoedicke Aug 14, 2023
bca5475
moved things around
DavidGoedicke Aug 15, 2023
5741c6b
adding the USING_ZED def
DavidGoedicke Aug 15, 2023
e1deb6d
keep moving things
DavidGoedicke Aug 15, 2023
896162f
update
DavidGoedicke Aug 15, 2023
e7ad4c1
code cleaning
DavidGoedicke Aug 16, 2023
dce00a7
actually code cleaning
DavidGoedicke Aug 16, 2023
3be81f3
fixing changes
DavidGoedicke Aug 16, 2023
3fa1721
Merge pull request #30 from FAR-Lab/BreakingChanges
DavidGoedicke Aug 16, 2023
83d3e00
push
DavidGoedicke Aug 16, 2023
3296c34
UI Without VR Keyboard
MarioYangNYU Aug 16, 2023
505d22a
Implemented System Keyboard
MarioYangNYU Aug 17, 2023
a8379a5
Update ConnectionAndSpawning.cs
DavidGoedicke Aug 17, 2023
a03b141
Merge branch 'NewMultiZEDPed' of https://github.com/FAR-Lab/CrossCult…
DavidGoedicke Aug 17, 2023
d198aec
update to enable Editor Coding
DavidGoedicke Aug 17, 2023
a379c67
reworking into abstract classes
DavidGoedicke Aug 17, 2023
581ccfe
Complete UI implementation. Initial connection implementation
MarioYangNYU Aug 21, 2023
d117d47
Complete dictionary implementation. Basic spawning enabled.
MarioYangNYU Aug 22, 2023
c848e06
Fix Connection issues
MarioYangNYU Aug 22, 2023
952b962
Initial fix of the steering wheel. (using Logitech SDK)
MarioYangNYU Aug 22, 2023
bb412cc
UI Canvas & Initial ZED Implementation
MarioYangNYU Aug 24, 2023
89876b4
push
DavidGoedicke Aug 25, 2023
145e2e3
Backup
MarioYangNYU Aug 26, 2023
5097526
XR Hand
MarioYangNYU Aug 26, 2023
043c7b5
Update Rerun
DavidGoedicke Aug 29, 2023
3b5bf52
Non-working backup push
DavidGoedicke Aug 29, 2023
495a615
Network Fixed
DavidGoedicke Aug 30, 2023
639cb7f
minor update
DavidGoedicke Aug 30, 2023
0599e10
Merge branch 'NewMultiZEDPed' of https://github.com/FAR-Lab/CrossCult…
DavidGoedicke Aug 29, 2023
e8722b8
NotWorkingBackup
DavidGoedicke Aug 30, 2023
857d05c
It started working!
DavidGoedicke Sep 1, 2023
8e9dd81
halfway there
DavidGoedicke Sep 8, 2023
5dbd284
workingUpdate
DavidGoedicke Sep 8, 2023
42421d1
added strangeTown
DavidGoedicke Sep 11, 2023
a49ca02
incomplete but progress
DavidGoedicke Sep 12, 2023
65b9fc9
Update StrangeTown
DavidGoedicke Sep 12, 2023
7879206
Parenting for driver works well (VR untested)(adjustment for pedestri…
DavidGoedicke Sep 14, 2023
c569e00
skeleton update
DavidGoedicke Sep 14, 2023
b5ecefa
moving to 2022.3.9f
DavidGoedicke Sep 15, 2023
74cbfa2
update
DavidGoedicke Sep 15, 2023
42e3501
updated reference
DavidGoedicke Sep 29, 2023
5f7c074
ud
DavidGoedicke Oct 12, 2023
b01a2a5
Autonomlus Mode almost working
DavidGoedicke Oct 13, 2023
90f2caf
av UPDATES
DavidGoedicke Oct 16, 2023
f6fef99
small Update
DavidGoedicke Oct 16, 2023
7c6a8d7
Create and adjust CP1-8 spawn points and set preliminary AV waypoints
lees846 Oct 16, 2023
c6fc98b
Hosting enabled
DavidGoedicke Oct 17, 2023
c44f808
update
DavidGoedicke Oct 19, 2023
58161a7
ReRunupdate
DavidGoedicke Oct 25, 2023
08416ad
updates
DavidGoedicke Oct 25, 2023
b6276d6
BrokenChanges, QN needs fixing
DavidGoedicke Oct 28, 2023
c843729
Should Be working again
DavidGoedicke Oct 30, 2023
c01b4c4
Update Rerun
DavidGoedicke Oct 30, 2023
8d17733
semi stable, be careful
DavidGoedicke Nov 1, 2023
a7dac09
Partially working
DavidGoedicke Nov 2, 2023
1fc5a17
Updates to include VR Host
DavidGoedicke Nov 2, 2023
cf90cc9
Significant updates on the server gui and joining as a PC client
DavidGoedicke Nov 3, 2023
7634e89
updates
DavidGoedicke Nov 6, 2023
109a40b
updates
DavidGoedicke Nov 6, 2023
2213135
Update StrangeTown
DavidGoedicke Nov 6, 2023
d581d6a
Test Push Crowd Agents
MarioYangNYU Nov 8, 2023
05acfbd
Pushing Scenarios
estellarise Nov 8, 2023
8636c5e
Merge branch 'NewMultiZEDPed' of https://github.com/FAR-Lab/CrossCult…
estellarise Nov 8, 2023
897a388
Update .gitignore
DavidGoedicke Nov 8, 2023
abd6661
Adding worldreference!
DavidGoedicke Nov 8, 2023
0d238cf
Initial Agent Implementation
MarioYangNYU Nov 8, 2023
1d8038a
Update StrangeTown
estellarise Nov 8, 2023
a0eaec7
Updating scenarios
estellarise Nov 9, 2023
ce4550b
Broken Update(BeCareful)
DavidGoedicke Nov 9, 2023
bf9ee41
callibrationUpdate
DavidGoedicke Nov 9, 2023
d5314f2
KeyBoardUpdate
DavidGoedicke Nov 14, 2023
7aa324b
Crowd Agent Implementation
MarioYangNYU Nov 15, 2023
0947e5a
Disable LogitechSDK
albertosarus23 Nov 15, 2023
b133a66
Merge branch 'NewMultiZEDPed' of https://github.com/FAR-Lab/CrossCult…
MarioYangNYU Nov 16, 2023
b3b2db8
Fixing IP address Field
DavidGoedicke Nov 20, 2023
279ccce
updated StrangeTown
DavidGoedicke Nov 20, 2023
0c2f65a
Temp Single Zed
DavidGoedicke Nov 27, 2023
0ca8c9e
another day another push
DavidGoedicke Nov 28, 2023
b452c69
Callibration Not ReallyWorking
DavidGoedicke Nov 29, 2023
b9f5797
11/29 -- 17:00
DavidGoedicke Nov 29, 2023
0cd76d6
Mocopi + Unity Version Update
DavidGoedicke Jan 4, 2024
2fbb5ca
RemovedZed Reference added mocopie
DavidGoedicke Jan 4, 2024
345dde0
Update StrangeTown
DavidGoedicke Jan 4, 2024
259f787
mocopi multicast
DavidGoedicke Jan 8, 2024
2cdbbaf
data logger + preload pedestrian position.
DavidGoedicke Jan 10, 2024
77b80c9
Beam Light
MarioYangNYU Jan 10, 2024
16fefa0
2024.1.16-1
DavidGoedicke Jan 16, 2024
1cbc66a
2024.1.18_1
DavidGoedicke Jan 18, 2024
a4af6a9
lots of tiny little things
DavidGoedicke Jan 19, 2024
f68c2df
VRBarrier
MarioYangNYU Jan 22, 2024
36b88b3
Traffic Light
MarioYangNYU Jan 22, 2024
cce8872
Adding scenarios
DavidGoedicke Jan 23, 2024
0c42471
updated dependencies
DavidGoedicke Jan 23, 2024
9f8c13d
Update .gitmodules
DavidGoedicke Jan 24, 2024
15df28d
Update PedestrianWalkingTarget.prefab
DavidGoedicke Jan 24, 2024
fa2158c
Redid walking target prefab
DavidGoedicke Jan 24, 2024
885c535
Update .gitignore
DavidGoedicke Jan 24, 2024
23dc35e
Update GameManagment.unity
DavidGoedicke Jan 24, 2024
ec2fcc3
Fixed QN Buttons
DavidGoedicke Jan 24, 2024
64b46ff
update
DavidGoedicke Jan 24, 2024
1cd68b7
fixing callibration
DavidGoedicke Jan 25, 2024
68a1f7f
fixing tracking loss
DavidGoedicke Jan 26, 2024
7e537b1
update
DavidGoedicke Jan 26, 2024
fcda239
fixed audioCues for the pedestrian
DavidGoedicke Jan 26, 2024
8c16f5e
Quality of life
DavidGoedicke Jan 29, 2024
53d6a87
Minor Modification To ZED Reference
MarioYangNYU Jan 29, 2024
2d45688
Minor fix to space reference
MarioYangNYU Jan 29, 2024
de11342
Create Barrier only for walker
MarioYangNYU Jan 29, 2024
2927eee
baked light and quality of life
DavidGoedicke Jan 30, 2024
ee091b8
updating scenarios and guardian!
DavidGoedicke Feb 2, 2024
8094cfc
various updates
DavidGoedicke Feb 8, 2024
5ea475e
Update Rerun
DavidGoedicke Feb 8, 2024
deae00e
Various updates
DavidGoedicke Feb 12, 2024
d23c35c
Various updates
DavidGoedicke Feb 12, 2024
dc8c80f
Lights and scenario adaptions
DavidGoedicke Feb 13, 2024
4b7f4d2
spawning guardian only for pedestrians
DavidGoedicke Feb 13, 2024
ce5f9af
Update the scenes, disabling of RayInteractor
DavidGoedicke Feb 15, 2024
f3bf230
minor fixes
DavidGoedicke Feb 22, 2024
a26e0ee
Networked Random Character Implementation
MarioYangNYU Feb 27, 2024
f057bc1
3/8 4pm push
DavidGoedicke Mar 8, 2024
16c2975
Merge branch 'development' of https://github.com/FAR-Lab/CrossCultura…
DavidGoedicke Mar 8, 2024
abea098
Tentative QN Push
MarioYangNYU Mar 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,7 @@ crashlytics-build.properties
# Large Files
*.zip
.DS_Store
/Assets/Ultimate Replay 2.0
/Assets/Oculus
/Assets/Components/LowPolyBusinessPeople
/Assets/Rerun
5 changes: 1 addition & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
[submodule "Assets/Rerun"]
path = Assets/Rerun
url = https://github.com/FAR-Lab/Rerun.git
update = merge

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

1 change: 1 addition & 0 deletions .idea/.idea.CrossCulturalDriving/.idea/vcs.xml

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

260 changes: 257 additions & 3 deletions .idea/.idea.CrossCulturalDriving/.idea/workspace.xml

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"visualstudiotoolsforunity.vstuc"
]
}
10 changes: 10 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
"request": "attach"
}
]
}
108 changes: 54 additions & 54 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
{
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.gitmodules": true,
"**/*.booproj": true,
"**/*.pidb": true,
"**/*.suo": true,
"**/*.user": true,
"**/*.userprefs": true,
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
"**/*.tiff": true,
"**/*.3ds": true,
"**/*.3DS": true,
"**/*.fbx": true,
"**/*.FBX": true,
"**/*.lxo": true,
"**/*.LXO": true,
"**/*.ma": true,
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"**/*.prefab": true,
"**/*.unity": true,
"build/": true,
"Build/": true,
"Library/": true,
"library/": true,
"obj/": true,
"Obj/": true,
"ProjectSettings/": true,
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "CrossCulturalDriving.sln"
}
21 changes: 21 additions & 0 deletions Assets/AvatarBase.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using UnityEngine;

public class AvatarBase : MonoBehaviour
{
private SkinnedMeshRenderer skinnedMeshRenderer;

private void Awake()
{
skinnedMeshRenderer = GetComponentInChildren<SkinnedMeshRenderer>();
}

public void SetMaterialsColor(Color color)
{
Material[] mats = skinnedMeshRenderer.materials;
for (int i = 0; i < mats.Length; i++)
{
mats[i].color = color;
}
skinnedMeshRenderer.materials = mats;
}
}
11 changes: 11 additions & 0 deletions Assets/AvatarBase.cs.meta

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

26 changes: 0 additions & 26 deletions Assets/BackMirrorAnchor.cs

This file was deleted.

87 changes: 87 additions & 0 deletions Assets/CSVFilePlayback.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using UnityEngine;

public class CSVFilePlayback : MonoBehaviour {
public TextAsset File;

public VehicleController aiCar;
// Start is called before the first frame update

private Vector3 startPosition;


private int rowCounter;
private int maxRow;
private float nextTime;

private float[] AccelColume,SteeringColume,ScenarioTimeColume;
void Start() {
Debug.Log(File.bytes);
}

private IEnumerator ReadingInFile(TextAsset theFile) {
return null;
/*
List<string> lines = new List<string>(Regex.Split(theFile.text, "\n|\r|\r\n"));
AccelColume = new float[lines.Count-1]; // -1 for the first line of headers
SteeringColume = new float[lines.Count-1];
ScenarioTimeColume = new float[lines.Count-1];
int AccelColumeid,SteeringColumeid,ScenarioTimeColumeid;


for( int c=0; c<lines.Count;c++){
var elements = lines[c].Split(";");
if (c == 0) {
AccelColumeid = elements.Select((item, i) => new { Item = item, Index = i })
.First(x => x.Item.Contains("AccelB")).Index;
SteeringColumeid = elements.Select((item, i) => new { Item = item, Index = i })
.First(x => x.Item.Contains("SteerB")).Index;
ScenarioTimeColumeid = elements.Select((item, i) => new { Item = item, Index = i })
.First(x => x.Item.Contains("ScenarioTime")).Index;
}
else{
if (c == 1) {

bool suc = true;
suc &= float.TryParse(elements.First(x => x.Contains("HeadPosXA"), out float ai_x));
suc &= float.TryParse(elements.First(x => x.Contains("HeadPosYA"), out float ai_y));
suc &= float.TryParse(elements.First(x => x.Contains("HeadPosZA"), out float ai_z));
suc &= float.TryParse(elements.First(x => x.Contains("HeadrotYA"), out float ai_y_rot));


suc &= float.TryParse(elements.First(x => x.Contains("HeadPosXB"), out float x));
suc &= float.TryParse(elements.First(x => x.Contains("HeadPosYB"), out float y));
suc &= float.TryParse(elements.First(x => x.Contains("HeadPosZB"), out float z));
suc &= float.TryParse(elements.First(x => x.Contains("HeadrotYB"), out float y_rot));

if (suc) {
Debug.Log("found all starting locations");
}
else {
string s="";
elements.ForEach(x => s + x.tostrtring());
Debug.LogError ("Didnt find everything here is the buffer: "+ s);
}


AccelColume[c-1] = elements[AccelColumeid];
SteeringColume = elements[SteeringColumeid];
ScenarioTimeColume = elements[ScenarioTimeColumeid];
}


}

}
*/
}

// Update is called once per frame
void Update()
{

}
}
11 changes: 11 additions & 0 deletions Assets/CSVFilePlayback.cs.meta

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

47 changes: 47 additions & 0 deletions Assets/CalibrationTimerDisplay.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;

public class CalibrationTimerDisplay : MonoBehaviour {
private TextMeshProUGUI Text;

public const float TurnOfDelay = 1f;
// Start is called before the first frame update
void Start() {
Debug.Log(transform.Find("timer"));
Text = transform.Find("timer").GetComponent<TextMeshProUGUI>();
Text.text = "";
SetActive(false);
}



public void StartDispaly() {
SetActive(true);
Text.color=Color.red;
}
private void SetActive(bool val) {

gameObject.SetActive(val);
}
public void updateMessage(string toString) {
Text.text = toString;
}

public void StopDisplay() {
if (gameObject.activeSelf) {
Text.text = "Done!";
Text.color = Color.green;
StartCoroutine(StopDisplayCoroutine());
}

}

private IEnumerator StopDisplayCoroutine() {
yield return new WaitForSeconds(TurnOfDelay);
Text.text = "";
SetActive(false);
}
}
11 changes: 11 additions & 0 deletions Assets/CalibrationTimerDisplay.cs.meta

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

8 changes: 8 additions & 0 deletions Assets/Component_Core.meta

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

8 changes: 8 additions & 0 deletions Assets/Component_Core/Animations.meta

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

Loading