projects / sixth-3d-demos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 680a14d)
Added screenshot for lots of text editors
authorSvjatoslav Agejenko <svjatoslav@svjatoslav.eu>
Sat, 29 May 2021 02:04:15 +0000 (05:04 +0300)
committerSvjatoslav Agejenko <svjatoslav@svjatoslav.eu>
Sat, 29 May 2021 02:04:15 +0000 (05:04 +0300)
doc/index.html patch | blob | history
doc/index.org patch | blob | history
doc/screenshots/text editors 2.png [new file with mode: 0644] patch | blob
src/main/java/eu/svjatoslav/sixth/e3d/examples/TextEditorDemo.java patch | blob | history
src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java patch | blob | history

diff --git a/doc/index.html b/doc/index.html
index a1dd806..f9207d8 100644 (file)
--- a/doc/index.html
+++ b/doc/index.html
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2021-05-29 Sat 02:31 -->
+<!-- 2021-05-29 Sat 05:01 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>Sixth 3D engine demos</title>
@@ -224,28 +224,28 @@
 <h2>Table of Contents</h2>
 <div id="text-table-of-contents">
 <ul>
-<li><a href="#org4f0e7fe">1. General</a>
+<li><a href="#org95d4b4a">1. General</a>
 <ul>
-<li><a href="#orga46b71e">1.1. Source code</a></li>
+<li><a href="#orgb4bf858">1.1. Source code</a></li>
 </ul>
 </li>
-<li><a href="#orgef4de6a">2. Overview</a></li>
-<li><a href="#org3f74fff">3. Navigating in space</a></li>
-<li><a href="#org3b10dd6">4. Example scenes in this repository</a>
+<li><a href="#orgc815f60">2. Overview</a></li>
+<li><a href="#org8b7a7b2">3. Navigating in space</a></li>
+<li><a href="#org48ba3fe">4. Example scenes in this repository</a>
 <ul>
-<li><a href="#org6ce2160">4.1. Raytracing through voxels</a></li>
-<li><a href="#org4a93a25">4.2. Conway's Game of Life</a></li>
-<li><a href="#org6ee86f3">4.3. Text editors</a></li>
-<li><a href="#orgdaa46bd">4.4. Mathematical formulas</a></li>
-<li><a href="#orga9bf86e">4.5. Sinus heightmaps and sphere</a></li>
+<li><a href="#org00b3f6a">4.1. Raytracing through voxels</a></li>
+<li><a href="#orgc873cd5">4.2. Conway's Game of Life</a></li>
+<li><a href="#org45d4cba">4.3. Text editors</a></li>
+<li><a href="#orga981e88">4.4. Mathematical formulas</a></li>
+<li><a href="#org2f45bee">4.5. Sinus heightmaps and sphere</a></li>
 </ul>
 </li>
 </ul>
 </div>
 </div>
 
-<div id="outline-container-org4f0e7fe" class="outline-2">
-<h2 id="org4f0e7fe"><span class="section-number-2">1</span> General</h2>
+<div id="outline-container-org95d4b4a" class="outline-2">
+<h2 id="org95d4b4a"><span class="section-number-2">1</span> General</h2>
 <div class="outline-text-2" id="text-1">
 <ul class="org-ul">
 <li>This program is free software: released under Creative Commons Zero
@@ -262,8 +262,8 @@
 </ul>
 </div>
 
-<div id="outline-container-orga46b71e" class="outline-3">
-<h3 id="orga46b71e"><span class="section-number-3">1.1</span> Source code</h3>
+<div id="outline-container-orgb4bf858" class="outline-3">
+<h3 id="orgb4bf858"><span class="section-number-3">1.1</span> Source code</h3>
 <div class="outline-text-3" id="text-1-1">
 <ul class="org-ul">
 <li><a href="https://www2.svjatoslav.eu/gitweb/?p=sixth-3d-demos.git;a=snapshot;h=HEAD;sf=tgz">Download latest snapshot in TAR GZ format</a></li>
@@ -281,8 +281,8 @@ git clone https://www2.svjatoslav.eu/git/sixth-3d-demos.git
 </div>
 </div>
 
-<div id="outline-container-orgef4de6a" class="outline-2">
-<h2 id="orgef4de6a"><span class="section-number-2">2</span> Overview</h2>
+<div id="outline-container-orgc815f60" class="outline-2">
+<h2 id="orgc815f60"><span class="section-number-2">2</span> Overview</h2>
 <div class="outline-text-2" id="text-2">
 <p>
 Goal of this project is to show off capabilities and API usage of
@@ -290,7 +290,7 @@ Goal of this project is to show off capabilities and API usage of
 </p>
 
 <p>
-All <a href="#org3b10dd6">example scenes in this repository</a> render at interactive
+All <a href="#org48ba3fe">example scenes in this repository</a> render at interactive
 framerates.
 </p>
 
@@ -307,8 +307,8 @@ java -jar sixth-3d-demos.jar
 </div>
 </div>
 
-<div id="outline-container-org3f74fff" class="outline-2">
-<h2 id="org3f74fff"><span class="section-number-2">3</span> Navigating in space</h2>
+<div id="outline-container-org8b7a7b2" class="outline-2">
+<h2 id="org8b7a7b2"><span class="section-number-2">3</span> Navigating in space</h2>
 <div class="outline-text-2" id="text-3">
 <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 
@@ -344,15 +344,15 @@ java -jar sixth-3d-demos.jar
 </div>
 </div>
 
-<div id="outline-container-org3b10dd6" class="outline-2">
-<h2 id="org3b10dd6"><span class="section-number-2">4</span> Example scenes in this repository</h2>
+<div id="outline-container-org48ba3fe" class="outline-2">
+<h2 id="org48ba3fe"><span class="section-number-2">4</span> Example scenes in this repository</h2>
 <div class="outline-text-2" id="text-4">
 </div>
-<div id="outline-container-org6ce2160" class="outline-3">
-<h3 id="org6ce2160"><span class="section-number-3">4.1</span> Raytracing through voxels</h3>
+<div id="outline-container-org00b3f6a" class="outline-3">
+<h3 id="org00b3f6a"><span class="section-number-3">4.1</span> Raytracing through voxels</h3>
 <div class="outline-text-3" id="text-4-1">
 
-<div id="orgc8737da" class="figure">
+<div id="org4c3989b" class="figure">
 <p><img src="screenshots/raytracing fractal in voxel polygon hybrid scene.png" alt="raytracing fractal in voxel polygon hybrid scene.png" />
 </p>
 </div>
@@ -380,8 +380,8 @@ datastructure.
 </div>
 </div>
 
-<div id="outline-container-org4a93a25" class="outline-3">
-<h3 id="org4a93a25"><span class="section-number-3">4.2</span> Conway's Game of Life</h3>
+<div id="outline-container-orgc873cd5" class="outline-3">
+<h3 id="orgc873cd5"><span class="section-number-3">4.2</span> Conway's Game of Life</h3>
 <div class="outline-text-3" id="text-4-2">
 <p>
 The Game of Life, also known simply as Life, is a cellular automaton
@@ -403,7 +403,7 @@ otherwise it dies.</li>
 </ul>
 
 
-<div id="org078306e" class="figure">
+<div id="org06856d1" class="figure">
 <p><img src="screenshots/life.png" alt="life.png" />
 </p>
 </div>
@@ -456,11 +456,11 @@ Usage:
 </div>
 </div>
 
-<div id="outline-container-org6ee86f3" class="outline-3">
-<h3 id="org6ee86f3"><span class="section-number-3">4.3</span> Text editors</h3>
+<div id="outline-container-org45d4cba" class="outline-3">
+<h3 id="org45d4cba"><span class="section-number-3">4.3</span> Text editors</h3>
 <div class="outline-text-3" id="text-4-3">
 
-<div id="orgf87c091" class="figure">
+<div id="orgd8ec036" class="figure">
 <p><img src="screenshots/text editors.png" alt="text editors.png" />
 </p>
 </div>
@@ -513,13 +513,23 @@ user is redirected also to proper location in the world.</li>
 return to them.</li>
 </ul></li>
 </ul>
+
+<p>
+<b>Quite a lot of text editors can be rendered:</b>
+</p>
+
+
+<div id="orgc510a03" class="figure">
+<p><img src="screenshots/text editors 2.png" alt="text editors 2.png" />
+</p>
+</div>
 </div>
 </div>
-<div id="outline-container-orgdaa46bd" class="outline-3">
-<h3 id="orgdaa46bd"><span class="section-number-3">4.4</span> Mathematical formulas</h3>
+<div id="outline-container-orga981e88" class="outline-3">
+<h3 id="orga981e88"><span class="section-number-3">4.4</span> Mathematical formulas</h3>
 <div class="outline-text-3" id="text-4-4">
 
-<div id="orgf582a24" class="figure">
+<div id="org67b5695" class="figure">
 <p><img src="screenshots/mathematical formulas.png" alt="mathematical formulas.png" />
 </p>
 </div>
@@ -530,11 +540,11 @@ visualize some formula using all 3 dimensions avaliable.</li>
 </ul>
 </div>
 </div>
-<div id="outline-container-orga9bf86e" class="outline-3">
-<h3 id="orga9bf86e"><span class="section-number-3">4.5</span> Sinus heightmaps and sphere</h3>
+<div id="outline-container-org2f45bee" class="outline-3">
+<h3 id="org2f45bee"><span class="section-number-3">4.5</span> Sinus heightmaps and sphere</h3>
 <div class="outline-text-3" id="text-4-5">
 
-<div id="org4fe1971" class="figure">
+<div id="org63e266a" class="figure">
 <p><img src="screenshots/sinus heightmaps and sphere.png" alt="sinus heightmaps and sphere.png" />
 </p>
 </div>
@@ -548,7 +558,7 @@ Simple test scene. Easy to implement and looks nice.
 </div>
 <div id="postamble" class="status">
 <p class="author">Author: Svjatoslav Agejenko</p>
-<p class="date">Created: 2021-05-29 Sat 02:31</p>
+<p class="date">Created: 2021-05-29 Sat 05:01</p>
 <p class="validation"><a href="https://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
 </body>
diff --git a/doc/index.org b/doc/index.org
index 3d21043..e3b0019 100644 (file)
--- a/doc/index.org
+++ b/doc/index.org
@@ -115,6 +115,10 @@ again, window must be unfocused first using ESC key.
       user is redirected also to proper location in the world.
   + Possibility to store recently visited locations in the world and
     return to them.
+
+*Quite a lot of text editors can be rendered:*
+
+[[file:screenshots/text editors 2.png]]
 ** Mathematical formulas
 [[file:screenshots/mathematical formulas.png]]
 
diff --git a/doc/screenshots/text editors 2.png b/doc/screenshots/text editors 2.png
new file mode 100644 (file)
index 0000000..cb1733f
Binary files /dev/null and b/doc/screenshots/text editors 2.png differ
diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/examples/TextEditorDemo.java b/src/main/java/eu/svjatoslav/sixth/e3d/examples/TextEditorDemo.java
index 1bcdfb3..a2a4669 100644 (file)
--- a/src/main/java/eu/svjatoslav/sixth/e3d/examples/TextEditorDemo.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/examples/TextEditorDemo.java
@@ -12,6 +12,7 @@ import eu.svjatoslav.sixth.e3d.geometry.Rectangle;
 import eu.svjatoslav.sixth.e3d.gui.Avatar;
 import eu.svjatoslav.sixth.e3d.gui.ViewFrame;
 import eu.svjatoslav.sixth.e3d.gui.ViewPanel;
+import eu.svjatoslav.sixth.e3d.gui.textEditorComponent.LookAndFeel;
 import eu.svjatoslav.sixth.e3d.gui.textEditorComponent.TextEditComponent;
 import eu.svjatoslav.sixth.e3d.math.Transform;
 import eu.svjatoslav.sixth.e3d.renderer.raster.Color;
@@ -54,7 +55,7 @@ public class TextEditorDemo {
 
                 final TextEditComponent textEditor = new TextEditComponent(
                         new Transform(new Point3D(x, 0, z)), viewPanel,
-                        new Point2D(200, 120));
+                        new Point2D(200, 120), new LookAndFeel());
 
                 shapeCollection.addShape(textEditor);
             }
diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java b/src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
index 0a60798..e620649 100644 (file)
--- a/src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
@@ -23,6 +23,7 @@ class MenuPanel extends JPanel {
         sequentialGroup.addComponent(new JButton(new ShowPointCloud()));
         sequentialGroup.addComponent(new JButton(new ShowRain()));
         sequentialGroup.addComponent(new JButton(new ShowTextEditors()));
+        sequentialGroup.addComponent(new JButton(new ShowTextEditors2()));
         sequentialGroup.addComponent(new JButton(new ShowGameOfLife()));
         sequentialGroup.addComponent(new JButton(new ShowRandomPolygons()));
     }
@@ -38,6 +39,17 @@ class MenuPanel extends JPanel {
         }
     }
 
+    private static class ShowTextEditors2 extends AbstractAction {
+        ShowTextEditors2() {
+            putValue(NAME, "Text editors city");
+        }
+
+        @Override
+        public void actionPerformed(final ActionEvent e) {
+            TextEditorDemo2.main(null);
+        }
+    }
+
 
     private static class ShowRain extends AbstractAction {
         ShowRain() {
Unnamed repository; edit this file 'description' to name the repository.