From 5dd5814a9be667beaa95e59ccbe51aeca90bd1ca Mon Sep 17 00:00:00 2001 From: DavidWyand-GG Date: Wed, 12 Dec 2012 13:53:32 -0500 Subject: [PATCH] Fix for Issue #170 Asset loading under Linux --- Templates/Full PhysX/game/art/datablocks/player.cs | 2 +- Templates/Full PhysX/game/art/datablocks/weapon.cs | 2 +- Templates/Full PhysX/game/art/datablocks/weapons/Ryder.cs | 6 +++--- .../game/art/shapes/actors/Soldier/soldier_rigged.cs | 2 +- Templates/Full/game/art/datablocks/player.cs | 2 +- Templates/Full/game/art/datablocks/vehicles/cheetahCar.cs | 6 +++--- Templates/Full/game/art/datablocks/weapon.cs | 2 +- Templates/Full/game/art/datablocks/weapons/Ryder.cs | 6 +++--- Templates/Full/game/art/shapes/Cheetah/wheel.cs | 2 +- Templates/Full/game/art/shapes/Cheetah/wheelBack.cs | 2 +- .../Full/game/art/shapes/actors/Soldier/soldier_rigged.cs | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Templates/Full PhysX/game/art/datablocks/player.cs b/Templates/Full PhysX/game/art/datablocks/player.cs index 444e25f90..f582c0ef0 100644 --- a/Templates/Full PhysX/game/art/datablocks/player.cs +++ b/Templates/Full PhysX/game/art/datablocks/player.cs @@ -484,7 +484,7 @@ datablock PlayerData(DefaultPlayerData) computeCRC = false; // Third person shape - shapeFile = "art/shapes/actors/Soldier/soldier_rigged.dae"; + shapeFile = "art/shapes/actors/Soldier/soldier_rigged.DAE"; cameraMaxDist = 3; allowImageStateAnimation = true; diff --git a/Templates/Full PhysX/game/art/datablocks/weapon.cs b/Templates/Full PhysX/game/art/datablocks/weapon.cs index 02d57cf9c..4afa9409a 100644 --- a/Templates/Full PhysX/game/art/datablocks/weapon.cs +++ b/Templates/Full PhysX/game/art/datablocks/weapon.cs @@ -28,7 +28,7 @@ datablock SFXProfile(WeaponUseSound) { - filename = "art/sound/weapons/weapon_switch"; + filename = "art/sound/weapons/Weapon_switch"; description = AudioClose3d; preload = true; }; diff --git a/Templates/Full PhysX/game/art/datablocks/weapons/Ryder.cs b/Templates/Full PhysX/game/art/datablocks/weapons/Ryder.cs index 44b8bde63..a94bfa8d6 100644 --- a/Templates/Full PhysX/game/art/datablocks/weapons/Ryder.cs +++ b/Templates/Full PhysX/game/art/datablocks/weapons/Ryder.cs @@ -26,21 +26,21 @@ datablock SFXProfile(RyderFireSound) { - filename = "art/sound/weapons/wpn_Ryder_fire"; + filename = "art/sound/weapons/wpn_ryder_fire"; description = AudioClose3D; preload = true; }; datablock SFXProfile(RyderReloadSound) { - filename = "art/sound/weapons/wpn_Ryder_reload"; + filename = "art/sound/weapons/wpn_ryder_reload"; description = AudioClose3D; preload = true; }; datablock SFXProfile(RyderSwitchinSound) { - filename = "art/sound/weapons/wpn_Ryder_switchin"; + filename = "art/sound/weapons/wpn_ryder_switchin"; description = AudioClose3D; preload = true; }; diff --git a/Templates/Full PhysX/game/art/shapes/actors/Soldier/soldier_rigged.cs b/Templates/Full PhysX/game/art/shapes/actors/Soldier/soldier_rigged.cs index f96693015..f15fe0265 100644 --- a/Templates/Full PhysX/game/art/shapes/actors/Soldier/soldier_rigged.cs +++ b/Templates/Full PhysX/game/art/shapes/actors/Soldier/soldier_rigged.cs @@ -22,7 +22,7 @@ singleton TSShapeConstructor(SoldierDAE) { - baseShape = "./soldier_rigged.dae"; + baseShape = "./soldier_rigged.DAE"; loadLights = "0"; unit = "1.0"; upAxis = "DEFAULT"; diff --git a/Templates/Full/game/art/datablocks/player.cs b/Templates/Full/game/art/datablocks/player.cs index 7eb6cb515..746c7b309 100644 --- a/Templates/Full/game/art/datablocks/player.cs +++ b/Templates/Full/game/art/datablocks/player.cs @@ -484,7 +484,7 @@ datablock PlayerData(DefaultPlayerData) computeCRC = false; // Third person shape - shapeFile = "art/shapes/actors/Soldier/soldier_rigged.dae"; + shapeFile = "art/shapes/actors/Soldier/soldier_rigged.DAE"; cameraMaxDist = 3; allowImageStateAnimation = true; diff --git a/Templates/Full/game/art/datablocks/vehicles/cheetahCar.cs b/Templates/Full/game/art/datablocks/vehicles/cheetahCar.cs index 3fa839546..8cd276ecb 100644 --- a/Templates/Full/game/art/datablocks/vehicles/cheetahCar.cs +++ b/Templates/Full/game/art/datablocks/vehicles/cheetahCar.cs @@ -274,7 +274,7 @@ datablock WheeledVehicleTire(CheetahCarTire) // forces to move the vehicle. These distortion/spring forces // are what convert wheel angular velocity into forces that // act on the rigid body. - shapeFile = "art/shapes/Cheetah/wheel.dae"; + shapeFile = "art/shapes/Cheetah/wheel.DAE"; staticFriction = 4.2; kineticFriction = "1"; @@ -296,7 +296,7 @@ datablock WheeledVehicleTire(CheetahCarTireRear) // forces to move the vehicle. These distortion/spring forces // are what convert wheel angular velocity into forces that // act on the rigid body. - shapeFile = "art/shapes/Cheetah/wheelBack.dae"; + shapeFile = "art/shapes/Cheetah/wheelBack.DAE"; staticFriction = "7.2"; kineticFriction = "1"; @@ -324,7 +324,7 @@ datablock WheeledVehicleSpring(CheetahCarSpring) datablock WheeledVehicleData(CheetahCar) { category = "Vehicles"; - shapeFile = "art/shapes/Cheetah/Cheetah_Body.dae"; + shapeFile = "art/shapes/Cheetah/Cheetah_Body.DAE"; emap = 1; mountPose[0] = sitting; diff --git a/Templates/Full/game/art/datablocks/weapon.cs b/Templates/Full/game/art/datablocks/weapon.cs index 02d57cf9c..4afa9409a 100644 --- a/Templates/Full/game/art/datablocks/weapon.cs +++ b/Templates/Full/game/art/datablocks/weapon.cs @@ -28,7 +28,7 @@ datablock SFXProfile(WeaponUseSound) { - filename = "art/sound/weapons/weapon_switch"; + filename = "art/sound/weapons/Weapon_switch"; description = AudioClose3d; preload = true; }; diff --git a/Templates/Full/game/art/datablocks/weapons/Ryder.cs b/Templates/Full/game/art/datablocks/weapons/Ryder.cs index 44b8bde63..a94bfa8d6 100644 --- a/Templates/Full/game/art/datablocks/weapons/Ryder.cs +++ b/Templates/Full/game/art/datablocks/weapons/Ryder.cs @@ -26,21 +26,21 @@ datablock SFXProfile(RyderFireSound) { - filename = "art/sound/weapons/wpn_Ryder_fire"; + filename = "art/sound/weapons/wpn_ryder_fire"; description = AudioClose3D; preload = true; }; datablock SFXProfile(RyderReloadSound) { - filename = "art/sound/weapons/wpn_Ryder_reload"; + filename = "art/sound/weapons/wpn_ryder_reload"; description = AudioClose3D; preload = true; }; datablock SFXProfile(RyderSwitchinSound) { - filename = "art/sound/weapons/wpn_Ryder_switchin"; + filename = "art/sound/weapons/wpn_ryder_switchin"; description = AudioClose3D; preload = true; }; diff --git a/Templates/Full/game/art/shapes/Cheetah/wheel.cs b/Templates/Full/game/art/shapes/Cheetah/wheel.cs index 22116b8a7..8dfe9786e 100644 --- a/Templates/Full/game/art/shapes/Cheetah/wheel.cs +++ b/Templates/Full/game/art/shapes/Cheetah/wheel.cs @@ -22,7 +22,7 @@ singleton TSShapeConstructor(WheelDae) { - baseShape = "./wheel.dae"; + baseShape = "./wheel.DAE"; lodType = "TrailingNumber"; neverImport = "null EnvironmentAmbientLight"; matNamePrefix = ""; diff --git a/Templates/Full/game/art/shapes/Cheetah/wheelBack.cs b/Templates/Full/game/art/shapes/Cheetah/wheelBack.cs index 10eab60cf..16ab71350 100644 --- a/Templates/Full/game/art/shapes/Cheetah/wheelBack.cs +++ b/Templates/Full/game/art/shapes/Cheetah/wheelBack.cs @@ -22,7 +22,7 @@ singleton TSShapeConstructor(WheelBackDae) { - baseShape = "./wheelBack.dae"; + baseShape = "./wheelBack.DAE"; lodType = "TrailingNumber"; neverImport = "null EnvironmentAmbientLight"; matNamePrefix = ""; diff --git a/Templates/Full/game/art/shapes/actors/Soldier/soldier_rigged.cs b/Templates/Full/game/art/shapes/actors/Soldier/soldier_rigged.cs index f96693015..f15fe0265 100644 --- a/Templates/Full/game/art/shapes/actors/Soldier/soldier_rigged.cs +++ b/Templates/Full/game/art/shapes/actors/Soldier/soldier_rigged.cs @@ -22,7 +22,7 @@ singleton TSShapeConstructor(SoldierDAE) { - baseShape = "./soldier_rigged.dae"; + baseShape = "./soldier_rigged.DAE"; loadLights = "0"; unit = "1.0"; upAxis = "DEFAULT";