Update intro page.

docs/static/style.css

@@ -247,7 +247,7 @@ code.inline
 }
 
 
-@media only screen and (max-width: 600px)
+@media (max-width: 600px)
 {
 
 .navigation

source/website/css/core.css

@@ -67,7 +67,7 @@ a:hover
 
 }
 
-@media only screen and (max-width: 800px)
+@media (max-width: 800px)
 {
 
 .only_full_width
@@ -76,13 +76,3 @@ a:hover
 }
 
 }
-
-@media only screen and (max-height: 800px)
-{
-
-.only_full_height
-{
-	display: none;
-}
-
-}

source/website/css/dialogs.css

@@ -303,7 +303,7 @@ div.ov_popup div.ov_popup_list_item:hover
 
 }
 
-@media only screen and (max-width: 700px)
+@media (max-width: 700px)
 {
 
 div.ov_dialog

source/website/css/website.css

@@ -27,12 +27,6 @@ div.title div.title_left
 	float: left;
 }
 
-div.title img.logo_image
-{
-	height: 40px;
-	float: left;
-}
-
 div.title svg.logo_image
 {
 	width: 190px;
@@ -78,24 +72,65 @@ div.intro
 	display: none;
 }
 
+div.intro_content
+{
+	width: 500px;
+	max-width: 90%;
+	margin: 50px auto;
+}
+
+div.intro div.intro_logo
+{
+	border-bottom: 1px solid var(--ov_border_color);
+	padding-bottom: 30px;
+}
+
 div.intro svg.intro_logo
 {
-	display: inline;
-	width: 140px;
-	height: 140px;
-	max-width: 80%;
+	width: 381px;
+	height: 80px;
+	max-width: 90%;
+	margin-bottom: 20px;
 }
 
-div.intro div.intro_section
+div.intro div.intro_formats
 {
-	font-size: 21px;
-	margin: 50px 0px;
+	margin-top: 30px;
 }
 
-div.intro div.intro_big_text
+div.intro div.intro_dragdrop_text
 {
 	font-size: 30px;
-	line-height: 50px;
+}
+
+div.intro div.intro_formats_title
+{
+	font-size: 25px;
+	margin-bottom: 15px;
+}
+
+div.intro div.intro_file_formats
+{
+	margin: 0px auto;
+}
+
+div.intro div.intro_file_formats a
+{
+	color: var(--ov_outline_button_text_color);
+	text-decoration: none;
+	font-size: 17px;
+	width: 50px;
+	border-radius: 5px;
+	padding: 4px 8px;
+	margin: 6px 4px;
+	border: 1px solid var(--ov_outline_button_color);
+	display: inline-block;
+	cursor: pointer;
+}
+
+div.intro div.intro_file_formats a:hover
+{
+	background: var(--ov_outline_button_hover_color);
 }
 
 div.main
@@ -320,19 +355,27 @@ div.ov_toolbar div.ov_toolbar_button:hover
 
 }
 
-@media only screen and (max-width: 800px)
+@media (max-width: 350px), (max-height: 700px)
 {
 
-div.intro div.intro_section
+div.intro_content
 {
-	font-size: 18px;
-	line-height: 20px;
+	margin: 0px auto;
 }
 
-div.intro div.intro_big_text
+div.intro div.intro_logo
 {
-	font-size: 23px;
-	line-height: 30px;
+	display: none;
+}
+
+}
+
+@media (max-width: 800px)
+{
+
+div.intro_content
+{
+	width: auto;
 }
 
 div.main_viewer canvas
@@ -357,13 +400,3 @@ div.ov_bottom_floating_panel
 }
 
 }
-
-@media only screen and (max-height: 700px)
-{
-
-div.intro div.intro_section
-{
-	margin: 18px 0px;
-}
-
-}

tools/create_package.py

@@ -71,10 +71,6 @@ def CreateWebsite (rootDir, websiteDir, version, testBuild):
 		if os.path.exists (analyticsFile) and not testBuild:
 			analyticsContent = Utils.GetFileContent (analyticsFile)
 			replacer.ReplaceTokenContent ('<!-- analytics start -->', '<!-- analytics end -->', analyticsContent)
-		introFile = os.path.join (rootDir, 'plugins', 'website_intro_data.txt')
-		if os.path.exists (introFile):
-			introContent = Utils.GetFileContent (introFile)
-			replacer.ReplaceTokenContent ('<!-- intro start -->', '<!-- intro end -->', introContent)
 		replacer.WriteToFile (htmlFilePath)
 
 def CreateEnginePackage (rootDir, engineDir, websiteDir):

website/assets/models/README.md

@@ -0,0 +1,97 @@
+## Model file licenses
+
+### ArchDetail.FCStd
+
+GNU LIBRARY GENERAL PUBLIC LICENSE, Copyright (C) 1991 Free Software Foundation, Inc.
+
+Source: https://github.com/FreeCAD/FreeCAD
+
+### as1_pe_203.brep
+
+Source: https://www.mbx-if.org/cax/cax_stepLib.php
+
+### as1_pe_203.igs
+
+Source: https://www.mbx-if.org/cax/cax_stepLib.php
+
+### as1_pe_203.stp
+
+Source: https://www.mbx-if.org/cax/cax_stepLib.php
+
+### car.glb
+
+MIT License, Copyright (c) 2023 Viktor Kovacs
+
+### cow.ply
+
+GNU LGPL license
+
+Source: https://people.sc.fsu.edu/~jburkardt/data/ply/ply.html
+
+### cube.off
+
+Source: https://en.wikipedia.org/wiki/OFF_(file_format)
+
+### cubes.3ds
+
+MIT License, Copyright (c) 2023 Viktor Kovacs
+
+### DamagedHelmet.glb
+
+Created by [theblueturtle_](https://sketchfab.com/theblueturtle_), published under a Creative Commons Attribution-NonCommercial license
+
+Source: https://sketchfab.com/models/b81008d513954189a063ff901f7abfe4
+
+### extrusion3.wrl
+
+MIT License, Copyright © 2010-2023 three.js authors
+
+Source: https://github.com/mrdoob/three.js
+
+### haus.ifc
+
+MIT License, Copyright (c) 2021 Antonio González Viegas
+
+Source: https://github.com/IFCjs/test-ifc-files
+
+### MultipleMeshes.bim
+
+MIT License, Copyright (c) 2022 Wojciech Radaczyński
+
+Source: https://github.com/paireks/dotbim
+
+### RhinoLogo.3dm
+
+MIT License, Copyright (c) 2020 Robert McNeel & Associates
+
+Source: https://github.com/mcneel/rview
+
+### rhombicuboctahedron.3mf
+
+BSD 2-Clause License, Copyright (c) 2018, 3MF Consortium
+
+Source: https://github.com/3MFConsortium/3mf-samples
+
+### rook.amf
+
+MIT License, Copyright © 2010-2023 three.js authors
+
+Source: https://github.com/mrdoob/three.js
+
+### solids.obj, solids.mtl
+
+MIT License, Copyright (c) 2023 Viktor Kovacs
+
+### utah_teapot.stl
+
+Creative Commons CC0 1.0 Universal Public Domain Dedication
+
+Source: https://commons.wikimedia.org/wiki/File:Utah_teapot_(solid).stl
+
+### X_Bot.dae
+
+Source: https://www.mixamo.com
+
+### Y_Bot.fbx
+
+Source: https://www.mixamo.com

website/assets/models/cube.off

@@ -0,0 +1,19 @@
+OFF
+# cube.off
+# A cube
+ 
+8 6 12
+ 1.0  0.0 1.4142
+ 0.0  1.0 1.4142
+-1.0  0.0 1.4142
+ 0.0 -1.0 1.4142
+ 1.0  0.0 0.0
+ 0.0  1.0 0.0
+-1.0  0.0 0.0
+ 0.0 -1.0 0.0
+4  0 1 2 3  255 0 0 #red
+4  7 4 0 3  0 255 0 #green
+4  4 5 1 0  0 0 255 #blue
+4  5 6 2 1  0 255 0 
+4  3 2 6 7  0 0 255
+4  6 5 4 7  255 0 0

website/assets/models/extrusion3.wrl

@@ -0,0 +1,53 @@
+#VRML V2.0 utf8
+# X3D-to-VRML-97 XSL translation autogenerated by X3dToVrml97.xslt
+# http://www.web3d.org/x3d/content/X3dToVrml97.xslt
+# Generated using XSLT processor: SAXON 9.1.0.2 from Saxonica
+
+# [X3D] VRML V3.0 utf8
+# PROFILE Immersive
+# [X3D] version=3.0
+# [X3D] noNamespaceSchemaLocation=http://www.web3d.org/specifications/x3d-3.0.xsd
+# [head]
+
+# META "title" "Figure15.15TwistedBar.x3d"
+# META "creator" "Figure 15.15, The VRML 2.0 Sourcebook, Copyright [1997] By Andrea L. Ames, David R. Nadeau, and John L. Moreland"
+# META "reference" "http://www.wiley.com/legacy/compbooks/vrml2sbk/ch15/15fig15.htm"
+# META "translator" "Don Brutzman"
+# META "created" "20 August 2000"
+# META "modified" "14 January 2010"
+# META "description" "A bar twisted using Y-axis, cross-section rotation at each spine coordinate."
+# META "identifier" "http://www.web3d.org/x3d/content/examples/Vrml2Sourcebook/Chapter15-Extrusion/Figure15.15TwistedBar.x3d"
+# META "generator" "X3D-Edit 3.3, https://savage.nps.edu/X3D-Edit"
+# META "license" "../../license.html"
+
+# [Scene] ========== ========== ==========
+
+NavigationInfo { type [ "EXAMINE" "ANY" ] } ###  Default X3D NavigationInfo
+
+# Computational cost of Extrusion compared to IndexedFaceSet: quicker to download, takes time to calculate polygonal faces and normals during initial loading, equally fast at run time.
+# Authoring capabilities of Extrusion compared to IndexedFaceSet: can be more complicated to express, but also can provide great detail with much less effort.
+# First position and rotate viewpoint into positive-X-Y-Z octant using a Transform
+Transform {
+  rotation 0 1 0 0.758
+  translation 10 5 10
+  children [
+      Viewpoint {
+        description "Twisted bar using extrusion orientations"
+        orientation 1 0 0 -0.3
+        position 0 0 0
+      }
+  ]
+}
+Shape {
+  appearance Appearance {
+    material Material {
+      diffuseColor 1 0.5 0
+    }
+  }
+  geometry Extrusion {
+    creaseAngle 0.785
+    crossSection [ -1 1 1 1 1 -1 -1 -1 -1 1 ]
+    orientation [ 0 1 0 0 0 1 0 0.175 0 1 0 0.349 0 1 0 0.524 0 1 0 0.698 0 1 0 0.873 0 1 0 1.047 0 1 0 1.222 0 1 0 1.396 ]
+    spine [ 0 0.0 0 0 0.5 0 0 1.0 0 0 1.5 0 0 2.0 0 0 2.5 0 0 3.0 0 0 3.5 0 0 4.0 0 ]
+  }
+}

website/index.html

@@ -65,25 +65,35 @@
         </div>
     </div>
     <div class="intro ov_thin_scrollbar" id="intro">
-        <div class="intro_section only_full_width only_full_height">
-            <svg class="intro_logo"><use href="assets/images/3dviewer_net_logo.svg#logo"></use></svg>
-        </div>
-        <div class="intro_section intro_big_text">
-            Drag and drop 3D models here.<br>
-            <b>obj, 3ds, stl, ply, gltf, 3dm, fbx, <a target="_blank" href="info/index.html">and more</a></b>
-        </div>
-        <div class="intro_section">
-            <div>Example models:</div>
-            <div class="example_models">
-                <a href="index.html#model=assets/models/solids.obj,assets/models/solids.mtl">solids</a>
-                <span style="color:#aaaaaa;"> | </span>
-                <a href="index.html#model=assets/models/car.glb">car</a>
-                <span style="color:#aaaaaa;"> | </span>
-                <a href="index.html#model=assets/models/DamagedHelmet.glb">helmet</a>
+        <div class="intro_content">
+            <div class="intro_logo">
+                <svg class="intro_logo"><use href="assets/images/3dviewer_net_logo_text.svg#logo"></use></svg>
+                <div class="intro_dragdrop_text">Drag and drop 3D models here.</div>
+            </div>
+            <div class="intro_formats">
+                <div class="intro_formats_title">Check an example file:</div>
+                <div class="intro_file_formats">
+                    <a href="#model=assets/models/solids.obj,assets/models/solids.mtl">obj</a>
+                    <a href="#model=assets/models/cubes.3ds,assets/models/texture.png">3ds</a>
+                    <a href="#model=assets/models/utah_teapot.stl">stl</a>
+                    <a href="#model=assets/models/cow.ply">ply</a>
+                    <a href="#model=assets/models/DamagedHelmet.glb">gltf</a>
+                    <a href="#model=assets/models/cube.off">off</a>
+                    <a href="#model=assets/models/RhinoLogo.3dm">3dm</a>
+                    <a href="#model=assets/models/Y_Bot.fbx">fbx</a>
+                    <a href="#model=assets/models/X_Bot.dae">dae</a>
+                    <a href="#model=assets/models/extrusion3.wrl">wrl</a>
+                    <a href="#model=assets/models/rhombicuboctahedron.3mf">3mf</a>
+                    <a href="#model=assets/models/rook.amf">amf</a>
+                    <a href="#model=assets/models/haus.ifc">ifc</a>
+                    <a href="#model=assets/models/as1_pe_203.brep">brep</a>
+                    <a href="#model=assets/models/as1_pe_203.stp">step</a>
+                    <a href="#model=assets/models/as1_pe_203.igs">iges</a>
+                    <a href="#model=assets/models/ArchDetail.FCStd">fcstd</a>
+                    <a href="#model=assets/models/MultipleMeshes.bim">bim</a>
+                </div>
             </div>
         </div>
-        <!-- intro start -->
-        <!-- intro end -->
     </div>
 </body>
 

website/info/css/info.css

@@ -182,7 +182,7 @@ div.main
 	overflow: auto;
 }
 
-@media only screen and (max-width: 500px)
+@media (max-width: 500px)
 {
 
 div.logo img.logo_with_text
@@ -197,7 +197,7 @@ div.logo img.logo_without_text
 
 }
 
-@media only screen and (max-width: 1000px)
+@media (max-width: 1000px)
 {
 
 div.frame