Skip to content
This repository was archived by the owner on Dec 18, 2021. It is now read-only.

Commit ade1daa

Browse files
oraotooraoto
committed
Upgrade to raylib 3.5, compiles, but new functions are ported yet
1 parent f198a25 commit ade1daa

3 files changed

Lines changed: 22 additions & 129 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ExternalProject_Add(
1010
raylib
1111
PREFIX raylib
1212
GIT_REPOSITORY https://github.com/raysan5/raylib.git
13-
GIT_TAG 3.0.0
13+
GIT_TAG 3.5.0
1414
GIT_SHALLOW true
1515
STEP_TARGETS build
1616
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=.

‎examples/models/models_waving_cubes.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
{
3939
for ($z = 0; $z < $numBlocks; $z++)
4040
{
41-
$cubeColors[$x][$y][$z] = ColorFromHSV(Vector3(((($x + $y + $z)*18)%360), 0.75, 0.9));
41+
$cubeColors[$x][$y][$z] = ColorFromHSV((($x + $y + $z)*18)%360, 0.75, 0.9);
4242
}
4343
}
4444
}

‎raylib.cpp‎

Lines changed: 20 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -392,30 +392,20 @@ class RenderTexture2D : public Php::Base {
392392
Php::Object("RayLib\\Texture2D", new Texture2D(data.depth));
393393
return result;
394394
}
395-
Php::Value getdepthTexture() {
396-
bool result = data.depthTexture;
397-
return result;
398-
}
399395
void setid(const Php::Value &v) { data.id = (long)v; }
400396
void settexture(const Php::Value &v) {
401397
data.texture = ((Texture2D *)(v.implementation()))->data;
402398
}
403399
void setdepth(const Php::Value &v) {
404400
data.depth = ((Texture2D *)(v.implementation()))->data;
405401
}
406-
void setdepthTexture(const Php::Value &v) { data.id = (bool)v; }
407402
};
408403

409404
class NPatchInfo : public Php::Base {
410405
public:
411406
::NPatchInfo data;
412407
void __destruct() const {}
413408
NPatchInfo(::NPatchInfo x) { data = x; }
414-
Php::Value getsourceRec() {
415-
Php::Value result =
416-
Php::Object("RayLib\\Rectangle", new Rectangle(data.sourceRec));
417-
return result;
418-
}
419409
Php::Value getleft() {
420410
int result = data.left;
421411
return result;
@@ -436,9 +426,6 @@ class NPatchInfo : public Php::Base {
436426
int result = data.type;
437427
return result;
438428
}
439-
void setsourceRec(const Php::Value &v) {
440-
data.sourceRec = ((Rectangle *)(v.implementation()))->data;
441-
}
442429
void setleft(const Php::Value &v) { data.left = (int)v; }
443430
void settop(const Php::Value &v) { data.top = (int)v; }
444431
void setright(const Php::Value &v) { data.right = (int)v; }
@@ -1004,18 +991,13 @@ class Music : public Php::Base {
1004991
long result = data.sampleCount;
1005992
return result;
1006993
}
1007-
Php::Value getloopCount() {
1008-
long result = data.loopCount;
1009-
return result;
1010-
}
1011994
Php::Value getstream() {
1012995
Php::Value result =
1013996
Php::Object("RayLib\\AudioStream", new AudioStream(data.stream));
1014997
return result;
1015998
}
1016999
void setctxType(const Php::Value &v) { data.ctxType = (int)v; }
10171000
void setsampleCount(const Php::Value &v) { data.sampleCount = (long)v; }
1018-
void setloopCount(const Php::Value &v) { data.loopCount = (long)v; }
10191001
void setstream(const Php::Value &v) {
10201002
data.stream = ((AudioStream *)(v.implementation()))->data;
10211003
}
@@ -1327,10 +1309,6 @@ class RL : public Php::Base {
13271309
::ToggleFullscreen();
13281310
}
13291311

1330-
static void UnhideWindow(Php::Parameters &params) { ::UnhideWindow(); }
1331-
1332-
static void HideWindow(Php::Parameters &params) { ::HideWindow(); }
1333-
13341312
static void SetWindowIcon(Php::Parameters &params) {
13351313
::Image p0 = ((Image *)(params[0].implementation()))->data;
13361314
::SetWindowIcon(p0);
@@ -1573,8 +1551,10 @@ class RL : public Php::Base {
15731551
}
15741552

15751553
static Php::Value ColorFromHSV(Php::Parameters &params) {
1576-
::Vector3 p0 = ((Vector3 *)(params[0].implementation()))->data;
1577-
Color result = ::ColorFromHSV(p0);
1554+
float p0 = params[0].floatValue();
1555+
float p1 = params[1].floatValue();
1556+
float p2 = params[2].floatValue();
1557+
Color result = ::ColorFromHSV(p0, p1, p2);
15781558
return Php::Object("RayLib\\Color", new Color(result));
15791559
}
15801560

@@ -2375,26 +2355,6 @@ class RL : public Php::Base {
23752355
return Php::Object("RayLib\\Image", new Image(result));
23762356
}
23772357

2378-
static Php::Value LoadImageEx(Php::Parameters &params) {
2379-
std::vector<::Color> p0;
2380-
int p1 = params[1];
2381-
int p2 = params[1];
2382-
for (auto v : params[0].vectorValue<Php::Value>()) {
2383-
p0.push_back(((Color *)v.implementation())->data);
2384-
}
2385-
Image result = ::LoadImageEx(p0.data(), p1, p2);
2386-
return Php::Object("RayLib\\Image", new Image(result));
2387-
}
2388-
2389-
static Php::Value LoadImagePro(Php::Parameters &params) {
2390-
string p0 = params[0];
2391-
int p1 = params[1];
2392-
int p2 = params[2];
2393-
int p3 = params[3];
2394-
Image result = ::LoadImagePro((void *)p0.data(), p1, p2, p3);
2395-
return Php::Object("RayLib\\Image", new Image(result));
2396-
}
2397-
23982358
static Php::Value LoadImageRaw(Php::Parameters &params) {
23992359
string p0 = params[0];
24002360
int p1 = params[1];
@@ -2430,14 +2390,6 @@ class RL : public Php::Base {
24302390
new StructArray<::Color, Color>("RayLib\\Color", result));
24312391
}
24322392

2433-
static Php::Value GetImageDataNormalized(Php::Parameters &params) {
2434-
::Image p0 = ((Image *)(params[0].implementation()))->data;
2435-
::Vector4 *result = ::GetImageDataNormalized(p0);
2436-
return Php::Object(
2437-
"RayLib\\StructArray_Vector4",
2438-
new StructArray<::Vector4, Vector4>("RayLib\\Vector4", result));
2439-
}
2440-
24412393
static Php::Value GenImageColor(Php::Parameters &params) {
24422394
int p0 = params[0];
24432395
int p1 = params[1];
@@ -2677,16 +2629,6 @@ class RL : public Php::Base {
26772629
::ImageColorReplace(p0, p1, p2);
26782630
}
26792631

2680-
static Php::Value ImageExtractPalette(Php::Parameters &params) {
2681-
::Image p0 = ((Image *)(params[0].implementation()))->data;
2682-
int p1 = params[1];
2683-
int p2 = 0;
2684-
::Color *result = ::ImageExtractPalette(p0, p1, &p2);
2685-
return Php::Object(
2686-
"RayLib\\StructArray_Color",
2687-
new StructArray<::Color, Color>("RayLib\\Color", result, p2));
2688-
}
2689-
26902632
static Php::Value GetImageAlphaBorder(Php::Parameters &params) {
26912633
::Image p0 = ((Image *)(params[0].implementation()))->data;
26922634
double p1 = params[1];
@@ -2794,22 +2736,23 @@ class RL : public Php::Base {
27942736

27952737
static void ImageDrawText(Php::Parameters &params) {
27962738
::Image *p0 = &((Image *)(params[0].implementation()))->data;
2797-
::Vector2 p1 = ((Vector2 *)(params[1].implementation()))->data;
2798-
string p2 = params[2];
2739+
string p1 = params[1];
2740+
int p2 = params[2];
27992741
int p3 = params[3];
2800-
::Color p4 = ((Color *)(params[4].implementation()))->data;
2801-
::ImageDrawText(p0, p1, p2.c_str(), p3, p4);
2742+
int p4 = params[3];
2743+
::Color p5 = ((Color *)(params[4].implementation()))->data;
2744+
::ImageDrawText(p0, p1.c_str(), p2, p3, p4, p5);
28022745
}
28032746

28042747
static void ImageDrawTextEx(Php::Parameters &params) {
28052748
::Image *p0 = &((Image *)(params[0].implementation()))->data;
2806-
::Vector2 p1 = ((Vector2 *)(params[1].implementation()))->data;
2807-
::Font p2 = ((Font *)(params[2].implementation()))->data;
2808-
string p3 = params[3];
2749+
::Font p1 = ((Font *)(params[1].implementation()))->data;
2750+
string p2 = params[2];
2751+
::Vector2 p3 = ((Vector2 *)(params[2].implementation()))->data;
28092752
double p4 = params[4];
28102753
double p5 = params[5];
28112754
::Color p6 = ((Color *)(params[6].implementation()))->data;
2812-
::ImageDrawTextEx(p0, p1, p2, p3.c_str(), p4, p5, p6);
2755+
::ImageDrawTextEx(p0, p1, p2.c_str(), p3, p4, p5, p6);
28132756
}
28142757

28152758
static Php::Value LoadTexture(Php::Parameters &params) {
@@ -3789,7 +3732,8 @@ class RL : public Php::Base {
37893732
::Shader p0 = ((Shader *)(params[0].implementation()))->data;
37903733
::Texture2D p1 = ((Texture2D *)(params[1].implementation()))->data;
37913734
int p2 = params[2];
3792-
Texture2D result = ::GenTextureCubemap(p0, p1, p2);
3735+
int p3 = params[2];
3736+
Texture2D result = ::GenTextureCubemap(p0, p1, p2, p3);
37933737
return Php::Object("RayLib\\Texture2D", new Texture2D(result));
37943738
}
37953739

@@ -3997,13 +3941,6 @@ class RL : public Php::Base {
39973941
::WaveCrop(p0, p1, p2);
39983942
}
39993943

4000-
static Php::Value GetWaveData(Php::Parameters &params) {
4001-
::Wave p0 = ((Wave *)(params[0].implementation()))->data;
4002-
float *result = ::GetWaveData(p0);
4003-
return Php::Object("RayLib\\ScalarArray_float",
4004-
new ScalarArray<float>(result));
4005-
}
4006-
40073944
static Php::Value LoadMusicStream(Php::Parameters &params) {
40083945
string p0 = params[0];
40093946
Music result = ::LoadMusicStream(p0.c_str());
@@ -4058,12 +3995,6 @@ class RL : public Php::Base {
40583995
::SetMusicPitch(p0, p1);
40593996
}
40603997

4061-
static void SetMusicLoopCount(Php::Parameters &params) {
4062-
::Music p0 = ((Music *)(params[0].implementation()))->data;
4063-
int p1 = params[1];
4064-
::SetMusicLoopCount(p0, p1);
4065-
}
4066-
40673998
static Php::Value GetMusicTimeLength(Php::Parameters &params) {
40683999
::Music p0 = ((Music *)(params[0].implementation()))->data;
40694000
double result = ::GetMusicTimeLength(p0);
@@ -4310,10 +4241,10 @@ class RL : public Php::Base {
43104241
}
43114242

43124243
static Php::Value createSound(Php::Parameters &params) {
4313-
long p0 = params[0];
4314-
::AudioStream p1 = ((AudioStream *)(params[1].implementation()))->data;
4244+
::AudioStream p0 = ((AudioStream *)(params[0].implementation()))->data;
4245+
long p1 = params[1];
43154246
return Php::Object("RayLib\\Sound",
4316-
new Sound(::Sound{(unsigned int)p0, p1}));
4247+
new Sound(::Sound{p0, (unsigned int)p1}));
43174248
}
43184249

43194250
static Php::Value getColorLIGHTGRAY() {
@@ -4518,13 +4449,6 @@ class RL : public Php::Base {
45184449
return Php::Object("RayLib\\Vector2", new Vector2(result));
45194450
}
45204451

4521-
static Php::Value Vector2MultiplyV(Php::Parameters &params) {
4522-
::Vector2 p0 = ((Vector2 *)(params[0].implementation()))->data;
4523-
::Vector2 p1 = ((Vector2 *)(params[1].implementation()))->data;
4524-
Vector2 result = ::Vector2MultiplyV(p0, p1);
4525-
return Php::Object("RayLib\\Vector2", new Vector2(result));
4526-
}
4527-
45284452
static Php::Value Vector2Negate(Php::Parameters &params) {
45294453
::Vector2 p0 = ((Vector2 *)(params[0].implementation()))->data;
45304454
Vector2 result = ::Vector2Negate(p0);
@@ -4533,18 +4457,11 @@ class RL : public Php::Base {
45334457

45344458
static Php::Value Vector2Divide(Php::Parameters &params) {
45354459
::Vector2 p0 = ((Vector2 *)(params[0].implementation()))->data;
4536-
double p1 = params[1];
4460+
::Vector2 p1 = ((Vector2 *)(params[0].implementation()))->data;
45374461
Vector2 result = ::Vector2Divide(p0, p1);
45384462
return Php::Object("RayLib\\Vector2", new Vector2(result));
45394463
}
45404464

4541-
static Php::Value Vector2DivideV(Php::Parameters &params) {
4542-
::Vector2 p0 = ((Vector2 *)(params[0].implementation()))->data;
4543-
::Vector2 p1 = ((Vector2 *)(params[1].implementation()))->data;
4544-
Vector2 result = ::Vector2DivideV(p0, p1);
4545-
return Php::Object("RayLib\\Vector2", new Vector2(result));
4546-
}
4547-
45484465
static Php::Value Vector2Normalize(Php::Parameters &params) {
45494466
::Vector2 p0 = ((Vector2 *)(params[0].implementation()))->data;
45504467
Vector2 result = ::Vector2Normalize(p0);
@@ -4645,18 +4562,11 @@ class RL : public Php::Base {
46454562

46464563
static Php::Value Vector3Divide(Php::Parameters &params) {
46474564
::Vector3 p0 = ((Vector3 *)(params[0].implementation()))->data;
4648-
double p1 = params[1];
4565+
::Vector3 p1 = ((Vector3 *)(params[0].implementation()))->data;
46494566
Vector3 result = ::Vector3Divide(p0, p1);
46504567
return Php::Object("RayLib\\Vector3", new Vector3(result));
46514568
}
46524569

4653-
static Php::Value Vector3DivideV(Php::Parameters &params) {
4654-
::Vector3 p0 = ((Vector3 *)(params[0].implementation()))->data;
4655-
::Vector3 p1 = ((Vector3 *)(params[1].implementation()))->data;
4656-
Vector3 result = ::Vector3DivideV(p0, p1);
4657-
return Php::Object("RayLib\\Vector3", new Vector3(result));
4658-
}
4659-
46604570
static Php::Value Vector3Normalize(Php::Parameters &params) {
46614571
::Vector3 p0 = ((Vector3 *)(params[0].implementation()))->data;
46624572
Vector3 result = ::Vector3Normalize(p0);
@@ -5221,15 +5131,10 @@ PHPCPP_EXPORT void *get_module() {
52215131
&RenderTexture2D::settexture);
52225132
rlRenderTexture2D.property("depth", &RenderTexture2D::getdepth,
52235133
&RenderTexture2D::setdepth);
5224-
rlRenderTexture2D.property("depthTexture",
5225-
&RenderTexture2D::getdepthTexture,
5226-
&RenderTexture2D::setdepthTexture);
52275134
rlNamespace.add(rlRenderTexture2D);
52285135

52295136
Php::Class<NPatchInfo> rlNPatchInfo("NPatchInfo");
52305137
rlNamespace.add(rlNPatchInfo);
5231-
rlNPatchInfo.property("sourceRec", &NPatchInfo::getsourceRec,
5232-
&NPatchInfo::setsourceRec);
52335138
rlNPatchInfo.property("left", &NPatchInfo::getleft, &NPatchInfo::setleft);
52345139
rlNPatchInfo.property("top", &NPatchInfo::gettop, &NPatchInfo::settop);
52355140
rlNPatchInfo.property("right", &NPatchInfo::getright,
@@ -5389,7 +5294,6 @@ PHPCPP_EXPORT void *get_module() {
53895294
rlMusic.property("ctxType", &Music::getctxType, &Music::setctxType);
53905295
rlMusic.property("sampleCount", &Music::getsampleCount,
53915296
&Music::setsampleCount);
5392-
rlMusic.property("loopCount", &Music::getloopCount, &Music::setloopCount);
53935297
rlMusic.property("stream", &Music::getstream, &Music::setstream);
53945298

53955299
Php::Class<VrDeviceInfo> rlVrDeviceInfo("VrDeviceInfo");
@@ -5432,8 +5336,6 @@ PHPCPP_EXPORT void *get_module() {
54325336
extension.add<&RL::IsWindowHidden>("IsWindowHidden");
54335337
extension.add<&RL::IsWindowFullscreen>("IsWindowFullscreen");
54345338
extension.add<&RL::ToggleFullscreen>("ToggleFullscreen");
5435-
extension.add<&RL::UnhideWindow>("UnhideWindow");
5436-
extension.add<&RL::HideWindow>("HideWindow");
54375339
extension.add<&RL::SetWindowIcon>("SetWindowIcon");
54385340
extension.add<&RL::SetWindowTitle>("SetWindowTitle");
54395341
extension.add<&RL::SetWindowPosition>("SetWindowPosition");
@@ -5607,14 +5509,11 @@ PHPCPP_EXPORT void *get_module() {
56075509
extension.add<&RL::CheckCollisionPointTriangle>(
56085510
"CheckCollisionPointTriangle");
56095511
extension.add<&RL::LoadImage>("LoadImage");
5610-
extension.add<&RL::LoadImageEx>("LoadImageEx");
5611-
extension.add<&RL::LoadImagePro>("LoadImagePro");
56125512
extension.add<&RL::LoadImageRaw>("LoadImageRaw");
56135513
extension.add<&RL::UnloadImage>("UnloadImage");
56145514
extension.add<&RL::ExportImage>("ExportImage");
56155515
extension.add<&RL::ExportImageAsCode>("ExportImageAsCode");
56165516
extension.add<&RL::GetImageData>("GetImageData");
5617-
extension.add<&RL::GetImageDataNormalized>("GetImageDataNormalized");
56185517
extension.add<&RL::GenImageColor>("GenImageColor");
56195518
extension.add<&RL::GenImageGradientV>("GenImageGradientV");
56205519
extension.add<&RL::GenImageGradientH>("GenImageGradientH");
@@ -5649,7 +5548,6 @@ PHPCPP_EXPORT void *get_module() {
56495548
extension.add<&RL::ImageColorContrast>("ImageColorContrast");
56505549
extension.add<&RL::ImageColorBrightness>("ImageColorBrightness");
56515550
extension.add<&RL::ImageColorReplace>("ImageColorReplace");
5652-
extension.add<&RL::ImageExtractPalette>("ImageExtractPalette");
56535551
extension.add<&RL::GetImageAlphaBorder>("GetImageAlphaBorder");
56545552
extension.add<&RL::ImageClearBackground>("ImageClearBackground");
56555553
extension.add<&RL::ImageDrawPixel>("ImageDrawPixel");
@@ -5840,7 +5738,6 @@ PHPCPP_EXPORT void *get_module() {
58405738
extension.add<&RL::WaveFormat>("WaveFormat");
58415739
extension.add<&RL::WaveCopy>("WaveCopy");
58425740
extension.add<&RL::WaveCrop>("WaveCrop");
5843-
extension.add<&RL::GetWaveData>("GetWaveData");
58445741
extension.add<&RL::LoadMusicStream>("LoadMusicStream");
58455742
extension.add<&RL::UnloadMusicStream>("UnloadMusicStream");
58465743
extension.add<&RL::PlayMusicStream>("PlayMusicStream");
@@ -5851,7 +5748,6 @@ PHPCPP_EXPORT void *get_module() {
58515748
extension.add<&RL::IsMusicPlaying>("IsMusicPlaying");
58525749
extension.add<&RL::SetMusicVolume>("SetMusicVolume");
58535750
extension.add<&RL::SetMusicPitch>("SetMusicPitch");
5854-
extension.add<&RL::SetMusicLoopCount>("SetMusicLoopCount");
58555751
extension.add<&RL::GetMusicTimeLength>("GetMusicTimeLength");
58565752
extension.add<&RL::GetMusicTimePlayed>("GetMusicTimePlayed");
58575753
extension.add<&RL::InitAudioStream>("InitAudioStream");
@@ -5923,10 +5819,8 @@ PHPCPP_EXPORT void *get_module() {
59235819
extension.add<&RL::Vector2Distance>("Vector2Distance");
59245820
extension.add<&RL::Vector2Angle>("Vector2Angle");
59255821
extension.add<&RL::Vector2Scale>("Vector2Scale");
5926-
extension.add<&RL::Vector2MultiplyV>("Vector2MultiplyV");
59275822
extension.add<&RL::Vector2Negate>("Vector2Negate");
59285823
extension.add<&RL::Vector2Divide>("Vector2Divide");
5929-
extension.add<&RL::Vector2DivideV>("Vector2DivideV");
59305824
extension.add<&RL::Vector2Normalize>("Vector2Normalize");
59315825
extension.add<&RL::Vector2Lerp>("Vector2Lerp");
59325826
extension.add<&RL::Vector2Rotate>("Vector2Rotate");
@@ -5943,7 +5837,6 @@ PHPCPP_EXPORT void *get_module() {
59435837
extension.add<&RL::Vector3Distance>("Vector3Distance");
59445838
extension.add<&RL::Vector3Negate>("Vector3Negate");
59455839
extension.add<&RL::Vector3Divide>("Vector3Divide");
5946-
extension.add<&RL::Vector3DivideV>("Vector3DivideV");
59475840
extension.add<&RL::Vector3Normalize>("Vector3Normalize");
59485841
extension.add<&RL::Vector3OrthoNormalize>("Vector3OrthoNormalize");
59495842
extension.add<&RL::Vector3Transform>("Vector3Transform");

0 commit comments

Comments
 (0)