ccppi/zig-raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of 5ccppi:ccppi/zig-raylib

Browse Source
This commit is contained in:
jonathan santis 2024-11-27 14:53:02 +01:00
commit ea8a74e323
2 changed files with 93 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.zig.zon
View File

@ -25,7 +25,7 @@
.dependencies = .{
.@"raylib-zig" = .{
.url = "https://github.com/Not-Nik/raylib-zig/archive/devel.tar.gz",
.hash = "12202f8c415153088be8df39a51e0a4c9d402afd403422a0dcc9afdd417e437a6fdb",
.hash = "1220c61380facb4480c01109fda97cf1a37f45308c522a84fdea142ca625593ddc2a",
},
},
.paths = .{

76
src/main.zig
View File

@ -6,7 +6,6 @@ const allocator = std.heap.page_allocator;
var prng = std.rand.DefaultPrng.init(124346556);
const rand = prng.random();
fn randMinMaxFloat(min: f32, max: f32) f32 {
@ -45,25 +44,21 @@ const Particle = struct {
pub fn update(self: *Self) void {
self.velocity.add(self.acceleration);
self.position.add(self.velocity);
if (self.position.a.y > screenHeight)
{
if (self.position.a.y > screenHeight) {
self.velocity.a.y *= -0.9;
// self.acceleration.a.y *= -0.5;
}
if (self.lifespan > 0) {
self.lifespan -= 1;
}
else
{
} else {
self.show = 0;
}
self.acceleration.a.x = 0;
self.acceleration.a.y = 0;
self.acceleration.a.z = 0;
}
pub fn spawn(self:*Self,xaccel : f32,yaccel : f32) void
{
pub fn spawn(self: *Self, xaccel: f32, yaccel: f32) void {
const xrnr = randMinMaxFloat(-xaccel, xaccel);
const yrnr = randMinMaxFloat(-yaccel, yaccel);
@ -91,14 +86,11 @@ const Particle = struct {
}
};
const Emitter = struct
{
const Emitter = struct {
particleCount: u32 = 0,
particles: []Particle = undefined,
pub fn init(self:*Emitter) !void
{
pub fn init(self: *Emitter) !void {
var xrnr = randMinMaxFloat(-1, 1);
var yrnr = randMinMaxFloat(-0.5, 0.5);
self.particles = try allocator.alloc(Particle, 500000);
@ -108,24 +100,19 @@ const Emitter = struct
p.* = Particle{ .velocity = .{ .a = .{ .x = 1, .y = -3 } }, .acceleration = .{ .a = .{ .x = xrnr, .y = yrnr } } };
}
}
pub fn emit(self:*Emitter,count : u32,xaccel : f32,yaccel : f32) void
{
pub fn emit(self: *Emitter, count: u32, xaccel: f32, yaccel: f32) void {
var i: u32 = 0;
for(self.particles) |*p|
{
if(p.show == 0)
{
for (self.particles) |*p| {
if (p.show == 0) {
i += 1;
p.spawn(xaccel, yaccel);
}
if(i >= count)
{
if (i >= count) {
break;
}
}
}
pub fn update(self:*Emitter,texture : rl.Texture2D) void
{
pub fn update(self: *Emitter, texture: rl.Texture2D) void {
var posx: i32 = 0;
var posy: i32 = 0;
const att: Attractor = .{ .vec = .{ .a = .{ .x = 10, .y = 10, .z = 10 } } };
@ -134,9 +121,7 @@ const Emitter = struct
att.draw();
att2.draw();
for (self.particles) |*p| {
if(p.show == 1)
{
if (p.show == 1) {
p.applyGravity(0);
p.applyForce(att.attract(p.*));
p.applyForce(att2.attract(p.*));
@ -150,40 +135,32 @@ const Emitter = struct
}
}
};
const Attractor = struct
{
const Attractor = struct {
vec: pr.Vec,
pub fn attract(self:Attractor,particle : Particle) pr.Vec
{
pub fn attract(self: Attractor, particle: Particle) pr.Vec {
const distance = self.vec.sub(particle.position);
var force: pr.Vec = undefined;
if( distance.a.x != 0 and distance.a.y != 0)
{
if (distance.a.x != 0 and distance.a.y != 0) {
force.a.x = distance.a.x / 200;
force.a.y = distance.a.y / 200;
force.a.z = 0;
}
return force;
}
pub fn draw(self:Attractor) void
{
pub fn draw(self: Attractor) void {
const posx: i32 = @intFromFloat(screenWidth / 2 + self.vec.a.x);
const posy: i32 = @intFromFloat(screenHeight / 2 + self.vec.a.y);
rl.drawRectangle(posx, posy, 10, 10, rl.Color{ .r = 10, .g = 10, .b = 120, .a = 255 });
}
};
fn ItoF(x:i32) f32
{
fn ItoF(x: i32) f32 {
return @as(f32, @floatFromInt(x));
}
fn rectangle(x : u16,y : u16,width : u16,height : u16) rl.Rectangle
{
fn rectangle(x: u16, y: u16, width: u16, height: u16) rl.Rectangle {
return rl.Rectangle{ .x = @as(f32, @floatFromInt(x)), .y = @as(f32, @floatFromInt(y)), .width = @as(f32, @floatFromInt(width)), .height = @as(f32, @floatFromInt(height)) };
}
pub fn main() anyerror!void {
const rect3 = rectangle(10, 150, 600, 10);
const rect4 = rectangle(10, 170, 600, 10);
const rect5 = rectangle(10, 190, 600, 10);
@ -206,28 +183,24 @@ pub fn main() anyerror!void {
var texture: rl.Texture2D = undefined;
const image: rl.Image = rl.loadImage("resources/blut.png");
if(image.width > 0)
{
if (image.width > 0) {
texture = rl.loadTextureFromImage(image);
}
else
{
} else {
std.debug.print("error opening resource", .{});
std.posix.exit(1);
}
rl.unloadImage(image);
rl.setTargetFPS(60); // Set our game to run at 60 frames-per-second
while (!rl.windowShouldClose()) { // Detect window close button or ESC key
rl.beginDrawing();
defer rl.endDrawing();
rl.clearBackground(rl.Color{.r=181,
.g =177,
.b =154,
rl.clearBackground(rl.Color{
.r = 0,
.g = 0,
.b = 0,
.a = 255,
});
@ -235,8 +208,7 @@ pub fn main() anyerror!void {
_ = rg.guiSlider(rect4, "-3", "3", &value2, ItoF(-10), ItoF(10));
_ = rg.guiSlider(rect5, "-3", "3", &value3, -10, 10);
if(rl.isMouseButtonDown(rl.MouseButton.mouse_button_left))
{
if (rl.isMouseButtonDown(rl.MouseButton.mouse_button_left)) {
emitter.emit(@as(u32, @intFromFloat(value)), value2, value3);
}