Mercurial > mm7

changeset 2391:5d866ee28376

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
delete stru176.h for MVS 2010 MMT project
author Ritor1
date Fri, 04 Jul 2014 09:26:25 +0600
parents 5f395dd759fb
children 22cbc67a619e
files Build/Visual Studio 2010/World of Might and Magic.vcxproj Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters Indoor.cpp MediaPlayer.cpp MediaPlayer.h
diffstat 5 files changed, 14 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Mon Jun 23 23:45:57 2014 +0600
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Fri Jul 04 09:26:25 2014 +0600
@@ -468,7 +468,6 @@
     <ClInclude Include="..\..\stru123.h" />
     <ClInclude Include="..\..\stru159.h" />
     <ClInclude Include="..\..\stru160.h" />
-    <ClInclude Include="..\..\stru176.h" />
     <ClInclude Include="..\..\stru298.h" />
     <ClInclude Include="..\..\stru314.h" />
     <ClInclude Include="..\..\stru367.h" />
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Mon Jun 23 23:45:57 2014 +0600
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Fri Jul 04 09:26:25 2014 +0600
@@ -66,7 +66,6 @@
     <ClInclude Include="..\..\stru123.h" />
     <ClInclude Include="..\..\stru159.h" />
     <ClInclude Include="..\..\stru160.h" />
-    <ClInclude Include="..\..\stru176.h" />
     <ClInclude Include="..\..\stru298.h" />
     <ClInclude Include="..\..\stru314.h" />
     <ClInclude Include="..\..\stru367.h" />
--- a/Indoor.cpp	Mon Jun 23 23:45:57 2014 +0600
+++ b/Indoor.cpp	Fri Jul 04 09:26:25 2014 +0600
@@ -3817,7 +3817,7 @@
   {
     for (uint i = 0; i < pSector->uNumNonBSPFaces; ++i)
       //Log::Warning(L"Non-BSP face: %X", v3->pFaceIDs[v2]);
-      pBspRenderer->AddFaceToRenderList_d3d(node_id, pSector->pFaceIDs[i]);
+      pBspRenderer->AddFaceToRenderList_d3d(node_id, pSector->pFaceIDs[i]);//рекурсия\recursion
   }
   /*else
   {
--- a/MediaPlayer.cpp	Mon Jun 23 23:45:57 2014 +0600
+++ b/MediaPlayer.cpp	Fri Jul 04 09:26:25 2014 +0600
@@ -198,10 +198,9 @@
   AVCodecContext  *dec_ctx;
 };
 
-struct AVAudioStream: public AVStreamWrapper
+struct AVAudioStream: public AVStreamWrapper//структура AVAudioStreem производная от структуры AVStreemWrapper
 {
-  inline AVAudioStream():
-    AVStreamWrapper()
+  inline AVAudioStream():AVStreamWrapper()
   {
     this->bytes_per_sample = 0;
     this->bytes_per_second = 0;
@@ -213,8 +212,7 @@
 
 struct AVVideoStream: public AVStreamWrapper
 {
-  inline AVVideoStream():
-    AVStreamWrapper()
+  inline AVVideoStream(): AVStreamWrapper()
   {
     this->frames_per_second = 0.0;
   }
@@ -650,10 +648,10 @@
   return true;
 }
 
-class Track: public Media::ITrack
+class Track: public Media::ITrack//класс производная от базового Media::ITrack
 {
   public:
-    inline Track()
+    inline Track()//прямая вставка в код
     {
       this->format_ctx = nullptr;
       this->audio_num_samples = 0;
@@ -669,7 +667,7 @@
       audio.Release();
       if (format_ctx)
       {
-        // закрытия контекста файла
+        // закрытие контекста файла
         av_close_input_file(format_ctx);
         format_ctx = nullptr;
       }
@@ -755,10 +753,10 @@
     OpenALSoundProvider::TrackBuffer *device_buffer;
 };
 
-class Movie: public Media::IMovie
+class Movie: public Media::IMovie//класс производная от базового Media::IMovie
 {
   public:
-    inline Movie()
+    inline Movie()//прямая вставка в код
     {
       this->movie_filename[0] = 0;
       this->width = 0;
--- a/MediaPlayer.h	Mon Jun 23 23:45:57 2014 +0600
+++ b/MediaPlayer.h	Fri Jul 04 09:26:25 2014 +0600
@@ -4,13 +4,15 @@
 {
   class ITrack
   {
-    public: virtual void Play(bool loop = false) = 0;
+    public:
+		virtual void Play(bool loop = false) = 0;
   };
 
   class IMovie
   {
-    public: virtual void Play() = 0;
-            virtual void GetNextFrame(double dt, void *target_surface) = 0;
+    public: 
+		virtual void Play() = 0;
+        virtual void GetNextFrame(double dt, void *target_surface) = 0;
   };
 
   class MPlayer