eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

oops

Browse Source
This commit is contained in:
milek7
2017-09-05 20:52:26 +02:00
parent b69a34b157
commit d550b4d980
2 changed files with 4 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Segment.h
View File

@@ -78,48 +78,6 @@ public:
TSegment(TTrack *owner);
~TSegment();
<<<<<<< HEAD
bool Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0);
bool Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointIn, vector3 &NewPoint2,
double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0, bool bIsCurve = true);
inline double ComputeLength(); // McZapkie-150503
inline vector3 GetDirection1() {
return bCurve ? CPointOut - Point1 : CPointOut; };
inline vector3 GetDirection2() {
return bCurve ? CPointIn - Point2 : CPointIn; };
vector3 GetDirection(double fDistance);
vector3 GetDirection() {
return CPointOut; };
vector3 FastGetDirection(double fDistance, double fOffset);
vector3 GetPoint(double fDistance);
void RaPositionGet(double fDistance, vector3 &p, vector3 &a);
vector3 FastGetPoint(double t);
inline vector3 FastGetPoint_0() {
return Point1; };
inline vector3 FastGetPoint_1() {
return Point2; };
inline double GetRoll(double const Distance) {
return interpolate( fRoll1, fRoll2, Distance / fLength ); }
void GetRolls(double &r1, double &r2) {
// pobranie przechyłek (do generowania trójkątów)
r1 = fRoll1;
r2 = fRoll2; }
bool RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, vector6 const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, vector3 **p = nullptr, bool bRender = true);
void Render();
inline double GetLength() {
return fLength; };
void MoveMe(vector3 pPosition)
{
Point1 += pPosition;
Point2 += pPosition;
if (bCurve)
{
CPointIn += pPosition;
CPointOut += pPosition;
}
}
void AngleSet(int i, double a) {
fAngle[i] = a; };
bool
Init( Math3D::vector3 NewPoint1, Math3D::vector3 NewPoint2, double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0);
bool
@@ -179,12 +137,9 @@ public:
GetLength() const {
return fLength; };
inline
int RaSegCount()
{
if (!fTsBuffer || !bCurve)
return 1;
return iSegCount;
};
int
RaSegCount() const {
return fTsBuffer ? iSegCount : 1; };
inline
void
AngleSet(int const i, double const a) {

2
windows.cpp
View File

@@ -69,7 +69,7 @@ LRESULT APIENTRY WndProc( HWND hWnd, // handle for this window
case WM_KEYDOWN:
case WM_KEYUP: {
lParam &= ~0x1ff0000;
lParam |= MapVirtualKey(MAPVK_VK_TO_VSC, wParam) << 16;
lParam |= MapVirtualKey(wParam, MAPVK_VK_TO_VSC) << 16;
break;
}
}