Changed: #878 Fix typos in comments/code
This commit is contained in:
parent
7e1f6dc293
commit
3e9f7eed4b
12 changed files with 62 additions and 67 deletions
|
@ -152,7 +152,7 @@ public:
|
||||||
* Speed is in O(1 * L*H) where L*H is the number of squares surrounded by the element
|
* 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
|
* 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
|
* 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.
|
* basis given in changeBase, and insert() with multiplying min and max with inverse of this basis.
|
||||||
* eg:
|
* eg:
|
||||||
|
|
|
@ -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)
|
void CPSRadialEmitter::emit(const NLMISC::CVector &srcPos, uint32 index, NLMISC::CVector &pos, NLMISC::CVector &speed)
|
||||||
{
|
{
|
||||||
NL_PS_FUNC(CPSRadialEmitter_emit)
|
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);
|
nlassert(_EmittedType);
|
||||||
|
|
||||||
static const double divRand = (2.0 / RAND_MAX);
|
static const double divRand = (2.0 / RAND_MAX);
|
||||||
|
|
|
@ -952,10 +952,10 @@ void CZoneLighter::light (CLandscape &landscape, CZone& output, uint zoneToLight
|
||||||
_ProcessCount=MAX_CPU_PROCESS;
|
_ProcessCount=MAX_CPU_PROCESS;
|
||||||
|
|
||||||
// Number of obstacle polygones
|
// Number of obstacle polygones
|
||||||
printf ("Obstacle polygones : %zu\n", obstacles.size ());
|
nlinfo ("Obstacle polygones : %zu", obstacles.size ());
|
||||||
|
|
||||||
// Number of CPUS used
|
// Number of CPUS used
|
||||||
printf ("Number of CPU used: %d\n", _ProcessCount);
|
nlinfo ("Number of CPU used: %d", _ProcessCount);
|
||||||
|
|
||||||
// Zone pointer
|
// Zone pointer
|
||||||
CZone *pZone=landscape.getZone (_ZoneToLight);
|
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;
|
lightPos = description.SunCenter - (description.SunDirection * description.SunDistance) + lightPos;
|
||||||
|
|
||||||
InitZBuffer (zbuffer, lightPos, _RayBasis, zoneBB, description.ZBufferLandscapeSize, description);
|
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
|
// *** Init the zbuffer for the vegetation
|
||||||
CVector lightPos = description.SunCenter - (description.SunDirection * description.SunDistance);
|
CVector lightPos = description.SunCenter - (description.SunDirection * description.SunDistance);
|
||||||
InitZBuffer (_ZBufferObject, lightPos, _RayBasis, zoneBB, description.ZBufferObjectSize, description);
|
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
|
// Compute the zbuffer in multi thread
|
||||||
|
|
|
@ -383,7 +383,6 @@ void CAudioMixerUser::initDriver(const std::string &driverName)
|
||||||
delete _SoundDriver; _SoundDriver = NULL;
|
delete _SoundDriver; _SoundDriver = NULL;
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get the available devices on the loaded driver.
|
/// Get the available devices on the loaded driver.
|
||||||
|
@ -556,20 +555,16 @@ void CAudioMixerUser::initDevice(const std::string &deviceName, const CInitInfo
|
||||||
buildSampleBankList();
|
buildSampleBankList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Init music channels
|
// Init music channels
|
||||||
for (i = 0; i < _NbMusicChannelFaders; ++i)
|
for (i = 0; i < _NbMusicChannelFaders; ++i)
|
||||||
_MusicChannelFaders[i].init(_SoundDriver);
|
_MusicChannelFaders[i].init(_SoundDriver);
|
||||||
|
|
||||||
|
|
||||||
// Create the background sound manager.
|
// Create the background sound manager.
|
||||||
_BackgroundSoundManager = new CBackgroundSoundManager();
|
_BackgroundSoundManager = new CBackgroundSoundManager();
|
||||||
|
|
||||||
|
|
||||||
// Create the background music manager
|
// Create the background music manager
|
||||||
_BackgroundMusicManager = new CMusicSoundManager();
|
_BackgroundMusicManager = new CMusicSoundManager();
|
||||||
|
|
||||||
|
|
||||||
// Load the sound bank
|
// Load the sound bank
|
||||||
CSoundBank *soundBank = new CSoundBank();
|
CSoundBank *soundBank = new CSoundBank();
|
||||||
_SoundBank = soundBank;
|
_SoundBank = soundBank;
|
||||||
|
@ -599,7 +594,6 @@ void CAudioMixerUser::initDevice(const std::string &deviceName, const CInitInfo
|
||||||
|
|
||||||
NLGEORGES::UFormElm &root = form->getRootNode();
|
NLGEORGES::UFormElm &root = form->getRootNode();
|
||||||
|
|
||||||
|
|
||||||
// read track reserve
|
// read track reserve
|
||||||
uint32 highestRes, highRes, midRes, lowRes;
|
uint32 highestRes, highRes, midRes, lowRes;
|
||||||
root.getValueByName(highestRes, ".HighestPriorityReserve");
|
root.getValueByName(highestRes, ".HighestPriorityReserve");
|
||||||
|
|
|
@ -223,12 +223,12 @@ void IBuffer::encodeADPCM(const sint16 *indata, uint8 *outdata, uint nbSample, T
|
||||||
/* Step 4 - Clamp previous value to 16 bits */
|
/* Step 4 - Clamp previous value to 16 bits */
|
||||||
if ( valpred > 32767 )
|
if ( valpred > 32767 )
|
||||||
{
|
{
|
||||||
printf("over+ %d\n",valpred);
|
nlwarning("over+ %d",valpred);
|
||||||
valpred = 32767;
|
valpred = 32767;
|
||||||
}
|
}
|
||||||
else if ( valpred < -32768 )
|
else if ( valpred < -32768 )
|
||||||
{
|
{
|
||||||
printf("over- %d\n",valpred);
|
nlwarning("over- %d",valpred);
|
||||||
valpred = -32768;
|
valpred = -32768;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -486,7 +486,7 @@ void CBGDownloaderAccess::CDownloadCoTask::restartDownloader()
|
||||||
uint tryCounter = 1;
|
uint tryCounter = 1;
|
||||||
for (;;)
|
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
|
// 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);
|
Parent->_DownloaderMsgQueue.init(HInstance, BGDownloader::ClientWndID, BGDownloader::DownloaderWndID);
|
||||||
sleep(200);
|
sleep(200);
|
||||||
|
|
|
@ -7197,7 +7197,7 @@ ADD_METHOD(void CCharacterCL::updateDisplay(CEntityCL *parent))
|
||||||
AnimMatrixRot.identity();
|
AnimMatrixRot.identity();
|
||||||
AnimMatrixRot.setRot(currentAnimRot);
|
AnimMatrixRot.setRot(currentAnimRot);
|
||||||
|
|
||||||
// Rotation 180° Matrix
|
// Rotation 180 degrees Matrix
|
||||||
CMatrix rot180;
|
CMatrix rot180;
|
||||||
rot180.identity();
|
rot180.identity();
|
||||||
if(parent == 0)
|
if(parent == 0)
|
||||||
|
@ -7273,7 +7273,7 @@ ADD_METHOD(void CCharacterCL::updateDisplay(CEntityCL *parent))
|
||||||
{
|
{
|
||||||
H_AUTO ( RZ_Client_Entity_CL_Update_Display_Unknown_Anim )
|
H_AUTO ( RZ_Client_Entity_CL_Update_Display_Unknown_Anim )
|
||||||
|
|
||||||
// Rotation 90° Matrix
|
// Rotation 90 degrees Matrix
|
||||||
CMatrix rot90;
|
CMatrix rot90;
|
||||||
rot90.identity();
|
rot90.identity();
|
||||||
if(parent == 0)
|
if(parent == 0)
|
||||||
|
|
|
@ -3500,6 +3500,7 @@ void CEntityCL::setStateFx(const std::string &fxName)
|
||||||
}
|
}
|
||||||
|
|
||||||
NL3D::UInstance instance = Scene->createInstance(fxName);
|
NL3D::UInstance instance = Scene->createInstance(fxName);
|
||||||
|
|
||||||
if (!instance.empty())
|
if (!instance.empty())
|
||||||
{
|
{
|
||||||
_StateFX.cast (instance);
|
_StateFX.cast (instance);
|
||||||
|
|
|
@ -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
|
* 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
|
* this is a 1:1 ratio so if texture is x long there are x pixels on screen
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1093,7 +1093,7 @@ void CViewText::updateTextContextMultiLineJustified(uint nMaxWidth, bool expandS
|
||||||
else // it is the only word on the line..
|
else // it is the only word on the line..
|
||||||
{
|
{
|
||||||
// .. so split it
|
// .. 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)
|
if (numSpaces * _SpaceWidth > nMaxWidth)
|
||||||
{
|
{
|
||||||
uint maxNumSpaces = std::max(1U, (uint) (nMaxWidth / _SpaceWidth));
|
uint maxNumSpaces = std::max(1U, (uint) (nMaxWidth / _SpaceWidth));
|
||||||
|
|
|
@ -3978,11 +3978,11 @@ void updateClouds()
|
||||||
if (InitCloudScape)
|
if (InitCloudScape)
|
||||||
{
|
{
|
||||||
InitCloudScape = false;
|
InitCloudScape = false;
|
||||||
// 1 ° ) set current state
|
// 1 ) set current state
|
||||||
CCloudState cs;
|
CCloudState cs;
|
||||||
WeatherManager.computeCloudState(RT.getRyzomDay(), DayNightCycleHour, wc, cs);
|
WeatherManager.computeCloudState(RT.getRyzomDay(), DayNightCycleHour, wc, cs);
|
||||||
updateCloudScape(cs, wc, WeatherManager.getCurrWeatherState().WindIntensity, LightCycleManager.getLightLevel(), 0.f, true);
|
updateCloudScape(cs, wc, WeatherManager.getCurrWeatherState().WindIntensity, LightCycleManager.getLightLevel(), 0.f, true);
|
||||||
// 2 ° )set next state
|
// 2 )set next state
|
||||||
// compute date of next update
|
// compute date of next update
|
||||||
const CLightCycleDesc &lcd = LightCycleManager.getLightDesc();
|
const CLightCycleDesc &lcd = LightCycleManager.getLightDesc();
|
||||||
float updateDelay = 0.f;
|
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 ();
|
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")
|
NLMISC_COMMAND(debugUI, "Debug the ui : show/hide quads of bboxs and hotspots", "debugUI 1 or 0")
|
||||||
{
|
{
|
||||||
if (args.size() > 1) return false;
|
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", "")
|
NLMISC_COMMAND(debugUIView, "Debug the ui : show/hide quads of bboxs and hotspots for views", "")
|
||||||
{
|
{
|
||||||
DebugUIView = !DebugUIView;
|
DebugUIView = !DebugUIView;
|
||||||
return true;
|
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", "")
|
NLMISC_COMMAND(debugUICtrl, "Debug the ui : show/hide quads of bboxs and hotspots for ctrl", "")
|
||||||
{
|
{
|
||||||
DebugUICtrl = !DebugUICtrl;
|
DebugUICtrl = !DebugUICtrl;
|
||||||
return true;
|
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", "")
|
NLMISC_COMMAND(debugUIGroup, "Debug the ui : show/hide quads of bboxs and hotspots for group", "")
|
||||||
{
|
{
|
||||||
DebugUIGroup = !DebugUIGroup;
|
DebugUIGroup = !DebugUIGroup;
|
||||||
return true;
|
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", "")
|
NLMISC_COMMAND(debugUICell, "Debug the ui : show/hide quads of bboxs for cells", "")
|
||||||
{
|
{
|
||||||
DebugUICell = !DebugUICell;
|
DebugUICell = !DebugUICell;
|
||||||
|
|
|
@ -76,7 +76,7 @@ class CDisplayerVisualEntity;
|
||||||
*
|
*
|
||||||
* No tool is displayed as "highlighted"
|
* 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".
|
* 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
|
* 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
|
* 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".
|
* 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;
|
* Ideally on some actions, the creation is canceled, and the default tool is backuped;
|
||||||
|
@ -120,7 +120,7 @@ class CDisplayerVisualEntity;
|
||||||
* - Rotate
|
* - Rotate
|
||||||
* ...
|
* ...
|
||||||
*
|
*
|
||||||
* 1°) Mouse in 3D view
|
* 1) Mouse in 3D view
|
||||||
* --------------------
|
* --------------------
|
||||||
* a ) Mouse over empty space in scene
|
* 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
|
* This would requires using something like the middle button or some shift / control combination
|
||||||
* to avoid conflict with the previous events ...
|
* to avoid conflict with the previous events ...
|
||||||
*
|
*
|
||||||
* 2°) Mouse over UI
|
* 2) Mouse over UI
|
||||||
* -----------------
|
* -----------------
|
||||||
* The mouse is dipslayed as usual
|
* The mouse is dipslayed as usual
|
||||||
* Events are taken in account by the UI, not by the tool
|
* Events are taken in account by the UI, not by the tool
|
||||||
|
|
Loading…
Reference in a new issue