mirror of
				https://github.com/GayPizzaSpecifications/cxx-swift-interop.git
				synced 2025-11-04 12:09:39 +00:00 
			
		
		
		
	fix build by converting cxx backend to swift
This commit is contained in:
		@ -1,4 +1,2 @@
 | 
			
		||||
add_subdirectory(SwiftFrontend)
 | 
			
		||||
add_subdirectory(SDLSwift)
 | 
			
		||||
add_subdirectory(CppBackend)
 | 
			
		||||
add_subdirectory(SwiftBackend)
 | 
			
		||||
 | 
			
		||||
@ -1,6 +0,0 @@
 | 
			
		||||
add_library(CppBackend STATIC ball.hpp ball.cpp)
 | 
			
		||||
set_property(TARGET CppBackend PROPERTY Swift_MODULE_NAME "CppBackend")
 | 
			
		||||
set_property(TARGET CppBackend PROPERTY CXX_STANDARD 20)
 | 
			
		||||
 | 
			
		||||
target_include_directories(CppBackend PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 | 
			
		||||
target_compile_options(CppBackend PUBLIC "$<$<COMPILE_LANGUAGE:Swift>:-cxx-interoperability-mode=default>")
 | 
			
		||||
@ -1,41 +0,0 @@
 | 
			
		||||
#include "ball.hpp"
 | 
			
		||||
#include <cmath>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Ball::Ball(vec2f pos, float angle, float ballSize) noexcept :
 | 
			
		||||
  _position(pos),
 | 
			
		||||
  _velocity(simd::make<vec2f>(
 | 
			
		||||
     std::cos(angle * M_PI * 2.0f),
 | 
			
		||||
    -std::sin(angle * M_PI * 2.0f)
 | 
			
		||||
  )),
 | 
			
		||||
  _size(ballSize) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void Ball::update(float deltaTime) noexcept {
 | 
			
		||||
  _position += _velocity * speed * deltaTime;
 | 
			
		||||
  if (_position.x < _size) {
 | 
			
		||||
    _velocity.x = -_velocity.x;
 | 
			
		||||
    _position.x = _size;
 | 
			
		||||
  } else if (_position.x > worldSize - _size) {
 | 
			
		||||
    _velocity.x = -_velocity.x;
 | 
			
		||||
    _position.x = worldSize - _size;
 | 
			
		||||
  }
 | 
			
		||||
  if (_position.y < _size) {
 | 
			
		||||
    _velocity.y = -_velocity.y;
 | 
			
		||||
    _position.y = _size;
 | 
			
		||||
  } else if (_position.y > worldSize - _size) {
 | 
			
		||||
    _velocity.y = -_velocity.y;
 | 
			
		||||
    _position.y = worldSize - _size;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void BallWorld::add(Ball::vec2f pos, float angle, float ballSize) noexcept {
 | 
			
		||||
  balls.emplace_back(Ball{ pos, angle, ballSize });
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void BallWorld::update(float deltaTime) noexcept {
 | 
			
		||||
  for (auto& ball : balls) {
 | 
			
		||||
    ball.update(deltaTime);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@ -1,39 +0,0 @@
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include <simd/simd.h>
 | 
			
		||||
#include <vector>
 | 
			
		||||
 | 
			
		||||
struct Ball {
 | 
			
		||||
  using vec2f = simd::float2;
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
  constexpr static float speed = 80.0f;
 | 
			
		||||
  constexpr static float worldSize = 512.0f;
 | 
			
		||||
 | 
			
		||||
  vec2f _position, _velocity;
 | 
			
		||||
  float _size;
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
  Ball(vec2f pos, float angle, float ballSize) noexcept;
 | 
			
		||||
  virtual ~Ball() noexcept = default;
 | 
			
		||||
 | 
			
		||||
  void update(float deltaTime) noexcept;
 | 
			
		||||
 | 
			
		||||
  [[nodiscard]] constexpr const vec2f& position() const noexcept {
 | 
			
		||||
    return _position;
 | 
			
		||||
  }
 | 
			
		||||
  [[nodiscard]] constexpr const vec2f& velocity() const noexcept {
 | 
			
		||||
    return _velocity;
 | 
			
		||||
  }
 | 
			
		||||
  [[nodiscard]] constexpr const float size() const noexcept {
 | 
			
		||||
    return _size;
 | 
			
		||||
  }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
struct BallWorld {
 | 
			
		||||
  std::vector<Ball> balls;
 | 
			
		||||
 | 
			
		||||
  void add(Ball::vec2f pos, float angle, float ballSize) noexcept;
 | 
			
		||||
  void update(float deltaTime) noexcept;
 | 
			
		||||
};
 | 
			
		||||
@ -1,3 +0,0 @@
 | 
			
		||||
module CppBackend {
 | 
			
		||||
  header "ball.hpp"
 | 
			
		||||
}
 | 
			
		||||
@ -1,7 +0,0 @@
 | 
			
		||||
import CppBackend
 | 
			
		||||
 | 
			
		||||
public struct FuckYou {
 | 
			
		||||
  public static func fuck() {
 | 
			
		||||
    let _ = BallWorld()
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@ -1,2 +0,0 @@
 | 
			
		||||
add_library(SwiftBackend STATIC Backend.swift)
 | 
			
		||||
target_link_libraries(SwiftBackend PRIVATE CppBackend)
 | 
			
		||||
@ -7,17 +7,15 @@
 | 
			
		||||
 | 
			
		||||
import Foundation
 | 
			
		||||
import SDL3
 | 
			
		||||
import SwiftBackend
 | 
			
		||||
 | 
			
		||||
class Application {
 | 
			
		||||
  private var window: OpaquePointer? = nil
 | 
			
		||||
  private var renderer: OpaquePointer? = nil
 | 
			
		||||
 | 
			
		||||
  private var balls = BallWorld()
 | 
			
		||||
  private var lastCounter: UInt64 = 0
 | 
			
		||||
 | 
			
		||||
  private func initialize() -> ApplicationExecutionState {
 | 
			
		||||
    FuckYou.fuck()
 | 
			
		||||
    
 | 
			
		||||
    guard SDL_Init(SDL_INIT_VIDEO) >= 0 else {
 | 
			
		||||
      print("SDL_Init() error: \(String(cString: SDL_GetError()))")
 | 
			
		||||
      return .exitFailure
 | 
			
		||||
@ -40,6 +38,15 @@ class Application {
 | 
			
		||||
    SDL_SetRenderVSync(renderer, 1)
 | 
			
		||||
    SDL_SetRenderLogicalPresentation(renderer, 512, 512, SDL_LOGICAL_PRESENTATION_LETTERBOX, SDL_SCALEMODE_BEST)
 | 
			
		||||
 | 
			
		||||
    let ballOrigin = SIMD2(Float(width), Float(height)) * 0.5
 | 
			
		||||
    for _ in 0..<10 {
 | 
			
		||||
      balls.add(
 | 
			
		||||
        position: ballOrigin,
 | 
			
		||||
        angle: Float(arc4random()) / Float(UInt32.max),
 | 
			
		||||
        size: Float(arc4random_uniform(32 - 3) + 3)
 | 
			
		||||
      )
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    lastCounter = SDL_GetPerformanceCounter()
 | 
			
		||||
 | 
			
		||||
    return .running
 | 
			
		||||
@ -71,10 +78,22 @@ class Application {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  private func paint(_ deltaTime: Float) -> ApplicationExecutionState {
 | 
			
		||||
    balls.update(deltaTime)
 | 
			
		||||
 | 
			
		||||
    SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255)
 | 
			
		||||
    SDL_RenderClear(renderer)
 | 
			
		||||
 | 
			
		||||
    SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255)
 | 
			
		||||
    for ball in balls.balls {
 | 
			
		||||
      let position = ball.position, size = ball.size
 | 
			
		||||
      var rect = SDL_FRect(
 | 
			
		||||
        x: position.x - size,
 | 
			
		||||
        y: position.y - size,
 | 
			
		||||
        w: size * 2.0,
 | 
			
		||||
        h: size * 2.0
 | 
			
		||||
      )
 | 
			
		||||
      SDL_RenderFillRect(renderer, &rect)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    SDL_RenderPresent(renderer)
 | 
			
		||||
    return .running
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										55
									
								
								Sources/SwiftFrontend/Ball.swift
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										55
									
								
								Sources/SwiftFrontend/Ball.swift
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,55 @@
 | 
			
		||||
import Foundation
 | 
			
		||||
import simd
 | 
			
		||||
 | 
			
		||||
struct BallWorld {
 | 
			
		||||
  var balls: [Ball] = []
 | 
			
		||||
 | 
			
		||||
  mutating func add(position: SIMD2<Float>, angle: Float, size: Float) {
 | 
			
		||||
    balls.append(Ball(position: position, angle: angle, size: size))
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  mutating func update(_ deltaTime: Float) {
 | 
			
		||||
    for i in balls.indices {
 | 
			
		||||
      balls[i].update(deltaTime)
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
struct Ball {
 | 
			
		||||
  public static let speed: Float = 80.0
 | 
			
		||||
  public static let worldSize: Float = 512.0
 | 
			
		||||
 | 
			
		||||
  var _position: SIMD2<Float>, _velocity: SIMD2<Float>
 | 
			
		||||
  var _size: Float
 | 
			
		||||
 | 
			
		||||
  init(position: SIMD2<Float>, angle: Float, size ballSize: Float) {
 | 
			
		||||
    _position = position
 | 
			
		||||
    _velocity = SIMD2<Float>(
 | 
			
		||||
       cos(angle * Float.pi * 2.0),
 | 
			
		||||
      -sin(angle * Float.pi * 2.0)
 | 
			
		||||
    )
 | 
			
		||||
    _size = ballSize
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  public mutating func update(_ deltaTime: Float) {
 | 
			
		||||
    _position += _velocity * Self.speed * deltaTime
 | 
			
		||||
    if (_position.x < _size) {
 | 
			
		||||
      _velocity.x = -_velocity.x
 | 
			
		||||
      _position.x = _size
 | 
			
		||||
    } else if (_position.x > Self.worldSize - _size) {
 | 
			
		||||
      _velocity.x = -_velocity.x
 | 
			
		||||
      _position.x = Self.worldSize - _size
 | 
			
		||||
    }
 | 
			
		||||
    if (_position.y < _size) {
 | 
			
		||||
      _velocity.y = -_velocity.y
 | 
			
		||||
      _position.y = _size
 | 
			
		||||
    } else if (_position.y > Self.worldSize - _size) {
 | 
			
		||||
      _velocity.y = -_velocity.y
 | 
			
		||||
      _position.y = Self.worldSize - _size
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  var position: SIMD2<Float> { return _position }
 | 
			
		||||
  var velocity: SIMD2<Float> { return _velocity }
 | 
			
		||||
  var size: Float { return _size }
 | 
			
		||||
}
 | 
			
		||||
@ -1,5 +1,5 @@
 | 
			
		||||
add_executable(SwiftFrontend MACOSX_BUNDLE main.swift Application.swift)
 | 
			
		||||
target_link_libraries(SwiftFrontend PRIVATE SwiftBackend SDLSwift)
 | 
			
		||||
add_executable(SwiftFrontend MACOSX_BUNDLE main.swift Application.swift Ball.swift)
 | 
			
		||||
target_link_libraries(SwiftFrontend PRIVATE SDLSwift)
 | 
			
		||||
set_target_properties(SwiftFrontend PROPERTIES
 | 
			
		||||
  XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME NO
 | 
			
		||||
  XCODE_EMBED_FRAMEWORKS "${SDL3}"
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user