mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-11 02:02:22 +00:00
Dion Moult
ed21dd7ecc
Restructure the web viewer so the wasm is a reusable module and add a second example that drives it from ordinary page DOM. Build: - Emit IfcViewerWeb.js (a `createIfcViewer` factory, MODULARIZE) + .wasm instead of a single baked page (dropped --shell-file); copy the static example pages next to it at build time. - Unbreak the web build: CameraMath.h / ViewportCore.cpp used boost::math::constants::pi just for pi, pulling all of boost/math into a header shared with the Emscripten build (no Boost in its sysroot). Replace with a constexpr kPiF — identical value, no dependency, desktop unaffected. JS integration (web/ifcviewer.js): - A small helper wraps the factory: boots the viewer on a canvas, runs the RAF loop from onRuntimeInitialized (NOT a post-await .then, which stalls Dawn-web's device callback and leaves the device half-initialised), and exposes addFile/addUrl, clearScene, model list/progress, and onSelect(...). - ViewportCore/main_web emit each pick to JS via Module.__ifcvOnSelect (object id + IFC GlobalId + model index; empty on deselect); onSelect also dispatches an 'ifcviewer:select' DOM event. - Fix input coords for a non-fullscreen canvas: mousemove/mouseup are window-targeted, so convert their coords to canvas-relative via the canvas client-rect origin (marquee + box-pick were offset when embedded). Examples: - IfcViewerWeb.html: the fullscreen viewer (same DOM/behaviour as before, now loading the module) — the Playwright smoke suite still targets it. - embedded.html: a sized viewer with DOM outside it to add models (file or URL), list loaded models with streaming progress, and show the model + GlobalId of the clicked object. Starts empty (drops the wasm's embedded sample, which the fullscreen page/tests still use). - index.html links both. Federation note: the web viewer already streams multiple models into one scene (a byte-source per file/URL); it doesn't need the desktop Federation document for this. Verified: 11/11 web smoke tests pass; embedded example loads models, reports the picked model + GUID, and the marquee aligns. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
63 lines
3.1 KiB
C++
63 lines
3.1 KiB
C++
/********************************************************************************
|
|
* *
|
|
* This file is part of IfcOpenShell. *
|
|
* *
|
|
* IfcOpenShell is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the Lesser GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3.0 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* IfcOpenShell is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
* Lesser GNU General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the Lesser GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
* *
|
|
********************************************************************************/
|
|
|
|
#ifndef WEBVIEWPORTHOST_H
|
|
#define WEBVIEWPORTHOST_H
|
|
|
|
// Web implementation of ViewportHost. ViewportCore owns the wgpu state
|
|
// + render path; this class adapts the embedder hooks to a browser
|
|
// canvas (surface creation via emdawnwebgpu's canvas-selector extension,
|
|
// framebuffer size from the canvas element, requestFrame via
|
|
// requestAnimationFrame, quit via emscripten_force_exit). All
|
|
// notifications fall through to the base class no-ops for now —
|
|
// future iterations route them to DOM events / a status bar.
|
|
|
|
#include "ViewportHost.h"
|
|
|
|
#include <string>
|
|
|
|
class WebViewportHost final : public ViewportHost {
|
|
public:
|
|
// `canvas_selector` is the CSS selector for the host <canvas> (e.g.
|
|
// "#viewer-canvas" — matches the host page (web/ifcviewer.js)). The string is stored;
|
|
// it must outlive the host.
|
|
explicit WebViewportHost(std::string canvas_selector);
|
|
|
|
WGPUSurface createSurface(WGPUInstance instance) override;
|
|
void framebufferSize(int& width_px, int& height_px) const override;
|
|
float dpr() const override;
|
|
// Sets request_frame_pending_ so the RAF callback knows to render
|
|
// on the next browser tick. The actual frame scheduling is done by
|
|
// the main_web.cpp loop; this avoids spamming RAF callbacks when
|
|
// multiple sources request a frame in the same tick.
|
|
void requestFrame() override;
|
|
void quit() override;
|
|
|
|
// True when ViewportCore has asked for a frame since the last one
|
|
// was rendered. The main loop clears this before invoking
|
|
// core.render().
|
|
bool consumeFrameRequest();
|
|
|
|
private:
|
|
std::string canvas_selector_;
|
|
bool request_frame_pending_ = true; // arm an initial frame
|
|
};
|
|
|
|
#endif // WEBVIEWPORTHOST_H
|