mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 14:44:36 +00:00
update openal
This commit is contained in:
parent
62f3b93ff9
commit
6721a6b021
287 changed files with 33851 additions and 27325 deletions
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
#include "sofa-support.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <cmath>
|
||||
#include <cstdio>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ using double3 = std::array<double,3>;
|
|||
* equality of unique elements.
|
||||
*/
|
||||
std::vector<double> GetUniquelySortedElems(const std::vector<double3> &aers, const uint axis,
|
||||
const double *const (&filters)[3], const double (&epsilons)[3])
|
||||
const std::array<const double*,3> &filters, const std::array<double,3> &epsilons)
|
||||
{
|
||||
std::vector<double> elems;
|
||||
for(const double3 &aer : aers)
|
||||
|
|
@ -178,13 +178,13 @@ const char *SofaErrorStr(int err)
|
|||
return "Unknown";
|
||||
}
|
||||
|
||||
std::vector<SofaField> GetCompatibleLayout(const size_t m, const float *xyzs)
|
||||
auto GetCompatibleLayout(const al::span<const float> xyzs) -> std::vector<SofaField>
|
||||
{
|
||||
auto aers = std::vector<double3>(m, double3{});
|
||||
for(size_t i{0u};i < m;++i)
|
||||
auto aers = std::vector<double3>(xyzs.size()/3, double3{});
|
||||
for(size_t i{0u};i < aers.size();++i)
|
||||
{
|
||||
float vals[3]{xyzs[i*3], xyzs[i*3 + 1], xyzs[i*3 + 2]};
|
||||
mysofa_c2s(&vals[0]);
|
||||
std::array vals{xyzs[i*3], xyzs[i*3 + 1], xyzs[i*3 + 2]};
|
||||
mysofa_c2s(vals.data());
|
||||
aers[i] = {vals[0], vals[1], vals[2]};
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue