Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

merge

Browse source
This commit is contained in:
rti 2010-06-24 22:13:38 +02:00
commit 61e3836666
13 changed files with 68 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/changelog.template Normal file
View file

@ -0,0 +1,6 @@
# To generate ChangeLog files use these commands :
# hg log -M --style ./changelog.template nel > nel/ChangeLog
# hg log -M --style ./changelog.template ryzom > ryzom/ChangeLog
header = '\n{date|shortdate} {author}\n\n'
changeset = '\t* {desc|fill68|tabindent|strip} [r{rev}]\n'

2
code/nel/include/nel/3d/quad_grid.h
View file

@ -152,7 +152,7 @@ public:
* Speed is in O(1 * L*H) where L*H is the number of squares surrounded by the element
*
* Warning! : bboxmin and bboxmax are multiplied by matrix setuped by changeBase. This work for any
* matrix with 90deg rotations (min and max are recomputed internally), but not with any rotation (43° ...)
* matrix with 90deg rotations (min and max are recomputed internally), but not with any rotation (43 degrees ...)
* because of the nature of AABBox. To do this correclty you should compute the bbox min and max in the
* basis given in changeBase, and insert() with multiplying min and max with inverse of this basis.
* eg:

2
code/nel/src/3d/ps_emitter.cpp
View file

@ -2676,7 +2676,7 @@ void CPSRadialEmitter::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
void CPSRadialEmitter::emit(const NLMISC::CVector &srcPos, uint32 index, NLMISC::CVector &pos, NLMISC::CVector &speed)
{
NL_PS_FUNC(CPSRadialEmitter_emit)
// TODO : verifier que ca marche si une particule s'emet elle-mem
// TODO : verify if it works when a particle emits itself
nlassert(_EmittedType);
static const double divRand = (2.0 / RAND_MAX);

8
code/nel/src/3d/zone_lighter.cpp
View file

@ -952,10 +952,10 @@ void CZoneLighter::light (CLandscape &landscape, CZone& output, uint zoneToLight
_ProcessCount=MAX_CPU_PROCESS;
// Number of obstacle polygones
printf ("Obstacle polygones : %zu\n", obstacles.size ());
nlinfo ("Obstacle polygones : %zu", obstacles.size ());
// Number of CPUS used
printf ("Number of CPU used: %d\n", _ProcessCount);
nlinfo ("Number of CPU used: %d", _ProcessCount);
// Zone pointer
CZone *pZone=landscape.getZone (_ZoneToLight);
@ -999,14 +999,14 @@ void CZoneLighter::light (CLandscape &landscape, CZone& output, uint zoneToLight
lightPos = description.SunCenter - (description.SunDirection * description.SunDistance) + lightPos;
InitZBuffer (zbuffer, lightPos, _RayBasis, zoneBB, description.ZBufferLandscapeSize, description);
printf ("Zbuffer %d size : %d x %d\n", sampleX+sampleY*description.SoftShadowSamplesSqrt, zbuffer.LocalZBufferWidth, zbuffer.LocalZBufferHeight);
nlinfo ("Zbuffer %d size : %d x %d", sampleX+sampleY*description.SoftShadowSamplesSqrt, zbuffer.LocalZBufferWidth, zbuffer.LocalZBufferHeight);
}
// *** Init the zbuffer for the vegetation
CVector lightPos = description.SunCenter - (description.SunDirection * description.SunDistance);
InitZBuffer (_ZBufferObject, lightPos, _RayBasis, zoneBB, description.ZBufferObjectSize, description);
printf ("Zbuffer object size : %d x %d\n", _ZBufferObject.LocalZBufferWidth, _ZBufferObject.LocalZBufferHeight);
nlinfo ("Zbuffer object size : %d x %d", _ZBufferObject.LocalZBufferWidth, _ZBufferObject.LocalZBufferHeight);
// Compute the zbuffer in multi thread

6
code/nel/src/sound/audio_mixer_user.cpp
View file

@ -383,7 +383,6 @@ void CAudioMixerUser::initDriver(const std::string &driverName)
delete _SoundDriver; _SoundDriver = NULL;
throw;
}
}
/// Get the available devices on the loaded driver.
@ -556,20 +555,16 @@ void CAudioMixerUser::initDevice(const std::string &deviceName, const CInitInfo
buildSampleBankList();
}
// Init music channels
for (i = 0; i < _NbMusicChannelFaders; ++i)
_MusicChannelFaders[i].init(_SoundDriver);
// Create the background sound manager.
_BackgroundSoundManager = new CBackgroundSoundManager();
// Create the background music manager
_BackgroundMusicManager = new CMusicSoundManager();
// Load the sound bank
CSoundBank *soundBank = new CSoundBank();
_SoundBank = soundBank;
@ -599,7 +594,6 @@ void CAudioMixerUser::initDevice(const std::string &deviceName, const CInitInfo
NLGEORGES::UFormElm &root = form->getRootNode();
// read track reserve
uint32 highestRes, highRes, midRes, lowRes;
root.getValueByName(highestRes, ".HighestPriorityReserve");

4
code/nel/src/sound/driver/buffer.cpp
View file

@ -223,12 +223,12 @@ void IBuffer::encodeADPCM(const sint16 *indata, uint8 *outdata, uint nbSample, T
/* Step 4 - Clamp previous value to 16 bits */
if ( valpred > 32767 )
{
printf("over+ %d\n",valpred);
nlwarning("over+ %d",valpred);
valpred = 32767;
}
else if ( valpred < -32768 )
{
printf("over- %d\n",valpred);
nlwarning("over- %d",valpred);
valpred = -32768;
}

2
code/ryzom/client/src/bg_downloader_access.cpp
View file

@ -486,7 +486,7 @@ void CBGDownloaderAccess::CDownloadCoTask::restartDownloader()
uint tryCounter = 1;
for (;;)
{
nlwarning("Launching downloader: try n°%d", (int) tryCounter++);
nlwarning("Launching downloader: try number %d", (int) tryCounter++);
// now we can create the message queue because we are sure that it will reach the good app
Parent->_DownloaderMsgQueue.init(HInstance, BGDownloader::ClientWndID, BGDownloader::DownloaderWndID);
sleep(200);

4
code/ryzom/client/src/character_cl.cpp
View file

@ -7197,7 +7197,7 @@ ADD_METHOD(void CCharacterCL::updateDisplay(CEntityCL *parent))
AnimMatrixRot.identity();
AnimMatrixRot.setRot(currentAnimRot);
// Rotation 180° Matrix
// Rotation 180 degrees Matrix
CMatrix rot180;
rot180.identity();
if(parent == 0)
@ -7273,7 +7273,7 @@ ADD_METHOD(void CCharacterCL::updateDisplay(CEntityCL *parent))
{
H_AUTO ( RZ_Client_Entity_CL_Update_Display_Unknown_Anim )
// Rotation 90° Matrix
// Rotation 90 degrees Matrix
CMatrix rot90;
rot90.identity();
if(parent == 0)

1
code/ryzom/client/src/entity_cl.cpp
View file

@ -3500,6 +3500,7 @@ void CEntityCL::setStateFx(const std::string &fxName)
}
NL3D::UInstance instance = Scene->createInstance(fxName);
if (!instance.empty())
{
_StateFX.cast (instance);

2
code/ryzom/client/src/interface_v3/view_renderer.h
View file

@ -202,7 +202,7 @@ public:
/*
* drawBitmap : draw a bitmap roted by 90° in CW 'rot times'
* drawBitmap : draw a bitmap roted by 90 degrees in CW 'rot times'
* flipv is a boolean that indicates if there is a vertical flip
* this is a 1:1 ratio so if texture is x long there are x pixels on screen
*/

2
code/ryzom/client/src/interface_v3/view_text.cpp
View file

@ -1093,7 +1093,7 @@ void CViewText::updateTextContextMultiLineJustified(uint nMaxWidth, bool expandS
else // it is the only word on the line..
{
// .. so split it
// 1 °) Check if spaces go beyond the end of line
// 1) Check if spaces go beyond the end of line
if (numSpaces * _SpaceWidth > nMaxWidth)
{
uint maxNumSpaces = std::max(1U, (uint) (nMaxWidth / _SpaceWidth));

14
code/ryzom/client/src/main_loop.cpp
View file

@ -3978,11 +3978,11 @@ void updateClouds()
if (InitCloudScape)
{
InitCloudScape = false;
// 1 ° ) set current state
// 1 ) set current state
CCloudState cs;
WeatherManager.computeCloudState(RT.getRyzomDay(), DayNightCycleHour, wc, cs);
updateCloudScape(cs, wc, WeatherManager.getCurrWeatherState().WindIntensity, LightCycleManager.getLightLevel(), 0.f, true);
// 2 ° )set next state
// 2 )set next state
// compute date of next update
const CLightCycleDesc &lcd = LightCycleManager.getLightDesc();
float updateDelay = 0.f;
@ -4404,7 +4404,7 @@ NLMISC_DYNVARIABLE(float, FPS, "The second smoothed frame rate per second")
if (get) *pointer = 1.0f/smoothFPS.getSmoothValue ();
}
// show hide all the debuginf of ui
// show hide all the debuging of ui
NLMISC_COMMAND(debugUI, "Debug the ui : show/hide quads of bboxs and hotspots", "debugUI 1 or 0")
{
if (args.size() > 1) return false;
@ -4428,28 +4428,28 @@ NLMISC_COMMAND(debugUI, "Debug the ui : show/hide quads of bboxs and hotspots",
}
// show hide the debuginf of ui
// show hide the debuging of ui
NLMISC_COMMAND(debugUIView, "Debug the ui : show/hide quads of bboxs and hotspots for views", "")
{
DebugUIView = !DebugUIView;
return true;
}
// show hide the debuginf of ui
// show hide the debuging of ui
NLMISC_COMMAND(debugUICtrl, "Debug the ui : show/hide quads of bboxs and hotspots for ctrl", "")
{
DebugUICtrl = !DebugUICtrl;
return true;
}
// show hide the debuginf of ui
// show hide the debuging of ui
NLMISC_COMMAND(debugUIGroup, "Debug the ui : show/hide quads of bboxs and hotspots for group", "")
{
DebugUIGroup = !DebugUIGroup;
return true;
}
// show hide the debuginf of cells
// show hide the debuging of cells
NLMISC_COMMAND(debugUICell, "Debug the ui : show/hide quads of bboxs for cells", "")
{
DebugUICell = !DebugUICell;

8
code/ryzom/client/src/r2/editor.h
View file

@ -76,7 +76,7 @@ class CDisplayerVisualEntity;
*
* No tool is displayed as "highlighted"
*
* 1°) Mouse in 3D view
* 1) Mouse in 3D view
* --------------------
* The mouse cursor has a little star to indicate "creation mode".
* If creation is not possible at the mouse position, then there's is a little 'stop' icon shown
@ -89,7 +89,7 @@ class CDisplayerVisualEntity;
*
* NB : we don't do creation on LDOWN or RUP in order to allow camera manipulation
*
* 2°) Mouse over UI
* 2) Mouse over UI
* -----------------
* The mouse cursor still has a little star to indicate "creation mode".
* Ideally on some actions, the creation is canceled, and the default tool is backuped;
@ -120,7 +120,7 @@ class CDisplayerVisualEntity;
* - Rotate
* ...
*
* 1°) Mouse in 3D view
* 1) Mouse in 3D view
* --------------------
* a ) Mouse over empty space in scene
* -----------------------------------
@ -168,7 +168,7 @@ class CDisplayerVisualEntity;
* This would requires using something like the middle button or some shift / control combination
* to avoid conflict with the previous events ...
*
* 2°) Mouse over UI
* 2) Mouse over UI
* -----------------
* The mouse is dipslayed as usual
* Events are taken in account by the UI, not by the tool