Increase number of texture.

Fix topdown record video.
Upgrade sample.

diff --git a/samples/tcl/video.tcl b/samples/tcl/video.tcl
index a503fe3a39464bb03446d156d41fa36c53647a28..23056c81b2402862ec2128745e3222419e5ea04d 100644 (file)
--- a/samples/tcl/video.tcl
+++ b/samples/tcl/video.tcl
@@ -3,59 +3,132 @@ pload ALL
 vclear
 vclose all
 
-vinit name=View1 w=512 h=512
+vinit name=View1 w=512 h=512 t=256 l=1024
 vsetdispmode 1
-vcamera -persp -fovy 90
+vcamera -persp -fovy 60
 
+vtrihedron tr0
 vzbufftrihedron
 
-set folderTyre "D:/TmpFiles/for_video/Tyre"
-set folderEnv  "D:/TmpFiles/for_video/Environment"
+# Declaration global variables
+global startTimeTyre
+global currentTimeTyre
+global endTimeTyre
+global stepTimeTyre
+
+set startTimeTyre   4805
+set currentTimeTyre 4805
+set endTimeTyre     5690
+set stepTimeTyre    15
+
+global folderTyre
+global folderTyre
+global folderVideo
+
+set folderTyre  "D:/TmpFiles/for_video/Tyre"
+set folderEnv   "D:/TmpFiles/for_video/Environment"
+set folderVideo "D:/TmpFiles/for_video/Result"
+
+# Settings
+set isEditLight 1
+set isGI 1
+set isAnim 1
 
 #road
 puts "Loading road..."
-vdisplayobj   road "${folderEnv}/roadV2.obj"
-vlocrotate    road 0 0 0 1 0 0 90
-vlocscale     road 1 1 0 102400
-vloctranslate road 0 1 3.5
-#vlocscale     road
+#vdisplayobj   road "${folderEnv}/roadV2.obj"
+#vlocrotate    road 0 0 0 1 0 0 90
+#vlocscale     road 1 1 0 102400
+#vloctranslate road 0 1.0008 3.5
 
 #building0
 puts "Loading the first building..."
-vdisplayobj   building0 "${folderEnv}/Building N100715.obj"
-vlocscale     building0 1 1 1 10922
-vlocrotate    building0 0 0 0 1 0 0 90
-vlocrotate    building0 0 0 0 0 1 0 45
-vloctranslate building0 -6 3 3
+#vdisplayobj   building0 "${folderEnv}/Building N100715.obj"
+#vlocscale     building0 1 1 1 10922
+#vlocrotate    building0 0 0 0 1 0 0 90
+#vlocrotate    building0 0 0 0 0 1 0 45
+#vloctranslate building0 -6 3 3
+
 
 #House N090614
 puts "Loading the second building..."
-vdisplayobj   HouseN090614 "${folderEnv}/House N090614.obj"
-vloctranslate HouseN090614 0 0 1000
-vlocrotate    HouseN090614 0 0 0 1 0 0 90
-vlocscale     HouseN090614 1 1 1 1024
+#vdisplayobj   building1 "${folderEnv}/Scene BuildingN090614.obj"
+#vlocscale     building1 1 1 1 21845
+#vloctranslate building1 -1 1 1
+#vlocrotate    building1 0 0 0 0 0 1 180
 
 #Building1
 puts "Loading the third building..."
-vdisplayobj   building1 "${folderEnv}/Building N101213.obj"
-vlocrotate    building1 0 0 0 1 0 0 90
-vlocscale     building1 1 1 1 21845
-vloctranslate building1 -1 1 0
-vlocrotate    building1 0 0 0 0 1 0 45
+#vdisplayobj   building2 "${folderEnv}/Scene BuildingN101213.obj"
+#vlocscale     building2 1 1 1 21845
+#vloctranslate building2 -1 1 1
+#vlocrotate    building2 0 0 0 0 0 1 180
+
+#lawn
+puts "Loading lawn..."
+#vdisplayobj   lawn "${folderEnv}/Scene Lawn.obj"
+#vlocscale     lawn 1 1 1 21485
+#vloctranslate lawn -1 1 1
+#vlocrotate    lawn 0 0 0 0 0 1 180
+#vsetmaterial  lawn plastic
+#vbsdf         lawn -kd 0.114 0.306 0.008
+
+#bench0
+puts "Loading the first bench..."
+#vdisplayobj   bench0 "${folderEnv}/Scene BenchN210815.obj"
+#vlocscale     bench0 1 1 1 21485
+#vloctranslate bench0 -1 1 1
+#vlocrotate    bench0 0 0 0 0 0 1 180
 
-#Tyre
-puts "Loading tyre..."
-vdisplayobj   tyre "${folderTyre}/tyre.obj"
-vloctranslate tyre 0 -10000 400
+#urn0
+puts "Loading the first urn..."
+vdisplayobj   urn0 "${folderEnv}/Scene Urn.obj"
+vlocscale     urn0 1 1 1 21485
+vloctranslate urn0 -1 1 1
+vlocrotate    urn0 0 0 0 0 0 1 180
 
-#vlight del 0
-#vlight del 1
-#vlight add positional head 0 pos 0.5 0.5 50.85
-#vlight change 0 sm 0.06
-#vlight change 0 int 160.0
+vviewparams -eye 24631.990743707178 -5440.5284854311521 10802.013424258917
+vviewparams -at 5913.1650096036392 5334.3047672616967 5730.8013468954196
+vviewparams -proj 0.84373094111182723 -0.48566402239936912 0.22857943117746968
+vviewparams -up -0.41631981347694685 -0.32330155298659913 0.84979639840550847
 
+if { ${isEditLight} == 1 } {
+  vlight change 0 head 0
+  vlight change 0 sm 0.1
+  vlight change 0 int 300
+  vlight change 0 direction 1 1 -1
+}
 
-#vrenderparams -ray -gi -rayDepth 8
 vtextureenv on 4
 vrenderparams -ray -env on
-vfit
+
+if { ${isGI} == 1 } {
+  vrenderparams -gi
+  vrenderparams -brng
+}
+
+proc Anim0 {thePts theLocalPts theName} {
+  global startTimeTyre
+  global currentTimeTyre
+  global endTimeTyre
+  global stepTimeTyre
+  global folderTyre
+
+  if { ${currentTimeTyre} > ${startTimeTyre} } {
+    set prevTimeTyre [expr ${currentTimeTyre} - ${stepTimeTyre}]
+    vremove tyre_${prevTimeTyre}
+  }
+
+  if { ${currentTimeTyre} <= ${endTimeTyre} } {
+    puts "Loading tyre_${currentTimeTyre}..."
+    vdisplayobj tyre_${currentTimeTyre} "${folderTyre}/tyre_3.${currentTimeTyre}.obj"
+  }
+
+  set currentTimeTyre [expr ${currentTimeTyre} + ${stepTimeTyre}]
+}
+
+if { ${isAnim} == 1 } {
+  vanim anim0 -reset -onRedraw Anim0
+  vanim anim -reset -addSlice 0.0 0.5 anim0
+  vanim -play anim -playFps 60 -record "${folderVideo}/video.mkv" -recWidth 1920 -recHeight 1080
+}

diff --git a/src/OpenGl/OpenGl_SceneGeometry.hxx b/src/OpenGl/OpenGl_SceneGeometry.hxx
index 241d9b8431f22157604ee0b4b179d8e91089af22..58c65da8ecd900c7564d97c192c50518d12090d5 100755 (executable)
--- a/src/OpenGl/OpenGl_SceneGeometry.hxx
+++ b/src/OpenGl/OpenGl_SceneGeometry.hxx
@@ -362,7 +362,7 @@ public:
   //! This is not restriction of the solution implemented, but
   //! rather the reasonable limit of the number of textures in
   //! various applications (can be increased if needed).
-  static const Standard_Integer MAX_TEX_NUMBER = 32;
+  static const Standard_Integer MAX_TEX_NUMBER = 64;
 
 public:
 

diff --git a/src/ViewerTest/ViewerTest_AviCommands.cxx b/src/ViewerTest/ViewerTest_AviCommands.cxx
index 4608ddbc43d1d97259ddd5ee122f1dee7e97ea32..ae433a7f386bfb1ded7bcc2890816e485b2d3bcd 100644 (file)
--- a/src/ViewerTest/ViewerTest_AviCommands.cxx
+++ b/src/ViewerTest/ViewerTest_AviCommands.cxx
@@ -419,6 +419,7 @@ protected:
       ::Message::DefaultMessenger()->Send (aMsg, Message_Fail);
       return Standard_False;
     }
+    myImgSrcRgba.SetTopDown(true);
 
     myScaleCtx = sws_getContext (aCodecCtx->width, aCodecCtx->height, myPixFmtSrc,
                                  aCodecCtx->width, aCodecCtx->height, aCodecCtx->pix_fmt,