speed-dreams/speed-dreams-code
6
1
Fork 2
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity Actions 2

- Update mpa11-murasama

Browse source 
- Update OsgOptions
- Update grcar.cpp (for wing type)

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5943 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 51345a3d20e3cae2325011d9769230731bb7a432
Former-commit-id: 0f48c79c55ec6ba2b1ef1bbfeebd59ad246c4491
This commit is contained in:
torcs-ng 2015-04-02 20:30:41 +00:00
parent 51ad9345ad
commit d2711e09de
3 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/graphic/osggraph/Utils/OsgOptions.cpp
View file

@ -4,7 +4,7 @@
created : Thu Mar 31 00:00:41 CEST 2015 created : Thu Mar 31 00:00:41 CEST 2015
copyright : (C) 2015 by Xavier Bertaux copyright : (C) 2015 by Xavier Bertaux
email : bertauxx@yahoo.fr email : bertauxx@yahoo.fr
version : $Id: OsgOptions.cpp 4693 2012-04-13 03:12:09Z torcs-ng $ version : $Id: OsgOptions.cpp 5940 2015-04-01 03:12:09Z torcs-ng $
***************************************************************************/ ***************************************************************************/

32
src/modules/graphic/osggraph/Utils/OsgOptions.h
View file

@ -4,7 +4,7 @@
created : Thu Mar 31 00:00:41 CEST 2015 created : Thu Mar 31 00:00:41 CEST 2015
copyright : (C) 2015 by Xavier Bertaux copyright : (C) 2015 by Xavier Bertaux
email : bertauxx@yahoo.fr email : bertauxx@yahoo.fr
version : $Id: OsgOptions.h 4693 2012-04-13 03:12:09Z torcs-ng $ version : $Id: OsgOptions.h 5940 2015-04-01 03:12:09Z torcs-ng $
***************************************************************************/ ***************************************************************************/
@ -29,7 +29,37 @@ public:
~SDOptions( void ); ~SDOptions( void );
private: private:
unsigned int _SmokeValue;
unsigned int _SmokeDuration;
unsigned int _SmokeInterval;
unsigned int _SkidValue;
unsigned int _SkidLength;
unsigned int _SkidInterval;
unsigned int _LOD;
bool _bgsky;
unsigned int _DynamicSkyDome;
unsigned int _SkyDomeDistance;
unsigned int _Max_Visibility;
unsigned int _PrecipitationDensity;
unsigned int _Rain;
unsigned int _CloudLayer;
unsigned int _SceneLOD;
bool _Cockpit3D;
unsigned int _ShadowType;
int _ShadowSize;
unsigned int _ShadowQuality;
unsigned int _Shaders;
int _ShadersQuality;
int _ShadersSize;
bool _NormalMap;
}; };
#endif /* _OSGOPTIONS_H_ */ #endif /* _OSGOPTIONS_H_ */

12
src/modules/graphic/ssggraph/grcar.cpp
View file

@ -310,7 +310,8 @@ initWheel(tCarElt *car, int wheel_index, const char *wheel_mod_name)
whl_branch->addKid(whl); whl_branch->addKid(whl);
/* Rim */ /* Rim */
switch(wheel_index) { switch(wheel_index)
{
case FRNT_RGT: case FRNT_RGT:
case REAR_RGT: case REAR_RGT:
b_offset = -0.05; b_offset = -0.05;
@ -325,7 +326,8 @@ initWheel(tCarElt *car, int wheel_index, const char *wheel_mod_name)
float colorfactor[2]; float colorfactor[2];
float norm_orig = nrm[1]; float norm_orig = nrm[1];
if (nrm[1] > 0.0f) { if (nrm[1] > 0.0f)
{
colorfactor[0] = 0.3f; colorfactor[0] = 0.3f;
colorfactor[1] = 1.0f; colorfactor[1] = 1.0f;
nrm[1] *= -1.0f; nrm[1] *= -1.0f;
@ -819,11 +821,13 @@ grInitCar(tCarElt *car)
if (grSpeedway) if (grSpeedway)
{ {
if (grSpeedwayshort) if (grSpeedwayshort)
param = GfParmGetStr(handle, path, PRM_WING_2, NULL); param = GfParmGetStr(handle, path, PRM_WING_1, NULL);
else else
param = GfParmGetStr(handle, path, PRM_WING_3, NULL); param = GfParmGetStr(handle, path, PRM_WING_2, NULL);
} }
else
param = GfParmGetStr(handle, path, PRM_WING_3, NULL);
ssgEntity *wingEntity = grssgCarLoadAC3D(param, NULL, index); ssgEntity *wingEntity = grssgCarLoadAC3D(param, NULL, index);
carBody->addKid(wingEntity); carBody->addKid(wingEntity);