Skip to content

Commit

Permalink
Convert source code to utf8
Browse files Browse the repository at this point in the history
  • Loading branch information
ForserX committed Nov 15, 2024
1 parent 803eac2 commit 020ecb7
Show file tree
Hide file tree
Showing 479 changed files with 2,017 additions and 2,018 deletions.
8 changes: 4 additions & 4 deletions src/3rd party/cximage/CxImage/ximainfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ void CxImage::SetOffset(long x,long y)
////////////////////////////////////////////////////////////////////////////////
/**
* \sa SetJpegQuality, GetJpegQualityF
* \author [DP]; changes [Stefan Schürmans]
* \author [DP]; changes [Stefan Schürmans]
*/
BYTE CxImage::GetJpegQuality() const
{
Expand All @@ -548,7 +548,7 @@ BYTE CxImage::GetJpegQuality() const
////////////////////////////////////////////////////////////////////////////////
/**
* \sa SetJpegQuality, GetJpegQuality
* \author [Stefan Schürmans]
* \author [Stefan Schürmans]
*/
float CxImage::GetJpegQualityF() const
{
Expand All @@ -558,7 +558,7 @@ float CxImage::GetJpegQualityF() const
/**
* quality level for JPEG and JPEG2000
* \param q: can be from 0 to 100
* \author [DP]; changes [Stefan Schürmans]
* \author [DP]; changes [Stefan Schürmans]
*/
void CxImage::SetJpegQuality(BYTE q){
info.fQuality = (float)q;
Expand All @@ -568,7 +568,7 @@ void CxImage::SetJpegQuality(BYTE q){
* quality level for JPEG and JPEG2000
* necessary for JPEG2000 when quality is between 0.0 and 1.0
* \param q: can be from 0.0 to 100.0
* \author [Stefan Schürmans]
* \author [Stefan Schürmans]
*/
void CxImage::SetJpegQualityF(float q){
if (q>0) info.fQuality = q;
Expand Down
4 changes: 2 additions & 2 deletions src/3rd party/cximage/CxImage/ximaint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ float CxImage::KernelBSpline(const float x)

return (0.16666666666666666667f * (a - (4.0f * b) + (6.0f * c) - (4.0f * d)));

/* equivalent <Vladimír Kloucek>
/* equivalent <Vladimír Kloucek>
if (x < -2.0)
return(0.0f);
if (x < -1.0)
Expand Down Expand Up @@ -724,7 +724,7 @@ float CxImage::KernelLinear(const float t)
// if (-1<=t && t<0) return 1+t;
// return 0;

//<Vladimír Kloucek>
//<Vladimír Kloucek>
if (t < -1.0f)
return 0.0f;
if (t < 0.0f)
Expand Down
4 changes: 2 additions & 2 deletions src/3rd party/ode/ode/src/stepfast.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,8 @@ dInternalStepFast (dxWorld * world, dxBody * body[2], dReal * GI[2], dReal * Gin
dSolveLCP (m, A, lambda, rhs, residual, nub, lo, hi, Jinfo.findex);
#endif

//çäåñü áûë LCP - solver replacement îí îñòàëñÿ â áàçå Source control
//ñêîðåå âñåãî îí íå ïîíàäîáèòñÿ
//здесь был LCP - solver replacement он остался в базе Source control
//скорее всего он не понадобится

// compute the constraint force `cforce'
# ifdef TIMING
Expand Down
4 changes: 2 additions & 2 deletions src/3rd party/ode/ode/src/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ void dxProcessIslands (dxWorld *world, dReal stepsize, dstepper_fn_t stepper);

inline bool dValid (const float x)
{
// check for: Signaling NaN, Quiet NaN, Negative infinity ( –INF), Positive infinity (+INF), Negative denormalized, Positive denormalized
// check for: Signaling NaN, Quiet NaN, Negative infinity ( –INF), Positive infinity (+INF), Negative denormalized, Positive denormalized
int cls = _fpclass (double(x));
if (cls&(_FPCLASS_SNAN+_FPCLASS_QNAN+_FPCLASS_NINF+_FPCLASS_PINF+_FPCLASS_ND+_FPCLASS_PD))
return false;

/* *****other cases are*****
_FPCLASS_NN Negative normalized non-zero
_FPCLASS_NZ Negative zero ( – 0)
_FPCLASS_NZ Negative zero ( – 0)
_FPCLASS_PZ Positive 0 (+0)
_FPCLASS_PN Positive normalized non-zero
*/
Expand Down
2 changes: 1 addition & 1 deletion src/3rd party/opcode/OPC_PlanesAABBOverlap.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ inline_ BOOL PlanesCollider::PlanesAABBOverlap(const IceMaths::Point& center_, c

// Evaluate through all active frustum planes. We determine the relation
// between the AABB and a plane by using the concept of "near" and "far"
// vertices originally described by Zhang (and later by Möller). Our
// vertices originally described by Zhang (and later by Möller). Our
// variant here uses 3 fabs ops, 6 muls, 7 adds and two floating point
// comparisons per plane. The routine early-exits if the AABB is found
// to be outside any of the planes. The loop also constructs a new output
Expand Down
2 changes: 1 addition & 1 deletion src/3rd party/opcode/OPC_RayTriOverlap.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Computes a ray-triangle intersection test.
* Original code from Tomas Möller's "Fast Minimum Storage Ray-Triangle Intersection".
* Original code from Tomas Möller's "Fast Minimum Storage Ray-Triangle Intersection".
* It's been optimized a bit with integer code, and modified to return a non-intersection if distance from
* ray origin to triangle is negative.
*
Expand Down
2 changes: 1 addition & 1 deletion src/3rd party/opcode/OPC_TriBoxOverlap.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ inline_ BOOL planeBoxOverlap(const IceMaths::Point& normal, const float d, const
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Triangle-Box overlap test using the separating axis theorem.
* This is the code from Tomas Möller, a bit optimized:
* This is the code from Tomas Möller, a bit optimized:
* - with some more lazy evaluation (faster path on PC)
* - with a tiny bit of assembly
* - with "SAT-lite" applied if needed
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/ActorEditor/ActorEditor.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ActorEditor.cpp : Определяет точку входа для приложения.
// ActorEditor.cpp : Определяет точку входа для приложения.
//
#include "stdafx.h"
#include "../../xrEngine/xr_input.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/ActorEditor/UIBoneForm.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

UIBoneForm* UIBoneForm::Form = nullptr;
UIBoneForm::UIBoneForm() {}
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/ActorEditor/UITopBarForm.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

UITopBarForm::UITopBarForm()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/ActorEditor/UITopBarForm.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once
class UITopBarForm: public IEditorWnd
{
public:
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/ActorEditor/UI_ActorTools.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------

#include "stdafx.h"
#pragma hdrstop
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/ActorEditor/UI_ActorToolsProps.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
#include "stdafx.h"
#pragma hdrstop
#include "..\..\Layers\xrRender\KinematicAnimatedDefs.h"
Expand Down
4 changes: 2 additions & 2 deletions src/Editors/LevelEditor/Editor/Builder/BuilderRemote.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"


// !!! èñïîëüçîâàòü prefix åñëè íóæíî èìÿ !!! (Ñâÿçàíî ñ ãðóïïàìè)
// !!! использовать prefix если нужно имя !!! (Связано с группами)


#define LEVEL_LODS_TEX_NAME "level_lods"
Expand Down Expand Up @@ -437,7 +437,7 @@ int SceneBuilder::CalculateSector(const Fvector& P, float R)
if (_S->m_sector_num!=m_iDefaultSectorNum)
return _S->m_sector_num;
}
return m_iDefaultSectorNum; // ïî óìîë÷àíèþ
return m_iDefaultSectorNum; // по умолчанию
}

void SceneBuilder::Clear ()
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/Entry/CustomObject.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once

#define CHUNK_OBJECT_BODY 0x7777

Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/Entry/CustomObjectLE.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

void CCustomObject::SnapMove(Fvector& pos, Fvector& rot, const Fmatrix& rotRP, const Fvector& amount)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Editors/LevelEditor/Editor/Entry/Glow/glow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ CGlow::~CGlow()
void CGlow::OnDeviceCreate()
{
if (m_bDefLoad) return;
// ñîçäàòü çàíîâî shaders
// создать заново shaders
if (m_TexName.size()&&m_ShaderName.size()) m_GShader.create(*m_ShaderName,*m_TexName);
m_bDefLoad = true;
}

void CGlow::OnDeviceDestroy()
{
m_bDefLoad = false;
// óäàëèòü shaders
// удалить shaders
m_GShader.destroy();
}

Expand Down Expand Up @@ -78,7 +78,7 @@ void CGlow::Render(int priority, bool strictB2F)
m_RenderSprite.Render(p,m_fRadius,m_Flags.is(gfFixedSize));
DU_impl.DrawRomboid(p, VIS_RADIUS, 0x00FF8507);
}else{
// ðåíäåðèì bounding sphere
// рендерим bounding sphere
EDevice->SetShader(EDevice->m_WireShader);
DU_impl.DrawRomboid(GetPosition(), VIS_RADIUS, 0x00FF8507);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"
#pragma hdrstop

#include "GroupObject.h"
Expand Down
4 changes: 2 additions & 2 deletions src/Editors/LevelEditor/Editor/Entry/Sector/sector.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ class CSector : public CCustomObject {
virtual void FillProp (LPCSTR pref, PropItemVec& values);
virtual bool GetSummaryInfo (SSceneSummary* inf);

bool AddMesh (CSceneObject* O, CEditableMesh* M); // âîçâðàùàåò äîáàâëåí ëè îáúåêò
int DelMesh (CSceneObject* O, CEditableMesh* M); // 0-íå óäàëåí 1-óäàëåí 2-óäàëåí ñåêòîð âîîáùå
bool AddMesh (CSceneObject* O, CEditableMesh* M); // возвращает добавлен ли объект
int DelMesh (CSceneObject* O, CEditableMesh* M); // 0-не удален 1-удален 2-удален сектор вообще

bool IsDefault (){return m_bDefault;}
bool Contains (CSceneObject* O, CEditableMesh* M){SItemIt it; return FindSectorItem(O,M,it);}
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/Entry/Spawn/SpawnPoint.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"
#include "../../../../../xrServerEntities/xrServer_Objects_ALife.h"
#include "../xrServerEntities/xrServer_Objects_Abstract.h"
#include "../xrServerEntities/xrServer_Object_Base.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/Entry/WayPoint/WayPoint.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

#define WAYPOINT_SIZE 1.5f
#define WAYPOINT_RADIUS WAYPOINT_SIZE*.5f
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/Entry/WayPoint/WayPoint.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once

class CFrustum;
class CWayPoint;
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/Scene/SceneSummaryInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void SSceneSummary::STextureInfo::FillProp (PropItemVec& items, LPCSTR main_pref
PHelper().CreateCaption(items,PrepareKey(pref.c_str(),"Effective Area"),shared_str().printf("%3.2f m^2",effective_area));
PHelper().CreateCaption(items,PrepareKey(pref.c_str(),"Pixel Density"), shared_str().printf("%3.2f p/m",_sqrt((pixel_area*info.width*info.height)/effective_area)));
/*
//. óáðàë èç-çà êîë-âà > 4096
//. убрал из-за кол-ва > 4096
xr_string tmp = "on demand";
for (objinf_map_it o_it=objects.begin(); o_it!=objects.end(); o_it++){
tmp += xr_string().sprintf("%s%s[%d*%3.2f]",tmp.Length()?"; ":"",o_it->first.c_str(),o_it->second.ref_count,o_it->second.area);
Expand Down
2 changes: 1 addition & 1 deletion src/Editors/LevelEditor/Editor/Scene/SceneSummaryInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class SSceneSummary
sttGlow,
sttLOD,
sttLast
}; // íå çàáûâàòü òîêåí ìåíÿòü
}; // не забывать токен менять
private:
struct STextureInfo {
shared_str file_name;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

// Node Add
TUI_ControlAIMapNodeAdd::TUI_ControlAIMapNodeAdd(int st, int act, ESceneToolBase* parent):TUI_CustomControl(st,act,parent) {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once

// refs
class ESceneAIMapTool;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

void ESceneAIMapTool::CreateControls()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ IC float intersectRayPlane( const Fvector& rayOrigin, const Fvector& rayDirectio
IC void closestPointOnLine(Fvector& res, const Fvector& a, const Fvector& b, const Fvector& p)
{

// Determine t (the length of the vector from ‘a’ to ‘p’)
// Determine t (the length of the vector from ‘a’ to ‘p’)
Fvector c; c.sub(p,a);
Fvector V; V.sub(b,a);

Expand All @@ -89,11 +89,11 @@ IC void closestPointOnLine(Fvector& res, const Fvector& a, const Fvector& b, con
V.div(d);
float t = V.dotproduct(c);

// Check to see if ‘t’ is beyond the extents of the line segment
// Check to see if ‘t’ is beyond the extents of the line segment
if (t <= 0.0f) { res.set(a); return; }
if (t >= d) { res.set(b); return; }

// Return the point between ‘a’ and ‘b’
// Return the point between ‘a’ and ‘b’
// set length of V to t. V is normalized so this is easy
res.mad (a,V,t);
}
Expand All @@ -102,15 +102,15 @@ IC void closestPointOnEdge(Fvector& res, // result
const Fvector& ED, float elen, // edge direction (b-a) and length
const Fvector& P) // query point
{
// Determine t (the length of the vector from ‘a’ to ‘p’)
// Determine t (the length of the vector from ‘a’ to ‘p’)
Fvector c; c.sub(P,a);
float t = ED.dotproduct(c);

// Check to see if ‘t’ is beyond the extents of the line segment
// Check to see if ‘t’ is beyond the extents of the line segment
if (t <= 0.0f) { res.set(a); return; }
if (t >= elen) { res.set(b); return; }

// Return the point between ‘a’ and ‘b’
// Return the point between ‘a’ and ‘b’
res.mad(a,ED,t);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

TUI_CustomControl::TUI_CustomControl(int st, int act, ESceneToolBase* parent)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once

// refs
class ESceneToolBase;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

void EDetailManager::CreateControls()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

void ESceneGlowTool::CreateControls()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

ESceneLightTool::ESceneLightTool():ESceneCustomOTool(OBJCLASS_LIGHT)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once

class TUI_ControlPSAdd: public TUI_CustomControl
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

void EScenePSTool::CreateControls()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once

class TUI_ControlPortalSelect: public TUI_CustomControl
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"
#include "EScenePuddlesTools.h"
#include "../../../UI/Tools/UIPuddlesTool.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once

class UISectorTool;
enum ESectorAction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

void ESceneSoundSrcTool::CreateControls()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ bool ESceneObjectTool::ExportClimableObjects(SExportStreams* F)
else
{
Fmatrix M; M.set (P->m_OBB.m_rotate.i,P->m_OBB.m_rotate.j,P->m_OBB.m_rotate.k,P->m_OBB.m_translate);
M.getXYZ (P->m_RefRotate); // íå i ïîòîìó ÷òî â äâèæêå òàê
M.getXYZ (P->m_RefRotate); // не i потому что в движке так
m_Data->position().set (P->m_RefOffset);
m_Data->angle().set (P->m_RefRotate);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"

// Node Add
TUI_ControlWallmarkAdd::TUI_ControlWallmarkAdd(int st, int act, ESceneToolBase* parent):TUI_CustomControl(st,act,parent) {}
Expand Down
Loading

0 comments on commit 020ecb7

Please sign in to comment.