mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0024406: Visualization - crash on re-usage of the same primitive array
Redesign Graphic3d_ArrayOfPrimitives Store vertices data in buffer objects managed using smart-pointers - no more low-level memory corruption by memory releasing after VBO creation. Remove broken hasEdgeInfos. Interleave vertex attributes (position, color, normal, uv) in single buffer. Remove from Graphic3d_ArrayOfPrimitives methods ::Orientate(). Remove structures Graphic3d_PrimitiveArray, CALL_DEF_PARRAY. Add support for 2D vertex arrays. Graphic3d_Group - remove array or primitive arrays. Introduce more universal method Graphic3d_Group::AddPrimitiveArray(). Fix warning
This commit is contained in:
@@ -9,6 +9,5 @@ InterfaceGraphic_XWD.hxx
|
||||
InterfaceGraphic_wntio.hxx
|
||||
InterfaceGraphic_cPrintf.cxx
|
||||
InterfaceGraphic_Palette.c
|
||||
InterfaceGraphic_PrimitiveArray.hxx
|
||||
InterfaceGraphic_telem.hxx
|
||||
InterfaceGraphic_tgl_all.hxx
|
||||
|
@@ -15,7 +15,7 @@
|
||||
#ifndef InterfaceGraphic_Graphic3dHeader
|
||||
#define InterfaceGraphic_Graphic3dHeader
|
||||
|
||||
#include <InterfaceGraphic_PrimitiveArray.hxx>
|
||||
#include <InterfaceGraphic_telem.hxx>
|
||||
#include <Standard_Transient.hxx>
|
||||
|
||||
/* COULEUR */
|
||||
|
@@ -1,65 +0,0 @@
|
||||
// Copyright (c) 1991-1999 Matra Datavision
|
||||
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
||||
//
|
||||
// This file is part of Open CASCADE Technology software library.
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or modify it under
|
||||
// the terms of the GNU Lesser General Public License version 2.1 as published
|
||||
// by the Free Software Foundation, with special exception defined in the file
|
||||
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
|
||||
// distribution for complete text of the license and disclaimer of any warranty.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifndef _InterfaceGraphic_PrimitiveArray_header_file_
|
||||
#define _InterfaceGraphic_PrimitiveArray_header_file_
|
||||
|
||||
/*
|
||||
FILE: InterfaceGraphic_PrimitiveArray.hxx
|
||||
|
||||
Created 16/06/2000 : ATS,SPK : G005
|
||||
|
||||
This file contains definitios of internal structures for
|
||||
PARRAY and DARRAY primitives, used in OpenGl package for presentation
|
||||
|
||||
*/
|
||||
|
||||
#include <InterfaceGraphic_telem.hxx>
|
||||
|
||||
#define MVERTICE 1
|
||||
#define MVNORMAL 2
|
||||
#define MVCOLOR 4
|
||||
#define MVTEXEL 8
|
||||
|
||||
typedef enum {
|
||||
TelUnknownArrayType,
|
||||
TelPointsArrayType,
|
||||
TelPolylinesArrayType,
|
||||
TelSegmentsArrayType,
|
||||
TelPolygonsArrayType,
|
||||
TelTrianglesArrayType,
|
||||
TelQuadranglesArrayType,
|
||||
TelTriangleStripsArrayType,
|
||||
TelQuadrangleStripsArrayType,
|
||||
TelTriangleFansArrayType
|
||||
} TelPrimitivesArrayType;
|
||||
|
||||
typedef struct {
|
||||
TelPrimitivesArrayType type; /* Array type */
|
||||
Tint format; /* Array datas format */
|
||||
Tint num_vertexs; /* Number of vertexs */
|
||||
Tint num_bounds; /* Number of bounds */
|
||||
Tint num_edges; /* Number of edges */
|
||||
Tint *bounds; /* Bounds array */
|
||||
Tint *edges; /* Edges array vertex index */
|
||||
tel_colour fcolours; /* Facet colour values */
|
||||
tel_point vertices; /* Vertices */
|
||||
Tint *vcolours; /* Vertex colour values */
|
||||
tel_point vnormals; /* Vertex normals */
|
||||
tel_texture_coord vtexels; /* Texture Coordinates */
|
||||
Tchar *edge_vis; /* Edge visibility flag*/
|
||||
Tchar *keys; /* Vertex keys*/
|
||||
} CALL_DEF_PARRAY;
|
||||
|
||||
#endif /* _InterfaceGraphic_PrimitiveArray_header_file_ */
|
Reference in New Issue
Block a user