atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] some corection of the compilation

Browse Source
This commit is contained in:
Edouard DUPIN 2013-09-26 22:49:37 +02:00
parent 5ca92a90cb
commit b7dc1089ee
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/etk vendored

@ -1 +1 @@
Subproject commit 1826eb6fd917c330ecabbfb7333a509044673964 Subproject commit e443c8a405d4b10febcd0d22d7ab4b7ce34fbd6d

2
sources/ewol/renderer/audio/decWav.cpp
View File

@ -280,7 +280,7 @@ int16_t * ewol::audio::wav::LoadData(etk::UString filename, int8_t nbChan, int32
} }
} }
if (nbChan == 1) { if (nbChan == 1) {
*tmpOut++ = (int16_t)((left>>1 + right>>1)>>16); *tmpOut++ = (int16_t)(((left>>1) + (right>>1))>>16);
} else { } else {
*tmpOut++ = (int16_t)(left>>16); *tmpOut++ = (int16_t)(left>>16);
*tmpOut++ = (int16_t)(left>>16); *tmpOut++ = (int16_t)(left>>16);

2
sources/ewol/resources/Mesh.cpp
View File

@ -136,7 +136,7 @@ void ewol::Mesh::Draw(mat4& _positionMatrix, bool _enableDepthTest, bool _enable
// remove face that is notin the view ... // remove face that is notin the view ...
etk::Vector<uint32_t> tmpIndexResult; etk::Vector<uint32_t> tmpIndexResult;
etk::Vector<ewol::Face>& tmppFaces = m_listFaces.GetValue(kkk).m_faces; etk::Vector<ewol::Face>& tmppFaces = m_listFaces.GetValue(kkk).m_faces;
etk::Vector<uint32_t>& tmppIndex = m_listFaces.GetValue(kkk).m_index; //etk::Vector<uint32_t>& tmppIndex = m_listFaces.GetValue(kkk).m_index;
if (normalModeFace == m_normalMode) { if (normalModeFace == m_normalMode) {
for(int32_t iii=0; iii<tmppFaces.Size() ; ++iii) { for(int32_t iii=0; iii<tmppFaces.Size() ; ++iii) {
if(btDot(mattttt * m_listFacesNormal[tmppFaces[iii].m_normal[0]], cameraNormal) >= 0.0f) { if(btDot(mattttt * m_listFacesNormal[tmppFaces[iii].m_normal[0]], cameraNormal) >= 0.0f) {

2
sources/ewol/widget/PopUp.h
View File

@ -66,7 +66,7 @@ namespace widget {
*/ */
bool GetRemoveOnExternClick(void) const { return m_closeOutEvent; }; bool GetRemoveOnExternClick(void) const { return m_closeOutEvent; };
private: private:
float m_slidingProgress; //!< ratio progression of a sliding //float m_slidingProgress; //!< ratio progression of a sliding
public: public:
typedef enum { typedef enum {
animationNone, //!< No annimation animationNone, //!< No annimation