Changeset 1313 in 3DVCSoftware for trunk/source/App/TAppRenderer/TAppRendererTop.h

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/App/TAppRenderer/TAppRendererTop.h (modified) (4 diffs)

trunk/source/App/TAppRenderer/TAppRendererTop.h

@@ -39 +39 @@
 #ifndef __TAppRendererTOP__
 #define __TAppRendererTOP__
-#include "../../Lib/TLibCommon/TypeDef.h"
-#if H_3D
+#include "../../Lib/TLibCommon/CommonDef.h"
+#if NH_3D
 #include "../../Lib/TLibRenderer/TRenTop.h"
 #include "../../Lib/TLibVideoIO/TVideoIOYuv.h"
@@ -68 +68 @@
   Void  xInitLib          ();                               ///< initialize renderer class
   Void  xDestroyLib       ();                               ///< destroy renderer class and video io
-#if H_3D_VSO
+#if NH_3D_VSO
   Void  xRenderModelFromString();                           ///< render using model using setup string
   Void  xRenderModelFromNums();                             ///< render using model using synth view numbers
@@ -78 +78 @@
 
   Void  render      ();                               ///< main encoding function
-#if H_3D_VSO
+#if NH_3D_VSO
   Void  renderModel ();
 #endif
@@ -87 +87 @@
 
 
-#endif // H_3D
+#endif // NH_3D
 #endif // __TAppRendererTOP__