Fixed include errors.
This commit is contained in:
parent
58f624a18a
commit
405acb026f
@ -6,7 +6,7 @@
|
||||
#include "Glyph.h"
|
||||
#include "ehs/Anchor.h"
|
||||
#include "ehs/io/img/Img.h"
|
||||
#include "ehs/io/model/Mesh.h"
|
||||
#include "ehs/io/mdl/Mesh.h"
|
||||
|
||||
namespace ehs
|
||||
{
|
||||
|
@ -58,8 +58,8 @@ namespace ehs
|
||||
}
|
||||
|
||||
Audio::Audio(const Str_8& filePath)
|
||||
: Resource(File::ParseName_8(filePath)), sampleRate(0), dataType(DataType::FLOAT), byteDepth(0), channels(0),
|
||||
frames(0), length(0.0f), data(nullptr), peak(nullptr)
|
||||
: Resource(File::ParseName_8(filePath)), sampleRate(0), dataType(DataType::FLOAT), byteDepth(0), channels(0),
|
||||
frames(0), length(0.0f), data(nullptr), peak(nullptr)
|
||||
{
|
||||
AddType("Audio");
|
||||
|
||||
@ -81,6 +81,8 @@ namespace ehs
|
||||
}
|
||||
|
||||
Audio::Audio(const Str_8& filePath, DataType type)
|
||||
: Resource(File::ParseName_8(filePath)), sampleRate(0), dataType(DataType::FLOAT), byteDepth(0), channels(0),
|
||||
frames(0), length(0.0f), data(nullptr), peak(nullptr)
|
||||
{
|
||||
AddType("Audio");
|
||||
|
||||
@ -2048,7 +2050,7 @@ namespace ehs
|
||||
UInt_64 size = dChunk.GetData().Size();
|
||||
UInt_64 frames = size / byteDepth / channels;
|
||||
|
||||
*out = std::move(Audio(out->GetId(), sampleRate, dataType, channels, frames));
|
||||
*out = Audio(out->GetId(), sampleRate, dataType, channels, frames);
|
||||
|
||||
Serializer<> dataSer = dChunk.GetData();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include "ehs/io/model/AnimBone.h"
|
||||
#include "ehs/io/mdl/AnimBone.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include "ehs/io/model/Animation.h"
|
||||
#include "ehs/io/mdl/Animation.h"
|
||||
|
||||
namespace ehs
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include "ehs/io/model/Bone.h"
|
||||
#include "ehs/io/mdl/Bone.h"
|
||||
|
||||
namespace ehs
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include "ehs/io/model/KeyFrame.h"
|
||||
#include "ehs/io/mdl/KeyFrame.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include "ehs/io/model/Mesh.h"
|
||||
#include "ehs/io/mdl/Mesh.h"
|
||||
|
||||
namespace ehs
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include "ehs/io/model/PropertyChange.h"
|
||||
#include "ehs/io/mdl/PropertyChange.h"
|
||||
|
||||
namespace ehs
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user