dm 6 years ago
parent
commit
ef978821f2
35 changed files with 6 additions and 3 deletions
  1. 3 0
      .gitignore
  2. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_body.png
  3. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_head.png
  4. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_apple_eye.png
  5. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_eyebrow.png
  6. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_eyelash.png
  7. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_hand.png
  8. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_hand_bg.png
  9. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_leg.png
  10. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_leg_bg.png
  11. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_apple_eye.png
  12. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_eyebrow.png
  13. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_eyelash.png
  14. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_hand.png
  15. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_hand_bg.png
  16. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_leg.png
  17. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_leg_bg.png
  18. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_shadow.png
  19. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_shield.png
  20. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_strand_1.png
  21. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_strand_2.png
  22. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_strand_3.png
  23. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_strand_4.png
  24. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_sword.png
  25. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_textile.png
  26. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_textile_back.png
  27. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_textile_bg.png
  28. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_white_eyes.png
  29. BIN
      examples/AE/Knight/(Footage)/fottage/Sprite_Player_wrist_right_hand.png
  30. BIN
      examples/AE/Knight/(Footage)/fottage/eyelid_btm.png
  31. BIN
      examples/AE/Knight/(Footage)/fottage/eyelid_up.png
  32. BIN
      examples/AE/Knight/Knight.aep
  33. BIN
      examples/HelloViewerAE/data/HelloViewerAE.exe
  34. 1 1
      examples/HelloViewerAE/proj.cmake/CMakeLists.txt
  35. 2 2
      examples/HelloViewerAE/proj.win32/HelloViewerAE.vcxproj

+ 3 - 0
.gitignore

@@ -11,3 +11,6 @@ examples/HelloViewerAE/proj.android/build/
 examples/HelloViewerAE/proj.android/.externalNativeBuild/
 examples/HelloViewerAE/proj.android/.externalNativeBuild/
 examples/HelloViewerAE/proj.win32/.vs/
 examples/HelloViewerAE/proj.win32/.vs/
 examples/HelloViewerAE/proj.win32/Debug_v141/
 examples/HelloViewerAE/proj.win32/Debug_v141/
+examples/HelloViewerAE/proj.win32/Release_v141/
+examples/HelloViewerAE/proj.cmake/build_emsc/
+examples/HelloViewerAE/proj.cmake/data.js

BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_body.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_head.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_apple_eye.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_eyebrow.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_eyelash.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_hand.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_hand_bg.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_leg.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_left_leg_bg.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_apple_eye.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_eyebrow.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_eyelash.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_hand.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_hand_bg.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_leg.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_right_leg_bg.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_shadow.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_shield.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_strand_1.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_strand_2.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_strand_3.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_strand_4.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_sword.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_textile.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_textile_back.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_textile_bg.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_white_eyes.png


BIN
examples/AE/Knight/(Footage)/fottage/Sprite_Player_wrist_right_hand.png


BIN
examples/AE/Knight/(Footage)/fottage/eyelid_btm.png


BIN
examples/AE/Knight/(Footage)/fottage/eyelid_up.png


BIN
examples/AE/Knight/Knight.aep


BIN
examples/HelloViewerAE/data/HelloViewerAE.exe


+ 1 - 1
examples/HelloViewerAE/proj.cmake/CMakeLists.txt

@@ -35,7 +35,7 @@ target_link_libraries(HelloViewerAE ${OXYGINE_CORE_LIBS})
 include_directories(../../../src/)
 include_directories(../../../src/)
 
 
 
 
-add_definitions(-DAE_MOVIE_STREAM_NO_CACHE=1 -DAE_TIME_DEFINE=1 -DAE_TIME_MILLISECOND=1 -DAE_MOVIE_SAFE=1)
+add_definitions(-DAE_MOVIE_STREAM_NO_CACHE=1 -DAE_TIME_DEFINE=1 -DAE_TIME_MILLISECOND=1 -DAE_MOVIE_SAFE=1 -DAEVIEWER=1)
 include_directories(../../../src/)
 include_directories(../../../src/)
 include_directories(../../../ae-movie/include)
 include_directories(../../../ae-movie/include)
 
 

+ 2 - 2
examples/HelloViewerAE/proj.win32/HelloViewerAE.vcxproj

@@ -75,7 +75,7 @@
       </PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;AE_MOVIE_STREAM_NO_CACHE=1;AE_TIME_DEFINE=1;AE_TIME_MILLISECOND=1;AE_MOVIE_SAFE=1;AEVIEWER=1;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../../oxygine-framework//oxygine/src;../../../..//SDL/include;../../../../oxygine-framework//oxygine/third_party/win32/pthreads/include;../../../src;../../../ae-movie/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>../../../../oxygine-framework//oxygine/src;../../../..//SDL/include;../../../../oxygine-framework//oxygine/third_party/win32/pthreads/include;../../../src;../../../ae-movie/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     </ClCompile>
     <Link>
     <Link>
@@ -95,7 +95,7 @@
       <Optimization>MaxSpeed</Optimization>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;AE_MOVIE_STREAM_NO_CACHE=1;AE_TIME_DEFINE=1;AE_TIME_MILLISECOND=1;AE_MOVIE_SAFE=1;AEVIEWER=1;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../../oxygine-framework//oxygine/src;../../../..//SDL/include;../../../../oxygine-framework//oxygine/third_party/win32/pthreads/include;../../../src;../../../ae-movie/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>../../../../oxygine-framework//oxygine/src;../../../..//SDL/include;../../../../oxygine-framework//oxygine/third_party/win32/pthreads/include;../../../src;../../../ae-movie/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     </ClCompile>
     <Link>
     <Link>