ios2 attempt 2 #5

Open
kornerr wants to merge 12 commits from ios2 into master
pull from: ios2
5 changed files with 6 additions and 5 deletions
Showing only changes of commit 33fae994fc - Show all commits

No files matched your search

+2 -2
View File
@@ -63,7 +63,7 @@ game/ver-mac/ macOS app (SPM executable target "ogs-mahjong")
raybri/raybri.c -> symlink components/raybri/raybri.c raybri/raybri.c -> symlink components/raybri/raybri.c
raybri/raybri.h -> symlink components/raybri/raybri.h raybri/raybri.h -> symlink components/raybri/raybri.h
render/render.swift -> symlink components/render/render.swift render/render.swift -> symlink components/render/render.swift
render/renderAux.swift -> symlink components/render/renderAux.swift render/renderAux.swift -> symlink components/render/mac/renderAux.swift
render/renderConst.swift -> symlink components/render/renderConst.swift render/renderConst.swift -> symlink components/render/renderConst.swift
render/renderConstShader.swift -> symlink .../renderConstShader.swift render/renderConstShader.swift -> symlink .../renderConstShader.swift
render/renderEffect.swift -> symlink components/render/renderEffect.swift render/renderEffect.swift -> symlink components/render/renderEffect.swift
@@ -99,7 +99,7 @@ src/other/other.swift -> ../../../../components/other/other.swift (
src/raybri/raybri.c -> ../../../../components/raybri/raybri.c (4 up) src/raybri/raybri.c -> ../../../../components/raybri/raybri.c (4 up)
src/raybri/raybri.h -> ../../../../components/raybri/raybri.h (4 up) src/raybri/raybri.h -> ../../../../components/raybri/raybri.h (4 up)
src/render/render.swift -> ../../../../components/render/render.swift (4 up) src/render/render.swift -> ../../../../components/render/render.swift (4 up)
src/render/renderAux.swift -> ../../../../components/render/renderAux.swift (4 up) src/render/renderAux.swift -> ../../../../components/render/mac/renderAux.swift (4 up)
src/render/renderConst.swift-> ../../../../components/render/renderConst.swift (4 up) src/render/renderConst.swift-> ../../../../components/render/renderConst.swift (4 up)
src/render/renderConstShader.swift -> ../../../../components/render/renderConstShader.swift (4 up) src/render/renderConstShader.swift -> ../../../../components/render/renderConstShader.swift (4 up)
src/render/renderEffect.swift -> ../../../../components/render/renderEffect.swift (4 up) src/render/renderEffect.swift -> ../../../../components/render/renderEffect.swift (4 up)
+2 -1
View File
@@ -5,7 +5,8 @@ import UIKit
// presents into the view's layer, so there is no draw(_:) / needsDisplay pass // presents into the view's layer, so there is no draw(_:) / needsDisplay pass
// like in the NSOpenGLView on macOS. // like in the NSOpenGLView on macOS.
func renderDraw(_ vm: RenderVM) { func renderDraw(_ vm: RenderVM) {
raybri_ios_render(CACurrentMediaTime() - vm.startTime) let t = CACurrentMediaTime() - vm.startTime
raybri_ios_render(t)
} }
// Backing-pixel size of the view, which is what EGL/ANGLE renders into. // Backing-pixel size of the view, which is what EGL/ANGLE renders into.
File renamed without changes.
@@ -1 +1 @@
../../../../components/render/renderAux.swift ../../../../components/render/mac/renderAux.swift
@@ -1 +1 @@
../../../../components/render/renderAux.swift ../../../../components/render/mac/renderAux.swift