add cylinder mesh

patriciogonzalezvivo · Nov 29, 2023 · db3def8 · db3def8
1 parent 024bc84
commit db3def8
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/deps/vera b/deps/vera
diff --git a/src/core/sandbox.cpp b/src/core/sandbox.cpp
@@ -1155,8 +1155,10 @@ void Sandbox::loadAssets(WatchFileList &_files) {
             uniforms.activeCamera->orbit(m_camera_elevation, m_camera_azimuth, m_sceneRender.getArea() * 8.5);
 
         if (lenticular.size() == 0) {
-            if (quilt_tile >= 0)
-                vera::setWindowSize(vera::getQuiltWidth()/vera::getQuiltColumns(), vera::getQuiltHeight()/vera::getQuiltRows());
+            if (quilt_tile >= 0) {
+                vera::setWindowSize(vera::getQuiltWidth()/vera::getQuiltColumns(), 
+                                    vera::getQuiltHeight()/vera::getQuiltRows());
+            }
             else
                 vera::setWindowSize(vera::getQuiltWidth(), vera::getQuiltHeight());
         }

diff --git a/src/main.cpp b/src/main.cpp
@@ -1862,6 +1862,40 @@ void commandsInit() {
         return true;
     }, "icosphere[,<RESOLUTION>]", "add icosphere mesh"));
 
+
+    commands.push_back(Command("cylinder", [&](const std::string & line) {
+        std::vector<std::string> values = vera::split(line,',');
+        int resolutionR = 16;
+        int resolutionH = 3;
+        int resolutionC = 1;
+
+        if (values.size() > 1) {
+            resolutionR  = vera::toInt(values[1]);
+        }
+        if (values.size() > 2) {
+            resolutionH  = vera::toInt(values[2]);
+        }
+        if (values.size() > 3) {
+            resolutionC  = vera::toInt(values[3]);
+        }
+
+        sandbox.loadModel( new vera::Model("c", vera::cylinderMesh(1.0, 1.0, resolutionR, resolutionH, resolutionC, resolutionC != 0) ) );
+
+        #if defined(__EMSCRIPTEN__)
+        // Commands are parse in the main GL loop in EMSCRIPTEN,
+        // there is no risk to reload shaders outside main GL thread
+        sandbox.resetShaders(files);
+        #else
+        // Reloading shaders can't be done directly on multi-thread (event thread)
+        // to solve that, we trigger reloading by flagging changes on all files
+        // witch signal the main GL thread to reload assets
+        for (size_t i = 0; i < files.size(); i++)
+            files[i].lastChange = 0;
+        #endif
+
+        return true;
+    }, "cylinder[,<RESOLUTION_RADIUS>,<RESOLUTION_HEIGHT>]]", "add cylinder mesh"));
+
     commands.push_back(Command("wait", [&](const std::string& _line){ 
         std::vector<std::string> values = vera::split(_line,',');
         if (values.size() == 2) {