Skip to content

Commit 88a3f6a

Browse files
committed
Reformat: Layers
1 parent 3d01d0a commit 88a3f6a

File tree

550 files changed

+89326
-86934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

550 files changed

+89326
-86934
lines changed

src/Layers/xrAPI/stdafx.h

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,24 @@
77

88
// Modify the following defines if you have to target a platform prior to the ones specified below.
99
// Refer to MSDN for the latest info on corresponding values for different platforms.
10-
#ifndef WINVER // Allow use of features specific to Windows XP or later.
11-
#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
10+
#ifndef WINVER // Allow use of features specific to Windows XP or later.
11+
#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
1212
#endif
1313

14-
#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
15-
#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
16-
#endif
14+
#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
15+
#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
16+
#endif
1717

18-
#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
19-
#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
18+
#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
19+
#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
2020
#endif
2121

22-
#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
23-
#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
22+
#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
23+
#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
2424
#endif
2525

26-
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
26+
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
2727
// Windows Header Files:
2828
#include <windows.h>
2929

30-
31-
3230
// TODO: reference additional headers your program requires here

src/Layers/xrAPI/xrAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include "stdafx.h"
21
#include "Include/xrAPI/xrAPI.h"
2+
#include "stdafx.h"
33

44
EngineGlobalEnvironment GlobalEnv = {};
55
bool g_dedicated_server = false;

src/Layers/xrRender/Animation.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
#include "stdafx.h"
1+
#include "stdafx.h"
22

3-
#include "animation.h"
3+
#include "animation.h"
44

5-
using namespace animation;
5+
using namespace animation;
66

7-
const channal_rule channels::rules[channels::max] = { { lerp, lerp }, { lerp, lerp }, { lerp, add }, {lerp, add } };
7+
const channal_rule channels::rules[channels::max] = {{lerp, lerp}, {lerp, lerp}, {lerp, add}, {lerp, add}};
88

9-
channels::channels( )
9+
channels::channels()
1010
{
11-
init( );
11+
init();
1212
}
1313

14-
void channels::init( )
14+
void channels::init()
1515
{
16-
std::fill( factors, factors + max, 1.f );
16+
std::fill(factors, factors + max, 1.f);
1717
}
1818

19-
void channels:: set_factor ( u16 channel, float factor )
19+
void channels::set_factor(u16 channel, float factor)
2020
{
21-
VERIFY( channel < max );
22-
factors[channel] = factor;
21+
VERIFY(channel < max);
22+
factors[channel] = factor;
2323
}

src/Layers/xrRender/Animation.h

Lines changed: 43 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,48 @@
11
#pragma once
22

3-
#include "KinematicAnimatedDefs.h"
3+
#include "KinematicAnimatedDefs.h"
44

5-
namespace animation
5+
namespace animation
66
{
7-
enum mix_type
8-
{
9-
lerp =0 ,
10-
add ,
11-
};
12-
13-
struct channal_rule
14-
{
15-
mix_type intern_;
16-
mix_type extern_;
17-
};
18-
19-
struct channel_def
20-
{
21-
float factor;
22-
channal_rule rule;
23-
};
24-
25-
class channels
26-
{
27-
public:
28-
static const u32 max = MAX_CHANNELS;
29-
30-
private:
31-
static const channal_rule rules [ max ];
32-
float factors [ max ];
33-
public:
34-
channels ( );
35-
void init ( );
36-
void set_factor ( u16 channel, float factor );
37-
public:
38-
39-
IC const channal_rule &rule( u16 channel )
40-
{
41-
return rules[ channel ];
42-
}
43-
44-
IC void get_def ( u16 channel, channel_def &def )
45-
{
46-
VERIFY( channel < max );
47-
def.rule = rules[ channel ];
48-
def.factor = factors[ channel ];
49-
}
50-
51-
};
7+
enum mix_type
8+
{
9+
lerp = 0,
10+
add,
11+
};
12+
13+
struct channal_rule
14+
{
15+
mix_type intern_;
16+
mix_type extern_;
17+
};
18+
19+
struct channel_def
20+
{
21+
float factor;
22+
channal_rule rule;
23+
};
24+
25+
class channels
26+
{
27+
public:
28+
static const u32 max = MAX_CHANNELS;
29+
30+
private:
31+
static const channal_rule rules[max];
32+
float factors[max];
33+
34+
public:
35+
channels();
36+
void init();
37+
void set_factor(u16 channel, float factor);
38+
39+
public:
40+
IC const channal_rule& rule(u16 channel) { return rules[channel]; }
41+
IC void get_def(u16 channel, channel_def& def)
42+
{
43+
VERIFY(channel < max);
44+
def.rule = rules[channel];
45+
def.factor = factors[channel];
46+
}
47+
};
5248
};

0 commit comments

Comments
 (0)