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.

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

Trial-level configuration #392

Merged
merged 44 commits into from
Dec 9, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
ac42a69
Changed TrialCount --> TrialConfig
bboudaoud-nv Aug 4, 2022
ead38b2
Start incorporating TrialConfig
bboudaoud-nv Aug 5, 2022
63f9216
Fix for Session::updateBlock()
bboudaoud-nv Aug 5, 2022
f738e0a
Minor signature change for FPSciApp::updateTrial()
bboudaoud-nv Aug 5, 2022
caac43d
Fix TrialConfig shared pointer allocation
bboudaoud-nv Aug 8, 2022
de70a98
Move session target clear from param update
bboudaoud-nv Aug 8, 2022
e23d8fa
Add new referenceTarget state to session
bboudaoud-nv Aug 9, 2022
7bc2533
Update state name and fix config for initPlayer()
bboudaoud-nv Aug 10, 2022
1809d88
Move FPSciGraphics to using trialConfig
bboudaoud-nv Aug 10, 2022
2d6bc4e
Minor fix for respawnTargets() in tests
bboudaoud-nv Aug 10, 2022
838888e
Add session::presentQuestions()
bboudaoud-nv Aug 15, 2022
6a89a8a
Minor change to updateControls() logic
bboudaoud-nv Aug 15, 2022
9c9877b
Split trial and session-level questions
bboudaoud-nv Aug 15, 2022
5accf8d
Add parameter to allow ordered trials
bboudaoud-nv Aug 16, 2022
4fcb66e
Add trial-level question logging
bboudaoud-nv Aug 16, 2022
2402d59
Add randomizeTrialOrder to toAny
bboudaoud-nv Aug 16, 2022
edbc4e9
Add trialParametersToLog parameter
bboudaoud-nv Aug 16, 2022
f2462cf
Fix developer controls for TrialConfig
bboudaoud-nv Aug 17, 2022
eed469c
Fix some respawn mechanic bugs
bboudaoud-nv Aug 18, 2022
4e7a68a
Merge branch 'master' into TrialLevelConfig
bboudaoud-nv Aug 25, 2022
1d88f35
Merge branch 'master' into TrialLevelConfig
bboudaoud-nv Aug 31, 2022
060299e
Merge branch 'master' into TrialLevelConfig
bboudaoud-nv Aug 31, 2022
2c0ba91
Add support for trial ID (logging only)
bboudaoud-nv Nov 14, 2022
7c84f84
Trial ID to Any
bboudaoud-nv Nov 15, 2022
df4ea22
Automatic index-based trial IDs
bboudaoud-nv Nov 15, 2022
d6ce609
Add trial ID unique check
bboudaoud-nv Nov 15, 2022
06c6824
toAny forceAll to false for TrialConfig
bboudaoud-nv Nov 29, 2022
0804f1a
Fix minor typo
jspjutNV Nov 30, 2022
59731e7
Rename trial "ids" to "targetIds" and document
bboudaoud-nv Nov 30, 2022
922da30
Merge branch 'TrialLevelConfig' of https://github.com/NVlabs/FPSci in…
bboudaoud-nv Nov 30, 2022
2915bbc
Fix respawn w/o resetPlayerPositionBetweenTrials
bboudaoud-nv Nov 30, 2022
5d02931
Merge branch 'master' into TrialLevelConfig
jspjutNV Nov 30, 2022
c575de0
Attempt to fix initialHeadingRadians bug
bboudaoud-nv Dec 1, 2022
881e286
Merge branch 'TrialLevelConfig' of https://github.com/NVlabs/FPSci in…
bboudaoud-nv Dec 1, 2022
5168dd3
Fix scene comparison bug
bboudaoud-nv Dec 1, 2022
7f0335a
Fix NaN respawn heading bug that locked view
bboudaoud-nv Dec 1, 2022
560e694
Update session-level members per trial
bboudaoud-nv Dec 1, 2022
a13eab1
Only reload scenes at the trial-level
bboudaoud-nv Dec 1, 2022
aa42b34
Fix autofire test (refer to trial config)
bboudaoud-nv Dec 7, 2022
41e0f7f
Clear loaded scene name on experiment init
bboudaoud-nv Dec 7, 2022
217f78e
Added trials sample
jspjutNV Dec 8, 2022
1c3f4e3
Minor updates and fixes for trial-config sample
bboudaoud-nv Dec 8, 2022
b129686
rename targetmodel sample in packager - bug from #400
jspjutNV Dec 8, 2022
41d3c5f
Switch samples to use `targetIds` for trials
jspjutNV Dec 8, 2022
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
142 changes: 142 additions & 0 deletions data-files/samples/trials.Experiment.Any
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
{
description = "trials";
jspjutNV marked this conversation as resolved.
Show resolved Hide resolved
frameRate = 120;
showHUD = true;
renderWeaponStatus = true;
cooldownMode = "ring";
cooldownColor = Color4(0.7,1.0,0.9,0.75);

weapon = {
id = "2hit";
firePeriod = 0.3;
damagePerSecond = 2;
autoFire = false;
jspjutNV marked this conversation as resolved.
Show resolved Hide resolved
};
sessions = (
{
// This session tests out different weapon cooldowns and cooldown indicators while maintaining 2 hits to kill
id = "1target_cd";
description = "1 target cooldown";
trials = (
{
jspjutNV marked this conversation as resolved.
Show resolved Hide resolved
count = 2;
ids = ( "static");
jspjutNV marked this conversation as resolved.
Show resolved Hide resolved
},
{
count = 2;
ids = ( "static");
cooldownMode = "box";
},
{
count = 2;
ids = ( "static");
cooldownMode = "box";
weapon = {
id = "2hit";
firePeriod = 0.5;
damagePerSecond = 1.1;
autoFire = false;
};
},
{
jspjutNV marked this conversation as resolved.
Show resolved Hide resolved
count = 2;
ids = ( "static");
cooldownMode = "box";
weapon = {
id = "2hit";
firePeriod = 0.5;
damagePerSecond = 1.1;
autoFire = false;
};
},
{
count = 2;
ids = ( "static");
cooldownMode = "box";
weapon = {
id = "2hit";
firePeriod = 0.1;
damagePerSecond = 5.5;
autoFire = false;
};
},
{
jspjutNV marked this conversation as resolved.
Show resolved Hide resolved
count = 2;
ids = ( "static");
cooldownMode = "box";
weapon = {
id = "2hit";
firePeriod = 0.1;
damagePerSecond = 5.5;
autoFire = false;
};
},
);

},
{
// This one assumes the 120 Hz limits for the values below 8.33 ms and creates a nearly 2 frame stutter periodically for most trials
id = "2targets_frames";
description = "2 targets frame timing";
jspjutNV marked this conversation as resolved.
Show resolved Hide resolved
trials = (
{
count = 5;
ids = ( "static", "static");
},
{
count = 5;
ids = ( "static", "static");
frameTimeArray = (0.008, 0.016);
},
{
count = 5;
ids = ( "static", "static");
frameTimeArray = (0.008, 0.008, 0.008, 0.016);
},
{
count = 5;
ids = ( "static", "static");
frameTimeArray = (0.008, 0.008, 0.008, 0.008, 0.008, 0.008, 0.008, 0.016);
},
);

},
{
// This session varies the latency
id = "5targets_latency";
description = "5 targets latency";
trials = (
{
count = 5;
ids = ( "static", "static", "static", "static", "static");
},
{
count = 5;
ids = ( "static", "static", "static", "static", "static");
frameDelay = 1;
},
{
count = 5;
ids = ( "static", "static", "static", "static", "static");
frameDelay = 2;
},
{
count = 5;
ids = ( "static", "static", "static", "static", "static");
frameDelay = 4;
},
);

},
);

targets = (
{
id = "static";
destSpace = "player";
speed = ( 0, 0 );
visualSize = ( 0.05, 0.05 );
},
);

}
11 changes: 11 additions & 0 deletions data-files/samples/trials.Status.Any
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
currentUser = "Sample User";
sessions = ( "1target_cd", "2targets_frames", "5targets_latency");
settingsVersion = 1;
users = (
{
id = "Sample User";
sessions = ( "1target_cd", "2targets_frames", "5targets_latency");
} );

}
2 changes: 2 additions & 0 deletions scripts/package/fpsci_packager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ cp ./data-files/samples/weapons.Status.Any dist/samples/
cp ./data-files/samples/weapons.Experiment.Any dist/samples/
cp ./data-files/samples/targets.Status.Any dist/samples/
cp ./data-files/samples/targets.Experiment.Any dist/samples/
cp ./data-files/samples/trials.Status.Any dist/samples/
cp ./data-files/samples/trials.Experiment.Any dist/samples/
cp ./data-files/samples/spheres.Status.Any dist/samples/
cp ./data-files/samples/spheres.Experiment.Any dist/samples/
cp ./data-files/samples/sample.User.Any dist/samples/
Expand Down