Added assets for the item wheels, and fixed a few things related to them

This commit is contained in:
Fighterguard 2024-10-19 03:56:01 +02:00
parent ba89779ffb
commit cdfcc60e9a
46 changed files with 26 additions and 5 deletions

View file

@ -1416,7 +1416,7 @@ void VR_Init()
vr_comfort_mask = Cvar_Get( "vr_comfort_mask", "0.0", CVAR_ARCHIVE); vr_comfort_mask = Cvar_Get( "vr_comfort_mask", "0.0", CVAR_ARCHIVE);
vr_turn_deadzone = Cvar_Get( "vr_turn_deadzone", "0.2", CVAR_ARCHIVE); vr_turn_deadzone = Cvar_Get( "vr_turn_deadzone", "0.2", CVAR_ARCHIVE);
vr_framerate = Cvar_Get( "vr_framerate", "0", CVAR_ARCHIVE); vr_framerate = Cvar_Get( "vr_framerate", "0", CVAR_ARCHIVE);
vr_use_wheels = Cvar_Get( "vr_use_wheels", "0", 0); vr_use_wheels = Cvar_Get( "vr_use_wheels", "0", CVAR_ARCHIVE);
//Acquire supported refresh rates to populate options in video menu where framerate is selected //Acquire supported refresh rates to populate options in video menu where framerate is selected

View file

@ -715,12 +715,12 @@ SCR_DrawItemWheel (float separation)
int curw, curh; int curw, curh;
int vidwc = (viddef.width/2); int vidwc = (viddef.width/2);
int vidhc = (viddef.height/2); int vidhc = (viddef.height/2);
Draw_GetPicSize(&ringw, &ringh,"/ring.png"); Draw_GetPicSize(&ringw, &ringh,"/wheel/ring.png");
Draw_PicScaled((vidwc - (ringw/2)) + offset_stereo, (vidhc - (ringh/2)), "/ring.png", 1.0f); Draw_PicScaled((vidwc - (ringw/2)) + offset_stereo, (vidhc - (ringh/2)), "/wheel/ring.png", 1.0f);
Draw_GetPicSize(&curw, &curh,"/cursor.png"); Draw_GetPicSize(&curw, &curh,"/wheel/cursor.png");
Draw_PicScaled((vidwc - (curw/2)) + ((polarCursor[0] * cosf(polarCursor[1])) * cursorFactor) + offset_stereo, Draw_PicScaled((vidwc - (curw/2)) + ((polarCursor[0] * cosf(polarCursor[1])) * cursorFactor) + offset_stereo,
(vidwc - (curh/2)) + ((polarCursor[0] * sinf(polarCursor[1])) * cursorFactor), (vidwc - (curh/2)) + ((polarCursor[0] * sinf(polarCursor[1])) * cursorFactor),
"/cursor.png", 1.0f); "/wheel/cursor.png", 1.0f);
for(int i = 0; i < totalIcons; i++) for(int i = 0; i < totalIcons; i++)
{ {

View file

@ -1141,6 +1141,7 @@ ControlsSetMenuItemValues(void)
s_options_vr_height_adjust_box.curvalue = vr_height_adjust->value * 10.0f; s_options_vr_height_adjust_box.curvalue = vr_height_adjust->value * 10.0f;
s_options_crosshair_box.curvalue = ClampCvar(0, 3, crosshair->value); s_options_crosshair_box.curvalue = ClampCvar(0, 3, crosshair->value);
s_options_haptic_slider.curvalue = Cvar_VariableValue("joy_haptic_magnitude") * 10.0F; s_options_haptic_slider.curvalue = Cvar_VariableValue("joy_haptic_magnitude") * 10.0F;
s_options_enable_item_wheels.curvalue = (int)vr_use_wheels->value;
} }
static void static void

BIN
assets/wheel/a_bullets.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 695 B

BIN
assets/wheel/a_cells.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B

BIN
assets/wheel/a_grenades.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 732 B

BIN
assets/wheel/a_rockets.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 731 B

BIN
assets/wheel/a_shells.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 703 B

BIN
assets/wheel/a_slugs.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 794 B

BIN
assets/wheel/cursor.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,015 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/wheel/p_quad.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 606 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/wheel/p_silencer.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 871 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 937 B

BIN
assets/wheel/ring.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
assets/wheel/w_bfg.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 869 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 965 B

BIN
assets/wheel/w_blaster.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 502 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 535 B

BIN
assets/wheel/w_chaingun.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 698 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 781 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 708 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 812 B

BIN
assets/wheel/w_grenades.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 788 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 742 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 827 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 774 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 893 B

BIN
assets/wheel/w_railgun.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 925 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 857 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 983 B

BIN
assets/wheel/w_shotgun.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 757 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 874 B

BIN
assets/wheel/w_sshotgun.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 939 B

View file

@ -161,6 +161,15 @@ import static android.system.Os.setenv;
public void create() public void create()
{ {
try {
AssetManager assets = this.getAssets();
String[] assetList = assets.list("wheel");
for(String filename: assetList){
Log.v("Assets", "qfqfqfqf Filename: " + filename);
}
} catch (IOException e) {
//throw new RuntimeException(e);
}
//This will copy the shareware version of quake2 if user doesn't have anything installed //This will copy the shareware version of quake2 if user doesn't have anything installed
copy_asset("/sdcard/Quake2Quest", "pak0.pak"); copy_asset("/sdcard/Quake2Quest", "pak0.pak");
@ -178,6 +187,17 @@ import static android.system.Os.setenv;
//Comfort Vignette Mask //Comfort Vignette Mask
copy_asset("/sdcard/Quake2Quest", "vignette.tga"); copy_asset("/sdcard/Quake2Quest", "vignette.tga");
//item wheel files
try {
AssetManager assets = this.getAssets();
String[] assetList = assets.list("wheel");
for(String filename: assetList){
copy_asset("/sdcard/Quake2Quest", "wheel/" + filename);
}
} catch (Exception e) {
e.printStackTrace();
}
//Read these from a file and pass through //Read these from a file and pass through
commandLineParams = new String("quake2"); commandLineParams = new String("quake2");