Skip to content

Commit

Permalink
Viewer: fix the build.
Browse files Browse the repository at this point in the history
  • Loading branch information
kkulling committed Jun 1, 2017
1 parent 2038d01 commit cab6cdf
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 5 deletions.
2 changes: 2 additions & 0 deletions tools/assimp_view/Display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "SceneAnimator.h"
#include "StringUtils.h"

#include <commdlg.h>

namespace AssimpView {

using namespace Assimp;
Expand Down
2 changes: 2 additions & 0 deletions tools/assimp_view/LogWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include "assimp_view.h"
#include "richedit.h"
#include <commoncontrols.h>
#include <commdlg.h>

namespace AssimpView {

Expand Down
2 changes: 2 additions & 0 deletions tools/assimp_view/MessageProc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <algorithm>

#include <windowsx.h>
#include <commdlg.h>
#include <timeapi.h>

namespace AssimpView {

Expand Down
16 changes: 11 additions & 5 deletions tools/assimp_view/SceneAnimator.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,26 @@ struct SceneAnimNode
size_t mChannelIndex;

//! Default construction
SceneAnimNode() {
mChannelIndex = -1; mParent = NULL;
SceneAnimNode()
: mName()
, mParent(NULL)
, mChannelIndex(-1) {
// empty
}

//! Construction from a given name
SceneAnimNode( const std::string& pName)
: mName( pName) {
mChannelIndex = -1; mParent = NULL;
: mName( pName)
, mParent(NULL)
, mChannelIndex( -1 ) {
// empty
}

//! Destruct all children recursively
~SceneAnimNode() {
for( std::vector<SceneAnimNode*>::iterator it = mChildren.begin(); it != mChildren.end(); ++it)
for (std::vector<SceneAnimNode*>::iterator it = mChildren.begin(); it != mChildren.end(); ++it) {
delete *it;
}
}
};

Expand Down
1 change: 1 addition & 0 deletions tools/assimp_view/assimp_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


#include "assimp_view.h"
#include <timeapi.h>
#include "StringUtils.h"
#include <map>

Expand Down

0 comments on commit cab6cdf

Please sign in to comment.